Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/pages.js

@@ -101,8 +101,7 @@ define([
     Pages.privacyLink = footLink(AppConfig.privacy, 'privacy');
     Pages.githubLink = footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub');
     Pages.docsLink = footLink('https://docs.cryptpad.fr', 'docs_link');
-    Msg.home_roadmap = "Roadmap"; // XXX
+    Pages.roadmapLink = footLink(AppConfig.roadmap, 'footer_roadmap');
-    Pages.roadmapLink = footLink(AppConfig.roadmap, 'home_roadmap');
 
     Pages.infopageFooter = function () {
         var terms = footLink('/terms.html', 'footer_tos'); // FIXME this should be configurable like the other legal pages

www/calendar/inner.js

@@ -635,7 +635,6 @@ Messages.calendar_noNotification = "None";
         return UIElements.createDropdown(dropdownConfig)[0];
     };
     var makeCalendarEntry = function (id, teamId) {
-        // XXX handle RESTRICTED calendars (data.restricted)
         var data = APP.calendars[id];
         var edit;
         if (data.loading) {
@@ -852,7 +851,7 @@ Messages.calendar_noNotification = "None";
         makeLeftside(cal, $(leftside));
 
         cal.on('beforeCreateSchedule', function(event) {
-            // XXX Recurrence (later)
+            // TODO Recurrence (later)
             // On creation, select a recurrence rule (daily / weekly / monthly / more weird rules)
             // then mark it under recurrence rule with a uid (the same for all the recurring events)
             // ie: recurrenceRule: DAILY|{uid}
@@ -1014,7 +1013,7 @@ Messages.calendar_noNotification = "None";
     var getNotificationDropdown = function () {
         var ev = APP.editModalData;
         var calId = ev.selectedCal.id;
-        // XXX DEFAULT HERE [10] ==> 10 minutes before the event
+        // DEFAULT HERE [10] ==> 10 minutes before the event
         var oldReminders = Util.find(APP.calendars, [calId, 'content', 'content', ev.id, 'reminders']) || [10];
         APP.notificationsEntries = [];
         var number = h('input.tui-full-calendar-content', {

www/common/application_config_internal.js

@@ -45,10 +45,12 @@ define(function() {
      */
     // config.privacy = 'https://xwiki.com/en/company/PrivacyPolicy';
 
-    /* XXX
+    /* We (the project's developers) include the ability to display a 'Roadmap' in static pages footer.
-     *
+     * This is disabled by default.
+     * We use this to publish the project's development roadmap, but you can use it however you like.
+     * To do so, set the following value to an absolute URL.
      */
-    //config.roadmap = 'https://cryptpad.fr/kanban/#/2/kanban/view/PLM0C3tFWvYhd+EPzXrbT+NxB76Z5DtZhAA5W5hG9wo/'; // XXX
+    //config.roadmap = 'https://cryptpad.fr/kanban/#/2/kanban/view/PLM0C3tFWvYhd+EPzXrbT+NxB76Z5DtZhAA5W5hG9wo/';
 
     /*  Cryptpad apps use a common API to display notifications to users
      *  by default, notifications are hidden after 5 seconds

www/common/onlyoffice/inner.js

@@ -364,7 +364,6 @@ define([
             ]))
         };
 
-        Messages.oo_cantMigrate = "This sheet exceeds the maximum upload size and is too large to be migrated."; // XXX
         var onUploaded = function (ev, data, err) {
             content.saveLock = undefined;
             if (err) {

www/common/translations/messages.de.json

@@ -541,7 +541,7 @@
     "four04_pageNotFound": "Wir konnten die Seite, die du angefordert hast, nicht finden.",
     "header_logoTitle": "Zu deinem CryptDrive",
     "header_homeTitle": "Zur CryptPad-Hauptseite",
-    "help_genericMore": "Erfahre mehr über die Nutzung von CryptPad, indem du unsere <a>Documentation</a> liest.",
+    "help_genericMore": "Erfahre mehr über die Nutzung von CryptPad, indem du unsere <a>Dokumentation</a> liest.",
     "driveReadmeTitle": "Was ist CryptPad?",
     "edit": "Bearbeiten",
     "view": "Ansehen",

www/common/translations/messages.fr.json

@@ -1181,5 +1181,7 @@
     "admin_maintenanceButton": "Planifier maintenance",
     "admin_maintenanceHint": "Planifier une maintenance sur cette instance et avertir tous les utilisateurs. Limité à une maintenance active à la fois.",
     "admin_maintenanceTitle": "Maintenance",
-    "admin_cat_broadcast": "Annonces"
+    "admin_cat_broadcast": "Annonces",
+    "oo_cantMigrate": "Ce tableur dépasse la taille maximale de téléchargement et est trop grand pour être mis à jour.",
+    "footer_roadmap": "Feuille de route"
 }

www/common/translations/messages.json

@@ -1185,5 +1185,6 @@
     "settings_deleteWarning": "Warning: you are currently subscribed to a premium plan (paid or given by another user). Please cancel your plan before deleting your account as will not be possible without contacting support once your account is deleted.",
     "settings_deleteContinue": "Delete my account",
     "settings_deleteSubscription": "Manage my subscription",
-    "footer_roadmap": "Roadmap"
+    "footer_roadmap": "Roadmap",
+    "oo_cantMigrate": "This sheet exceeds the maximum upload size and is too large to be migrated."
 }