diff --git a/apps/files_sharing/js/dist/additionalScripts.js b/apps/files_sharing/js/dist/additionalScripts.js
index fbca2471fb2be3545a018735ae648f764ca703a8..27139c9e866607c16758f8041bf12d4f97c06740 100644
Binary files a/apps/files_sharing/js/dist/additionalScripts.js and b/apps/files_sharing/js/dist/additionalScripts.js differ
diff --git a/apps/files_sharing/js/dist/additionalScripts.js.map b/apps/files_sharing/js/dist/additionalScripts.js.map
index ab033a62920ea4025675e3b7f514290b94c99efb..6690589aaba77ef6694cb5583231ce9ecc172c44 100644
Binary files a/apps/files_sharing/js/dist/additionalScripts.js.map and b/apps/files_sharing/js/dist/additionalScripts.js.map differ
diff --git a/apps/files_sharing/js/dist/collaboration.js b/apps/files_sharing/js/dist/collaboration.js
index d30727455a89550934f2d0ea53c89e4f2508acff..c4532efc927eb01fdf320bc8dd62575cf82e3274 100644
Binary files a/apps/files_sharing/js/dist/collaboration.js and b/apps/files_sharing/js/dist/collaboration.js differ
diff --git a/apps/files_sharing/js/dist/collaboration.js.map b/apps/files_sharing/js/dist/collaboration.js.map
index 9373de8d05fd7156a44e424bcf9692684a0a0dc0..ce11b324c4ee8150faf101874768fc0ee7cf463a 100644
Binary files a/apps/files_sharing/js/dist/collaboration.js.map and b/apps/files_sharing/js/dist/collaboration.js.map differ
diff --git a/apps/files_sharing/js/dist/files_sharing.3.js b/apps/files_sharing/js/dist/files_sharing.3.js
index 8ba2c6ad0e8591bc69588c8ba0e889bd4bf1d77a..024e6db3cb400e2eb07d86d9bb0ead9a7224c007 100644
Binary files a/apps/files_sharing/js/dist/files_sharing.3.js and b/apps/files_sharing/js/dist/files_sharing.3.js differ
diff --git a/apps/files_sharing/js/dist/files_sharing.3.js.map b/apps/files_sharing/js/dist/files_sharing.3.js.map
index 56e4c72fdcd4deecda55e95a9d78c275a0636ed9..9899b4e5f0f19c962f149a2fa436698ccbe11a63 100644
Binary files a/apps/files_sharing/js/dist/files_sharing.3.js.map and b/apps/files_sharing/js/dist/files_sharing.3.js.map differ
diff --git a/apps/files_sharing/src/collaborationresourceshandler.js b/apps/files_sharing/src/collaborationresourceshandler.js
index ef7b271f7800bde932a246a73a9c4e4d62a8c38b..8a668b3ce93128fffaface6c3160e156d7cac37e 100644
--- a/apps/files_sharing/src/collaborationresourceshandler.js
+++ b/apps/files_sharing/src/collaborationresourceshandler.js
@@ -14,7 +14,6 @@ window.OCP.Collaboration.registerType('file', {
}, false);
});
},
- /** used in "Link to a {typeString}" */
- typeString: t('files_sharing', 'file'),
+ typeString: t('files_sharing', 'Link to a file'),
typeIconClass: 'icon-files-dark'
});
diff --git a/core/css/icons.scss b/core/css/icons.scss
index d1d3d91094f8d511cc137d7d441997db8eafeae2..4a7c15ada85ce95fe75b38ee8a863c0b416fe26d 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -222,6 +222,7 @@ img, object, video, button, textarea, input, select, div[contenteditable='true']
@include icon-black-white('play-add', 'actions', 1, true);
@include icon-black-white('play-next', 'actions', 1, true);
@include icon-black-white('play-previous', 'actions', 1, true);
+@include icon-black-white('projects', 'actions', 1, true);
@include icon-black-white('public', 'actions', 1, true);
@include icon-black-white('quota', 'actions', 1, true);
@include icon-black-white('rename', 'actions', 1, true);
diff --git a/core/img/actions/projects.svg b/core/img/actions/projects.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3f561438f0f5d1228f17f9ad9d2f66505f8c88b0
--- /dev/null
+++ b/core/img/actions/projects.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -292.77)"><g transform="translate(0 -.52917)"><path transform="matrix(.26458 0 0 .26458 0 293.3)" d="m5.1602 1.9746v0.36914 1.8359h-4.5937v0.375 7.3086h2.8047v2.3262h10.291v-4.5371h1.7891v-7.6777h-10.291zm0.75195 0.74609h8.7871v6.1855h-1.0371v-2.3945h-2.8047v-2.332h-4.9453v-1.459zm-4.5938 2.2109h8.793v1.5801h-6.7402v0.36914 4.2363h-2.0527v-6.1855zm2.8066 2.3262h8.793v6.1855h-8.793v-6.1855z" fill="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-fill="#000000" stroke="#000" stroke-linecap="round" stroke-width=".4" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:markers fill stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/></g></g></svg>
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index 738663d8fad8acba13553694005dcdf63f0c4a4a..6447994596a57018afdd667a7d195891f66cf839 100644
Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
index d7c1ffff783171c32d423ed17613c3b85efc5da8..fd111e1b8fbee9ea50a0b86dc8db20e956dcc679 100644
Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ
diff --git a/core/src/OCP/collaboration.js b/core/src/OCP/collaboration.js
index c56dea1204730a02f27afb4cfa9756f6421eecaf..efc495b8bf2ce9166c164aac6ab7e166abc6883e 100644
--- a/core/src/OCP/collaboration.js
+++ b/core/src/OCP/collaboration.js
@@ -34,13 +34,15 @@ let types = {};
/**
* Those translations will be used by the vue component but they should be shipped with the server
- * t('core', 'Add to a collection')
+ * t('core', 'Add to a project')
* t('core', 'Show details')
* t('core', 'Hide details')
- * t('core', 'Rename collection')
- * t('core', 'Failed to rename collection')
- * t('core', 'Failed to create collection')
- * t('core', 'Failed to add resource to collection')
+ * t('core', 'Rename project')
+ * t('core', 'Failed to rename the project')
+ * t('core', 'Failed to create a project')
+ * t('core', 'Failed to add the item to the project')
+ * t('core', 'Connect items to a project to make them easier to find')
+ * t('core', 'Type to search for existing projects')
*/
export default {
@@ -62,7 +64,7 @@ export default {
return types[type].typeIconClass || '';
},
getLabel(type) {
- return t('core', 'Link to a {label}', { label: types[type].typeString || type }, 1)
+ return escapeHTML(types[type].typeString || type)
},
getLink(type, id) {
/* TODO: Allow action to be executed instead of href as well */
diff --git a/package-lock.json b/package-lock.json
index 3851c0553894b18c19a085d32ee1d631dcad1c76..0d61754f1cce13f93129dfe15688a191af0b05fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4812,9 +4812,9 @@
}
},
"nextcloud-vue-collections": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.3.0.tgz",
- "integrity": "sha512-XW95X75XF4fxL9HBNPf4tsPbSjjtFzdCGz8rlh67upA8QBbaLkn9cEiveORlpgBviVPuiCVLQqVfxOWbsZ+dAw==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.4.0.tgz",
+ "integrity": "sha512-UxgormIFW4CD9dUsobRzIuQt1PQXkT+EI2KCp1CoAiJiurzf5yO9BmmS3gN9lWZa1+EZvLqljapvAlyntWwX6Q==",
"requires": {
"lodash": "^4.17.11",
"nextcloud-axios": "^0.1.2",
@@ -4826,9 +4826,9 @@
},
"dependencies": {
"nextcloud-vue": {
- "version": "0.9.5",
- "resolved": "https://registry.npmjs.org/nextcloud-vue/-/nextcloud-vue-0.9.5.tgz",
- "integrity": "sha512-JWioquKIHnmt2O+8eS+7zd5Pg7DuouKKQlVBoLlm7bOPFTZuhn53B3lYiOnL8N/91ba8RnffHmDixz33m7/s8w==",
+ "version": "0.9.7",
+ "resolved": "https://registry.npmjs.org/nextcloud-vue/-/nextcloud-vue-0.9.7.tgz",
+ "integrity": "sha512-47mr8kBQfJW1oNTgKjFdktgX6+Z0c6jryd1xq+515jLef3o1DWdMmRLF5Yab3TTUdha/aG3dL0lpVQ6Z3jf9Aw==",
"requires": {
"hammerjs": "^2.0.8",
"md5": "^2.2.1",
diff --git a/package.json b/package.json
index 7dfdaec3d81bcf4ca778a5371dbd3885e3c22627..ab88083999002cf2a9d6c313d9baff5d73f760da 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"nextcloud-axios": "^0.1.3",
"nextcloud-password-confirmation": "^0.4.1",
"nextcloud-vue": "^0.8.0",
- "nextcloud-vue-collections": "^0.3.0",
+ "nextcloud-vue-collections": "^0.4.0",
"snap.js": "^2.0.9",
"strengthify": "git+https://github.com/MorrisJobke/strengthify.git#0.5.8",
"underscore": "^1.9.1",