Merge branch 'master' into babel-npm-webpack-fixes

.drone.yml

@@ -284,7 +284,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-16
     commands:
       - sleep 10 # gives the database enough time to initialize
-      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+      - POSTGRES=${POSTGRES} NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
     when:
       matrix:
         DB: postgres
@@ -936,6 +936,7 @@ services:
     image: postgres:9
     environment:
       - POSTGRES_USER=oc_autotest
+      - POSTGRES_DB=oc_autotest_dummy
       - POSTGRES_PASSWORD=owncloud
     tmpfs:
       - /var/lib/postgresql/data
@@ -947,6 +948,7 @@ services:
       image: postgres:10
       environment:
         - POSTGRES_USER=oc_autotest
+        - POSTGRES_DB=oc_autotest_dummy
         - POSTGRES_PASSWORD=owncloud
       tmpfs:
         - /var/lib/postgresql/data

.gitignore

@@ -13,6 +13,7 @@
 # ignore all apps except core ones
 /apps*/*
 !/apps/accessibility
+!/apps/cloud_federation_api
 !/apps/comments
 !/apps/dav
 !/apps/files

apps/accessibility/package.json

@@ -24,10 +24,10 @@
 		"babel-preset-env": "^1.7.0",
 		"css-loader": "^1.0.0",
 		"file-loader": "^1.1.11",
-		"vue-loader": "^15.2.6",
+		"vue-loader": "^15.4.2",
 		"vue-template-compiler": "^2.5.17",
-		"webpack": "^4.17.2",
-		"webpack-cli": "^3.1.0",
+		"webpack": "^4.19.1",
+		"webpack-cli": "^3.1.1",
 		"webpack-merge": "^4.1.4"
 	}
 }

apps/comments/css/comments.scss

@@ -22,6 +22,9 @@
 	padding: 10px;
 	min-height: 44px;
 	margin: 0;
+
+	/* Prevent the text from overlapping with the submit button. */
+	padding-right: 30px;
 }
 
 #commentsTabView .newCommentForm {
@@ -251,3 +254,8 @@
 .app-files .action-comment {
 	padding: 16px 14px;
 }
+
+#commentsTabView .comment .message .contactsmenu-popover {
+	left: -6px;
+	top: 24px;
+}

apps/comments/js/commentstabview.js

@@ -442,14 +442,13 @@
 				return;
 			}
 
