autonomic-cooperative
/
hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/core-0.17' of https://git.startinblox.com/applications/hubl into feature/project-customeradress

This commit is contained in:
Marjolaine Le Bon 2021-05-19 17:40:32 +02:00
parent 9e844b2636 e311e1bd1e
commit 44f18b6e90
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -1615,9 +1615,9 @@
} }
}, },
"@startinblox/hubl-styling-framework": { "@startinblox/hubl-styling-framework": {
"version": "1.9.6", "version": "1.9.7",
"resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.9.6.tgz", "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.9.7.tgz",
"integrity": "sha512-jcKewmNJIy3SStKeb++9UFiBHH/kDvoRpFOzx/fmrUd54uFLSmvBtiVnR4VAHbhzqtaHqIwu4u8xkuQarSdIzw==" "integrity": "sha512-h1cQ1rvdF2MYcLdFwJCQbGCp85YLoWJPWE5Vr6bE3x8b4bGzL4tuahxjf426cgtVXkRFOAASc+iOjc0rlbjWhw=="
}, },
"@types/q": { "@types/q": {
"version": "1.5.4", "version": "1.5.4",

2
package.json
View File

@ -57,7 +57,7 @@
"clearDist": false "clearDist": false
}, },
"dependencies": { "dependencies": {
"@startinblox/hubl-styling-framework": "^1.9.6", "@startinblox/hubl-styling-framework": "^1.9.7",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",

6
src/dependencies.pug
View File

@ -17,7 +17,7 @@ if componentSet.has("autoLogin") || componentSet.has("registering")
//- script(type="module" src="/lib/sib-auth/index.js" defer) //- script(type="module" src="/lib/sib-auth/index.js" defer)
if componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects") if componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects")
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@6.0" defer) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@6.1" defer)
//- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
if componentSet.has("communities") if componentSet.has("communities")
@ -48,7 +48,7 @@ if componentSet.has("notification")
//- script(type="module" src="/lib/sib-notifications/index.js" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer)
if componentSet.has("polls") if componentSet.has("polls")
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@beta" defer) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@3.0" defer)
//- script(type="module" src="/lib/solid-poll/index.js" defer) //- script(type="module" src="/lib/solid-poll/index.js" defer)
if componentSet.has("profileDirectory") if componentSet.has("profileDirectory")
@ -56,7 +56,7 @@ if componentSet.has("profileDirectory")
//- script(type="module" src="/lib/solid-directory/dist/index.js" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer)
if componentSet.has("resources") if componentSet.has("resources")
script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.4", defer) script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@4.0", defer)
//- script(type="module" src="/lib/solid-resource/solid-resource.js" defer) //- script(type="module" src="/lib/solid-resource/solid-resource.js" defer)
if componentSet.has("themeChecker") if componentSet.has("themeChecker")

3
src/views/partials/circle/page-circle-resources.pug
View File

@ -8,8 +8,7 @@ solid-resource(
post-data-keyword-src=`${extension.endpoints.postKeywords}` post-data-keyword-src=`${extension.endpoints.postKeywords}`
circles=`${extension.endpoints.circles}/` circles=`${extension.endpoints.circles}/`
associated-circle-label="" associated-circle-label=""
data-trans=`associated-circle-label=${extension.parameters && extension.parameters.associatedName ? extension.parameters.associatedName : 'circle.extensions.associated'}`
upload-dir=`${extension.endpoints.uploads}` upload-dir=`${extension.endpoints.uploads}`
id-prefix='default' id-prefix='circles'
uniq=extension.uniq uniq=extension.uniq
) )