From 02a4de58510ad7e9309b6757e99e8164cef91a58 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 30 Nov 2020 18:41:28 +0100 Subject: [PATCH 1/3] Update customLimits example #643 --- config/config.example.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.example.js b/config/config.example.js index 32bcb20cf..fd9902a69 100644 --- a/config/config.example.js +++ b/config/config.example.js @@ -228,12 +228,12 @@ module.exports = { */ /* customLimits: { - "https://my.awesome.website/user/#/1/cryptpad-user1/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=": { + "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]": { limit: 20 * 1024 * 1024 * 1024, plan: 'insider', note: 'storage space donated by my.awesome.website' }, - "https://my.awesome.website/user/#/1/cryptpad-user2/GdflkgdlkjeworijfkldfsdflkjeEAsdlEnkbx1vVOo=": { + "[cryptpad-user2@my.awesome.website/GdflkgdlkjeworijfkldfsdflkjeEAsdlEnkbx1vVOo=]": { limit: 10 * 1024 * 1024 * 1024, plan: 'insider', note: 'storage space donated by my.awesome.website' From 0b4c8678dd6b80fab65aff4ac49aff474d187c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 4 Dec 2020 15:32:56 +0000 Subject: [PATCH 2/3] Remove bravewarning key --- www/common/translations/messages.json | 1 - 1 file changed, 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 3e7869ee2..f5acaa6c8 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1472,7 +1472,6 @@ "documentID": "Document identifier", "unableToDisplay": "Unable to display the document. Please press Esc to reload the page. If the problem persists, please contact support.", "errorPopupBlocked": "CryptPad needs to be able to open new tabs to operate. Please allow popup windows in your browser's address bar. These windows will never be used to show you advertising.", - "braveWarning": "It seems you are currently using the Brave browser. We have received reports of users being unable to confirm the payment form due to strict privacy settings on this browser. If the payment button does not work, you can try with a different browser or contact us with the Support form to find an alternative solution.", "admin_archiveTitle": "Archive documents", "admin_archiveHint": "Make a document unavailable without deleting it permanently. It will be placed in an 'archive' directory and deleted after a few days (configurable in the server configuration file).", "admin_archiveButton": "Archive", From 7fe89921cb90643820de412e89d60327032aad12 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 4 Dec 2020 16:33:33 +0100 Subject: [PATCH 3/3] Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ --- www/common/translations/messages.fr.json | 1 - 1 file changed, 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index ef5bfe47d..47980ee0d 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1494,6 +1494,5 @@ "admin_archiveButton": "Archiver", "admin_archiveHint": "Rendre un document indisponible sans le supprimer définitivement. Il sera placé dans un répertoire \"archive\" et supprimé après quelques jours (configurable dans le fichier de configuration du serveur).", "admin_archiveTitle": "Archiver les documents", - "braveWarning": "Il semble que vous utilisiez actuellement le navigateur Brave. Nous avons reçu des rapports d'utilisateurs ne pouvant pas confirmer le formulaire de paiement en raison de paramètres de confidentialité stricts sur ce navigateur. Si le bouton de paiement ne fonctionne pas, vous pouvez essayer avec un autre navigateur ou nous contacter avec le formulaire de support pour trouver une solution alternative.", "mediatag_loadButton": "Charger la pièce jointe" }