-			$el.find('.avatar').each(function() {
-				var avatar = $(this);
-				var strong = $(this).next();
-				var appendTo = $(this).parent();
-
-				var username = $(this).data('username');
-				if (username !== oc_current_user) {
-					$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
+			$el.find('.avatar-name-wrapper').each(function() {
+				var $this = $(this);
+				var $avatar = $this.find('.avatar');
+
+				var user = $avatar.data('user');
+				if (user !== OC.getCurrentUser().uid) {
+					$this.contactsMenu(user, 0, $this);
 				}
 			});
 		},

apps/comments/l10n/cs.js

@@ -19,19 +19,19 @@ OC.L10N.register(
     "Comment" : "Komentář",
     "You commented" : "Okomentovali jste",
     "%1$s commented" : "%1$s okomentován",
-    "{author} commented" : "{author} okomentoval",
-    "You commented on %1$s" : "Okomentoval(a) jste %1$s",
-    "You commented on {file}" : "Okomentoval(a) jste {file}",
+    "{author} commented" : "{author} okomentoval(a)",
+    "You commented on %1$s" : "Okomentovali jste %1$s",
+    "You commented on {file}" : "Okomentovali jste {file}",
     "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
     "{author} commented on {file}" : "{author} okomentoval(a) {file}",
     "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v “%s”, v komentáři od uživatele, který byl později smazán",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v „%s“, v komentáři od uživatele, který byl později smazán",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
     "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
     "Unknown user" : "Neznámý uživatel",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\""
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(Nyní) už smazaný uživatel vás zmínil v komentáři na „%s“.",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní už smazaný uživatel vás zmínil v komentáři u „{file}“"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

apps/comments/l10n/cs.json

@@ -17,19 +17,19 @@
     "Comment" : "Komentář",
     "You commented" : "Okomentovali jste",
     "%1$s commented" : "%1$s okomentován",
-    "{author} commented" : "{author} okomentoval",
-    "You commented on %1$s" : "Okomentoval(a) jste %1$s",
-    "You commented on {file}" : "Okomentoval(a) jste {file}",
+    "{author} commented" : "{author} okomentoval(a)",
+    "You commented on %1$s" : "Okomentovali jste %1$s",
+    "You commented on {file}" : "Okomentovali jste {file}",
     "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
     "{author} commented on {file}" : "{author} okomentoval(a) {file}",
     "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v “%s”, v komentáři od uživatele, který byl později smazán",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v „%s“, v komentáři od uživatele, který byl později smazán",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
     "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
     "Unknown user" : "Neznámý uživatel",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\""
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(Nyní) už smazaný uživatel vás zmínil v komentáři na „%s“.",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní už smazaný uživatel vás zmínil v komentáři u „{file}“"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }

apps/comments/l10n/nl.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Je werd vermeld op \"{file}\" in een reactie door een sindsdien verwijderde gebruiker",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vermeldde jou in een reactie op “%2$s\"",
     "{user} mentioned you in a comment on “{file}”" : "{user} heeft je vermeld in een reactie op “{file}\"",
+    "Files app plugin to add comments to files" : "Bestanden app plugin om reacties aan bestanden toe te voegen",
     "Unknown user" : "Onbekende gebruiker",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"%s\"",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"{file}\""

apps/comments/l10n/nl.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Je werd vermeld op \"{file}\" in een reactie door een sindsdien verwijderde gebruiker",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vermeldde jou in een reactie op “%2$s\"",
     "{user} mentioned you in a comment on “{file}”" : "{user} heeft je vermeld in een reactie op “{file}\"",
+    "Files app plugin to add comments to files" : "Bestanden app plugin om reacties aan bestanden toe te voegen",
     "Unknown user" : "Onbekende gebruiker",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"%s\"",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"{file}\""

apps/comments/l10n/pl.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Zostałeś/aś wspomniany/a w \"{file}\" w komentarzach przez użytkownika, który został usunięty",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s wspomniał/-a o Tobie w komentarzu “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} wspomniał/-a o Tobie w komentarzu “{file}”",
+    "Files app plugin to add comments to files" : "Plugin umożliwiający dodawanie komentarzy w aplikacji Pliki",
     "Unknown user" : "Nieznany użytkownik",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “%s”",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “{file}”"

apps/comments/l10n/pl.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Zostałeś/aś wspomniany/a w \"{file}\" w komentarzach przez użytkownika, który został usunięty",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s wspomniał/-a o Tobie w komentarzu “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} wspomniał/-a o Tobie w komentarzu “{file}”",
+    "Files app plugin to add comments to files" : "Plugin umożliwiający dodawanie komentarzy w aplikacji Pliki",
     "Unknown user" : "Nieznany użytkownik",
     "A (now) deleted user mentioned you in a comment on “%s”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “%s”",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “{file}”"

apps/comments/l10n/sl.js

