summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-26 10:47:40 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-26 10:47:40 +0100
commitc6c15ba8252231b90e0600d5b6e43c3c10cc3bcd (patch)
treeb5e5138aa022949df0ced59e1372e6214780c87e /apps
parent96f15a12a91b89735ad0d5aa6fd127bdcf81b83e (diff)
parent4471f359b1a24462309e863948a4583d67b37aef (diff)
downloadnextcloud-server-c6c15ba8252231b90e0600d5b6e43c3c10cc3bcd.tar.gz
nextcloud-server-c6c15ba8252231b90e0600d5b6e43c3c10cc3bcd.zip
Merge pull request #22608 from owncloud/collaborative-tags
Rename system tags app to collaborative tags
Diffstat (limited to 'apps')
-rw-r--r--apps/systemtags/appinfo/info.xml5
-rw-r--r--apps/systemtags/js/systemtagsinfoview.js2
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index d0b4c1fce00..40eeeb24811 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
<info>
<id>systemtags</id>
- <name>System tags</name>
- <description>System-wide tags user interface</description>
+ <name>Collaborative tags</name>
+ <description>Collaborative tagging functionality which shares tags among users. Great for teams.
+ (If you are a provider with a multi-tenancy installation, it is advised to deactivate this app as tags are shared.)</description>
<licence>AGPL</licence>
<author>Vincent Petry</author>
<default_enable/>
diff --git a/apps/systemtags/js/systemtagsinfoview.js b/apps/systemtags/js/systemtagsinfoview.js
index 2e808f9a84f..2f01ca7db34 100644
--- a/apps/systemtags/js/systemtagsinfoview.js
+++ b/apps/systemtags/js/systemtagsinfoview.js
@@ -100,7 +100,7 @@
* This will automatically adjust the tag mapping collection to
* container the new name.
*
- * @param {OC.Backbone.Model} changedTag tag model that has changed
+ * @param {OC.Backbone.Model} tagId tag model that has changed
*/
_onTagDeletedGlobally: function(tagId) {
// also rename it in the selection, if applicable