From 57c5e664bbb3a2754ede3321edbd8423707202f5 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 26 Aug 2019 14:07:23 +0200 Subject: [PATCH 1/6] don't prompt users to upgrade to premium if subscriptions are disabled --- www/common/toolbar3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js index a2547d223..bb325af59 100644 --- a/www/common/toolbar3.js +++ b/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 () { From 521940f6040698ad0498ce5d27b65645842dca78 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 26 Aug 2019 15:30:35 +0200 Subject: [PATCH 2/6] Don't update the proxy onfinechange when picking a cursor color --- www/settings/inner.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/www/settings/inner.js b/www/settings/inner.js index c084e9dcd..f92df0221 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -1188,16 +1188,24 @@ define([ var $spinner = $('', {'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}); From 7c7a3660c8ec729a607bf8aeb7db5718fcd6d162 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 26 Aug 2019 16:25:34 +0200 Subject: [PATCH 3/6] Maybe fix losing selection in the code app when tab is not focused --- www/common/sframe-common-codemirror.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js index 6174e3a4c..f8e60aabe 100644 --- a/www/common/sframe-common-codemirror.js +++ b/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)); } From 9f1a4441d4f5dd3f50d02faa8611127b9e5e0be5 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 26 Aug 2019 15:15:27 +0000 Subject: [PATCH 4/6] Translated using Weblate (English) Currently translated at 100.0% (1044 of 1044 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1043 of 1043 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1042 of 1042 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index bee205c59..be4b4942d 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1133,8 +1133,10 @@ "requestEdit_request": "{1} wants to edit the pad {0}", "requestEdit_accepted": "{1} granted you edit rights for the pad {0}", "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" } From 335f6b1673915ed03b8b455980dcd3e0b7e98936 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 26 Aug 2019 15:15:27 +0000 Subject: [PATCH 5/6] Translated using Weblate (French) Currently translated at 100.0% (1044 of 1044 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 7295f1f39..76116bb6d 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1124,7 +1124,6 @@ "requestEdit_request": "{1} souhaite éditer le pad {0}", "requestEdit_accepted": "{1} vous a accordé les droits d'édition du pad {0}", "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" } From 2367a60236ca579556c0324525aa6fc23071a508 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 26 Aug 2019 17:18:28 +0200 Subject: [PATCH 6/6] Features pages UI --- customize.dist/src/less2/pages/page-features.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/customize.dist/src/less2/pages/page-features.less b/customize.dist/src/less2/pages/page-features.less index 0268f5869..08bdbfc95 100644 --- a/customize.dist/src/less2/pages/page-features.less +++ b/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; + } } } }