Skip to content
Snippets Groups Projects
Commit d4218397 authored by Benoit Alessandroni's avatar Benoit Alessandroni
Browse files

Merge branch 'master' into feature/adding-sales-load-from-spaces

parents 1638a861 9ba23819
No related branches found
Tags v10.0.21
1 merge request!337update: force loading sales when spaces is defined
Pipeline #12579 passed with stages
in 7 minutes and 15 seconds
......@@ -29,7 +29,7 @@
"version": "0.16"
})
if(componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects"))
if(componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects") || componentSet.has("spaces"))
if(!npm.find(e => e.package == "@startinblox/component-chat"))
npm.push({
"package": "@startinblox/component-chat",
......@@ -82,7 +82,7 @@
if(!npm.find(e => e.package == "@startinblox/component-poll"))
npm.push({
"package": "@startinblox/component-poll",
"version": "3.1"
"version": "^4.0.0-beta"
})
if(componentSet.has("directory"))
......
if componentSet.has('chat') || componentSet.has('circles') || componentSet.has('projects')
if componentSet.has('chat') || componentSet.has('circles') || componentSet.has('projects') || componentSet.has('spaces')
solid-widget(name='orbit-counter')
template
if componentSet.has('notification')
......
if componentSet.has('chat') || componentSet.has('circles') || componentSet.has('projects')
if componentSet.has('chat') || componentSet.has('circles') || componentSet.has('projects') || componentSet.has('spaces')
solid-widget(name='orbit-menu-jabberid')
template
div.hidden(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment