Merge branch 'staging' into fix

customize.dist/src/less2/pages/page-features.less

@@ -51,6 +51,12 @@
                     div {
                         font-size: 1.2em;
                         color: @cryptpad_color_blue;
+                        &:first-child {
+                            font-weight: bold;
+                        }
+                        &:last-child {
+                            font-size: 1em;
+                        }
                     }
                 }
             }

www/common/sframe-common-codemirror.js

@@ -62,6 +62,7 @@ define([
         });
 
         editor._noCursorUpdate = false;
+        editor.state.focused = true;
         if(selects[0] === selects[1]) {
             editor.setCursor(posToCursor(selects[0], remoteDoc));
         }

www/common/toolbar3.js

@@ -894,7 +894,7 @@ MessengerUI, Messages) {
             if (e) { return void console.error("Unable to get the pinned usage", e); }
             if (overLimit) {
                 var key = 'pinLimitReachedAlert';
-                if (ApiConfig.noSubscriptionButton === true) {
+                if (!ApiConfig.allowSubscriptions) {
                     key = 'pinLimitReachedAlertNoAccounts';
                 }
                 $limit.show().click(function () {

www/common/translations/messages.fr.json

@@ -1124,7 +1124,6 @@
     "requestEdit_request": "{1} souhaite éditer le pad <b>{0}</b>",
     "requestEdit_accepted": "{1} vous a accordé les droits d'édition du pad <b>{0}</b>",
     "requestEdit_sent": "Demande envoyée",
-    "uploadFolderButton": "Importer un dossier",
     "properties_unknownUser": "{0} utilisateur(s) inconnu(s)",
     "fm_morePads": "Plus",
     "fc_openInCode": "Ouvrir dans l'application Code",
@@ -1136,5 +1135,8 @@
     "convertFolderToSF_SFChildren": "Impossible de convertir ce dossier en dossier partagé car il contient déjà d'autres dossiers partagés. Veuillez déplacer ces dossiers à l'extérieur afin de continuer.",
     "convertFolderToSF_confirm": "Ce dossier va être converti en dossier partagé afin de pouvoir être accessible par d'autres utilisateurs. Continuer ?",
     "pricing": "Tarification",
-    "homePage": "Page d'accueil"
+    "homePage": "Page d'accueil",
+    "features_noData": "Aucune donnée personnelle requise",
+    "features_pricing": "Entre {0} et {2}€ par mois",
+    "features_emailRequired": "Adresse email requise"
 }

www/common/translations/messages.json

@@ -1133,8 +1133,10 @@
     "requestEdit_request": "{1} wants to edit the pad <b>{0}</b>",
     "requestEdit_accepted": "{1} granted you edit rights for the pad <b>{0}</b>",
     "requestEdit_sent": "Request sent",
-    "uploadFolderButton": "Upload folder",
     "properties_unknownUser": "{0} unknown user(s)",
     "pricing": "Pricing",
-    "homePage": "Home page"
+    "homePage": "Home page",
+    "features_noData": "No personal information required",
+    "features_pricing": "Between {0} and {2}€ per month",
+    "features_emailRequired": "Email address required"
 }

www/settings/inner.js

@@ -1188,16 +1188,24 @@ define([
         var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
 
         // when jscolor picker value change
-        var onchange = function (colorL) {
+        var _onchange = function (colorL) {
             var val = "#" + colorL.toString();
             if (!/^#[0-9a-fA-F]{6}$/.test(val)) { return; }
-            $spinner.show();
-            $ok.hide();
             common.setAttribute(['general', 'cursor', 'color'], val, function () {
                 $spinner.hide();
                 $ok.show();
             });
         };
+        var to;
+        var onchange = function (colorL) {
+            $spinner.show();
+            $ok.hide();
+
+            if (to) { clearTimeout(to); }
+            to = setTimeout(function () {
+                _onchange(colorL);
+            }, 300);
+        };
 
         // jscolor picker
         var jscolorL = new window.jscolor($colorPicker[0],{showOnClick: false, onFineChange: onchange, valueElement:undefined});