@@ -8,7 +8,7 @@ OC.L10N.register(
     "Cancel" : "Prekliči",
     "[Deleted user]" : "[Izbrisan uporabnik]",
     "Comments" : "Opombe",
-    "No comments yet, start the conversation!" : "Še ni komentarjev, začni debato!",
+    "No comments yet, start the conversation!" : "Ni še odzivov, bodite prvi!",
     "More comments …" : "Več komentarjev ....",
     "Save" : "Shrani",
     "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}",

apps/comments/l10n/sl.json

@@ -6,7 +6,7 @@
     "Cancel" : "Prekliči",
     "[Deleted user]" : "[Izbrisan uporabnik]",
     "Comments" : "Opombe",
-    "No comments yet, start the conversation!" : "Še ni komentarjev, začni debato!",
+    "No comments yet, start the conversation!" : "Ni še odzivov, bodite prvi!",
     "More comments …" : "Več komentarjev ....",
     "Save" : "Shrani",
     "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}",

apps/comments/l10n/zh_CN.js

@@ -29,6 +29,7 @@ OC.L10N.register(
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "您在 “{file}” 上一名用户的评论中被提到过，该用户在那之后被删除了",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的评论中提到了您",
     "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的评论中提到了您",
+    "Files app plugin to add comments to files" : "文件应用插件用于为文件添加注释",
     "Unknown user" : "未知用户",
     "A (now) deleted user mentioned you in a comment on “%s”" : "一个(已)被删除的用户在 “%s” 的评论中提到了您",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "一个(已)被删除的用户在 “{file}” 的评论中提到了您"

apps/comments/l10n/zh_CN.json

@@ -27,6 +27,7 @@
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "您在 “{file}” 上一名用户的评论中被提到过，该用户在那之后被删除了",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的评论中提到了您",
     "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的评论中提到了您",
+    "Files app plugin to add comments to files" : "文件应用插件用于为文件添加注释",
     "Unknown user" : "未知用户",
     "A (now) deleted user mentioned you in a comment on “%s”" : "一个(已)被删除的用户在 “%s” 的评论中提到了您",
     "A (now) deleted user mentioned you in a comment on “{file}”" : "一个(已)被删除的用户在 “{file}” 的评论中提到了您"

apps/dav/l10n/bg.js

@@ -5,21 +5,23 @@ OC.L10N.register(
     "Todos" : "Задачи",
     "Personal" : "Личен",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
-    "You created calendar {calendar}" : "Направихте календар {calendar}",
+    "You created calendar {calendar}" : "Създадохте календара {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} изтри календар {calendar}",
     "You deleted calendar {calendar}" : "Изтрихте календар {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} обнови календар {calendar}",
     "You updated calendar {calendar}" : "Обновихте календар {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} сподели календар {calendar} с теб",
-    "You shared calendar {calendar} with {user}" : "Споделихте календар {calendar} с {user}",
+    "You shared calendar {calendar} as public link" : "Споделихте календара {calendar} с публична връзка",
+    "You removed public link for calendar {calendar}" : "Премахнахте публична връзка към календара {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} сподели календара {calendar} с вас",
+    "You shared calendar {calendar} with {user}" : "Споделихте календара {calendar} с {user}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} сподели календар {calendar} с {user}",
-    "{actor} unshared calendar {calendar} from you" : "{actor} отказа споделяне на календар {calendar} с теб",
-    "You unshared calendar {calendar} from {user}" : "Отказахте споделяне на календар {calendar} от {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} отказа споделянето на календара {calendar} с вас",
+    "You unshared calendar {calendar} from {user}" : "Отказахте споделянето на календара {calendar} от {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} отказа споделяне на календар {calendar} от {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} отказа споделяне на календар {calendar} от себеси",
-    "You shared calendar {calendar} with group {group}" : "Споделихте календар {calendar} с група {group}",
+    "You shared calendar {calendar} with group {group}" : "Споделихте календара {calendar} с група {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} сподели календар {calendar} с група {group}",
-    "You unshared calendar {calendar} from group {group}" : "Отказахте споделяне на календар {calendar} от група {group}",
+    "You unshared calendar {calendar} from group {group}" : "Отказахте споделянето на календара {calendar} от група {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} отказа споделяне с календар {calendar} от група {group}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} създаде събитие {event} в календар {calendar}",
     "You created event {event} in calendar {calendar}" : "Създадохте събитие {event} в календар {calendar}",