From a25d3fcf4cdc626293fd7ae0799f54b4ebcf5b81 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 18 Jun 2020 21:02:55 +0200 Subject: [PATCH 01/40] Translated using Weblate (English) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1294 of 1294 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1293 of 1293 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1292 of 1292 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1291 of 1291 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1290 of 1290 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1289 of 1289 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1288 of 1288 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1287 of 1287 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1286 of 1286 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1285 of 1285 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 2fcf5db4f..50ca92b93 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1187,7 +1187,7 @@ "team_rosterPromote": "Promote", "team_rosterDemote": "Demote", "team_rosterKick": "Kick from the team", - "team_inviteButton": "Invite contacts", + "team_inviteButton": "Invite members", "team_leaveButton": "Leave this team", "team_leaveConfirm": "If you leave this team you will lose access to its CryptDrive, chat history, and other contents. Are you sure?", "team_owner": "Owners", @@ -1381,5 +1381,15 @@ "settings_safeLinkDefault": "Safe Links are now turned on by default. Please use the Share menu to copy links rather than your browser's address bar.", "info_imprintFlavour": "Legal information about the administrators of this instance.", "user_about": "About CryptPad", - "info_privacyFlavour": "Our privacy policy describes how we treat your data." + "info_privacyFlavour": "Our privacy policy describes how we treat your data.", + "support_cat_account": "User account", + "support_cat_data": "Loss of content", + "support_cat_bug": "Bug report", + "support_cat_other": "Other", + "support_cat_all": "All", + "support_attachments": "Attachments", + "support_addAttachment": "Add attachment", + "notification_padSharedTeam": "{0} has shared a pad with the team {2}: {1}", + "notification_fileSharedTeam": "{0} has shared a file with the team {2}: {1}", + "notification_folderSharedTeam": "{0} has shared a pad with the team {2}: {1}" } From 1b504731f293156317bd28a94ea24f4b8fd4d8e9 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 18 Jun 2020 21:02:56 +0200 Subject: [PATCH 02/40] Translated using Weblate (French) Currently translated at 100.0% (1285 of 1285 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 77e81fcf5..3a4536b1c 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1183,7 +1183,7 @@ "team_rosterPromote": "Promouvoir", "team_rosterDemote": "Rétrograder", "team_rosterKick": "Expulser de l'équipe", - "team_inviteButton": "Inviter des contacts", + "team_inviteButton": "Inviter des membres", "team_leaveButton": "Quitter cette équipe", "team_leaveConfirm": "Si vous quittez cette équipe, vous perdrez l'accès à son CryptDrive, son chat et les autres contenus. Êtes-vous sûr ?", "team_owner": "Propriétaires", From 0afa6b79ae81b590bbdda7658aed6693f842239a Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 18 Jun 2020 15:09:29 -0400 Subject: [PATCH 03/40] remove most pending hardcoded translations --- www/common/notifications.js | 5 ----- www/support/ui.js | 7 ------- 2 files changed, 12 deletions(-) diff --git a/www/common/notifications.js b/www/common/notifications.js index 57ac38f8b..d1fbbaff9 100644 --- a/www/common/notifications.js +++ b/www/common/notifications.js @@ -83,11 +83,6 @@ define([ }; // Share pad - - Messages.notification_padSharedTeam = "{0} has shared a pad with the team {2}: {1}"; // XXX - Messages.notification_fileSharedTeam = "{0} has shared a file with the team {2}: {1}"; // XXX - Messages.notification_folderSharedTeam = "{0} has shared a pad with the team {2}: {1}"; // XXX - handlers['SHARE_PAD'] = function(common, data) { var content = data.content; var msg = content.msg; diff --git a/www/support/ui.js b/www/support/ui.js index c099634b7..30d98f389 100644 --- a/www/support/ui.js +++ b/www/support/ui.js @@ -103,14 +103,7 @@ define([ return true; }; -Messages.support_cat_account = "User account"; // XXX -Messages.support_cat_data = "Loss of content"; // XXX -Messages.support_cat_bug = "Bug report"; // XXX -Messages.support_cat_other = "Other"; // XXX -Messages.support_cat_all = "All"; // XXX Messages.support_category = "Category"; // XXX -Messages.support_attachments = "Attachments"; // XXX -Messages.support_addAttachment = "Add attachment"; // XXX var makeCategoryDropdown = function (ctx, container, onChange, all) { var categories = ['account', 'data', 'bug', 'other']; From 009ac1cc9b4e4d5fe15e251f89c14bdd595e29f7 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 18 Jun 2020 15:24:32 -0400 Subject: [PATCH 04/40] leave a note about the timing of 'refresh reminders' --- www/common/onlyoffice/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 7534b552b..a995752fb 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -55,7 +55,7 @@ define([ var CHECKPOINT_INTERVAL = 100; var DISPLAY_RESTORE_BUTTON = false; var NEW_VERSION = 2; - var PENDING_TIMEOUT = 30000; + var PENDING_TIMEOUT = 30000; // XXX it feels like maybe this should be shorter var debug = function (x) { if (!window.CP_DEV_MODE) { return; } From dcf7d60332ca6e450f7d0d8c15c30b5238bec70d Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 18 Jun 2020 15:24:58 -0400 Subject: [PATCH 05/40] fix unreadable team chat input text color --- www/teams/app-team.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/teams/app-team.less b/www/teams/app-team.less index c59d0dcb9..abd46d121 100644 --- a/www/teams/app-team.less +++ b/www/teams/app-team.less @@ -45,7 +45,7 @@ .cp-app-contacts-input { textarea { border: 0px; - color: white; + color: @cryptpad_text_col; } } } From 58a8705f5018829fa92d833f0030f7002ac64482 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 18 Jun 2020 15:24:58 -0400 Subject: [PATCH 06/40] fix unreadable team chat input text color --- www/teams/app-team.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/teams/app-team.less b/www/teams/app-team.less index c59d0dcb9..abd46d121 100644 --- a/www/teams/app-team.less +++ b/www/teams/app-team.less @@ -45,7 +45,7 @@ .cp-app-contacts-input { textarea { border: 0px; - color: white; + color: @cryptpad_text_col; } } } From a2254fa6f709cf91f9f7d15c0917cd888215a915 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 18 Jun 2020 15:24:58 -0400 Subject: [PATCH 07/40] fix unreadable team chat input text color --- www/teams/app-team.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/teams/app-team.less b/www/teams/app-team.less index c59d0dcb9..abd46d121 100644 --- a/www/teams/app-team.less +++ b/www/teams/app-team.less @@ -45,7 +45,7 @@ .cp-app-contacts-input { textarea { border: 0px; - color: white; + color: @cryptpad_text_col; } } } From 3f75b299a0a71b9f4f3af9c982c2c10e20fdf079 Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 19 Jun 2020 14:41:53 +0200 Subject: [PATCH 08/40] Fix stuck ownership modal when the pad has been deleted --- www/common/common-ui-elements.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index abf98aa17..2b8e42790 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -3544,6 +3544,11 @@ define([ link ]); + var dismiss = function () { + common.mailbox.dismiss(data, function (err) { + console.log(err); + }); + }; var answer = function (yes) { common.mailbox.sendTo("ADD_OWNER_ANSWER", { channel: msg.content.channel, @@ -3555,9 +3560,7 @@ define([ channel: msg.content.user.notifications, curvePublic: msg.content.user.curvePublic }); - common.mailbox.dismiss(data, function (err) { - console.log(err); - }); + dismiss(); }; var todo = function (yes) { @@ -3572,6 +3575,8 @@ define([ if (err) { var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden : Messages.error; + console.error(err); + dismiss(); return void UI.warn(text); } UI.log(Messages.saved); From fd4e1b98492673c5caaa4a69d0e7471f9d3fb3cd Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 19 Jun 2020 14:53:26 +0200 Subject: [PATCH 09/40] Fix tag prompt shortcuts --- www/common/common-interface.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 4eba3755c..870b33c74 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -356,11 +356,15 @@ define([ var $cancel = findCancelButton(tagger).click(function (e) { close(null, e); }); - listener = listenForKeys(function () { - $ok.click(); - }, function () { - $cancel.click(); - }, tagger); + $(tagger).on('keydown', function (e) { + if (e.which === 27) { + $cancel.click(); + return; + } + if (e.which === 13) { + $ok.click(); + } + }); $(tagger).on('click submit', function (e) { e.stopPropagation(); From 2a0aa78d0c98aa2c7d71e17bebe4d48237f371db Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 19 Jun 2020 15:46:08 +0200 Subject: [PATCH 10/40] Fix folder download in drive --- www/common/drive-ui.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index 184038d79..cd3759d8d 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -4182,7 +4182,8 @@ define([ if (!manager.isSharedFolder(el)) { name = path.path[path.path.length - 1]; folderEl = el; - downloadFolder(folderEl, name); + var sfId = manager.isInSharedFolder(path.path); + downloadFolder(folderEl, name, sfId); } // shared folder else { From 70a4b3bdf21397ec798da09a9b8f78701ded0002 Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 19 Jun 2020 15:53:29 +0200 Subject: [PATCH 11/40] Stop using previous values in pad creation screen --- www/common/common-ui-elements.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 2b8e42790..7d829bdb0 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -2856,6 +2856,7 @@ define([ }); }; + /* UIElements.setExpirationValue = function (val, $expire) { if (val && typeof (val) === "number") { $expire.find('#cp-creation-expire').attr('checked', true).trigger('change'); @@ -2879,6 +2880,7 @@ define([ $expire.find('#cp-creation-expire-false').attr('checked', true); } }; + */ UIElements.getPadCreationScreen = function (common, cfg, appCfg, cb) { appCfg = appCfg || {}; if (!common.isLoggedIn()) { return void cb(); } @@ -3191,10 +3193,12 @@ define([ // Initial values + /* if (!cfg.owned && typeof cfg.owned !== "undefined") { $creation.find('#cp-creation-owned').prop('checked', false); } UIElements.setExpirationValue(cfg.expire, $creation); + */ // Create the pad var getFormValues = function () { From 7245123061e5ca27446fb67f1fd6bd9aa396fa1b Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 19 Jun 2020 17:06:25 +0200 Subject: [PATCH 12/40] Refactor buttons.less --- customize.dist/src/less2/include/alertify.less | 2 -- customize.dist/src/less2/include/comments.less | 3 --- .../src/less2/include/{buttons.less => forms.less} | 4 ++-- customize.dist/src/less2/include/framework.less | 3 +++ customize.dist/src/less2/include/modal.less | 5 ----- customize.dist/src/less2/include/sidebar-layout.less | 2 -- www/common/common-interface.js | 5 +++-- www/common/inner/access.js | 2 +- www/common/sframe-app-framework.js | 1 + www/contacts/app-contacts.less | 6 ------ www/kanban/app-kanban.less | 2 -- www/pad/app-pad.less | 2 -- www/secureiframe/app-secure.less | 2 ++ www/whiteboard/app-whiteboard.less | 3 --- 14 files changed, 12 insertions(+), 30 deletions(-) rename customize.dist/src/less2/include/{buttons.less => forms.less} (98%) diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less index f9c63215c..2a7fd3761 100644 --- a/customize.dist/src/less2/include/alertify.less +++ b/customize.dist/src/less2/include/alertify.less @@ -3,7 +3,6 @@ @import (reference) "./variables.less"; @import (reference) "./avatar.less"; @import (reference) "./tools.less"; -@import (reference) "./buttons.less"; .alertify_main() { --LessLoader_require: LessLoader_currentFile(); @@ -272,7 +271,6 @@ } } - .buttons_main(); input:not(.form-control), textarea { margin-bottom: 15px; } diff --git a/customize.dist/src/less2/include/comments.less b/customize.dist/src/less2/include/comments.less index becc56f54..479609580 100644 --- a/customize.dist/src/less2/include/comments.less +++ b/customize.dist/src/less2/include/comments.less @@ -1,7 +1,6 @@ @import (reference) "./colortheme-all.less"; @import (reference) "./variables.less"; @import (reference) "./avatar.less"; -@import (reference) "./buttons.less"; @import (reference) "./tools.less"; .comments_main() { @@ -22,8 +21,6 @@ } - .buttons_main(); - .cp-comment-reply { margin-left: 30px; } diff --git a/customize.dist/src/less2/include/buttons.less b/customize.dist/src/less2/include/forms.less similarity index 98% rename from customize.dist/src/less2/include/buttons.less rename to customize.dist/src/less2/include/forms.less index 87fe9b050..7663bee51 100644 --- a/customize.dist/src/less2/include/buttons.less +++ b/customize.dist/src/less2/include/forms.less @@ -1,7 +1,7 @@ @import (reference) "./colortheme-all.less"; @import (reference) "./variables.less"; -.buttons_main() { +.forms_main() { @alertify-fore: @colortheme_modal-fg; @alertify-btn-fg: @alertify-fore; @alertify-light-bg: fade(@alertify-fore, 25%); @@ -83,7 +83,7 @@ margin-bottom: 3px !important; } - button:not(.pure-button):not(.md-button):not(.mdl-button) { + button.btn { background-color: @colortheme_alertify-cancel; box-sizing: border-box; diff --git a/customize.dist/src/less2/include/framework.less b/customize.dist/src/less2/include/framework.less index 94532d5c7..c698b91b9 100644 --- a/customize.dist/src/less2/include/framework.less +++ b/customize.dist/src/less2/include/framework.less @@ -16,6 +16,7 @@ @import (reference) "./cursor.less"; @import (reference) "./usergrid.less"; @import (reference) "./mentions.less"; +@import (reference) "./forms.less"; @import (reference) "./modals-ui-elements.less"; .framework_main(@bg-color, @warn-color, @color) { @@ -48,6 +49,7 @@ ); .cursor_main(); .usergrid_main(); + .forms_main(); .mentions_main(); .creation_main( @bg-color: @bg-color, @@ -84,6 +86,7 @@ .checkmark_main(20px); .password_main(); .usergrid_main(); + .forms_main(); font: @colortheme_app-font; } diff --git a/customize.dist/src/less2/include/modal.less b/customize.dist/src/less2/include/modal.less index 12d3c908c..8ed10a1b2 100644 --- a/customize.dist/src/less2/include/modal.less +++ b/customize.dist/src/less2/include/modal.less @@ -1,8 +1,5 @@ @import (reference) "./colortheme-all.less"; @import (reference) "./variables.less"; -@import (reference) './buttons.less'; - - .modal_base() { font-family: @colortheme_font; @@ -39,8 +36,6 @@ background-color: @colortheme_modal-dim; .cp-modal { - .buttons_main(); - background-color: @colortheme_modal-bg; color: @colortheme_modal-fg; box-shadow: @variables_shadow; diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less index 7961e1bee..ace7350df 100644 --- a/customize.dist/src/less2/include/sidebar-layout.less +++ b/customize.dist/src/less2/include/sidebar-layout.less @@ -1,6 +1,5 @@ @import (reference) "/customize/src/less2/include/colortheme-all.less"; @import (reference) "/customize/src/less2/include/leftside-menu.less"; -@import (reference) "/customize/src/less2/include/buttons.less"; @import (reference) "/customize/src/less2/include/browser.less"; @sidebar_button-width: 400px; @@ -98,7 +97,6 @@ } } margin-bottom: 20px; - .buttons_main(); } [type="text"], [type="password"], button { vertical-align: middle; diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 870b33c74..601375b96 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -145,12 +145,12 @@ define([ }; dialog.okButton = function (content, classString) { - var sel = typeof(classString) === 'string'? 'button.ok.' + classString:'button.ok.primary'; + var sel = typeof(classString) === 'string'? 'button.ok.' + classString:'button.btn.ok.primary'; return h(sel, { tabindex: '2', }, content || Messages.okButton); }; dialog.cancelButton = function (content, classString) { - var sel = typeof(classString) === 'string'? 'button.' + classString:'button.cancel'; + var sel = typeof(classString) === 'string'? 'button.' + classString:'button.btn.cancel'; return h(sel, { tabindex: '1'}, content || Messages.cancelButton); }; @@ -396,6 +396,7 @@ define([ buttons.forEach(function (b) { if (!b.name || !b.onClick) { return; } var button = h('button', { tabindex: '1', 'class': b.className || '' }, b.name); + button.classList.add('btn'); var todo = function () { var noClose = b.onClick(); if (noClose) { return; } diff --git a/www/common/inner/access.js b/www/common/inner/access.js index 190af4279..28dd2863b 100644 --- a/www/common/inner/access.js +++ b/www/common/inner/access.js @@ -805,7 +805,7 @@ define([ id: 'cp-app-prop-change-password', style: 'flex: 1;' }); - var passwordOk = h('button', Messages.properties_changePasswordButton); + var passwordOk = h('button.btn', Messages.properties_changePasswordButton); var changePass = h('span.cp-password-change-container', [ newPassword, passwordOk diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index 6e10b0a77..08509dba7 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -490,6 +490,7 @@ define([ }, { typeInput: $select[0] }); + $select.find('button').addClass('btn'); }); toolbar.$drawer.append($export); }; diff --git a/www/contacts/app-contacts.less b/www/contacts/app-contacts.less index 88a93ae9d..99b927b6c 100644 --- a/www/contacts/app-contacts.less +++ b/www/contacts/app-contacts.less @@ -1,7 +1,6 @@ @import (reference) '../../customize/src/less2/include/framework.less'; @import (reference) '../../customize/src/less2/include/messenger.less'; @import (reference) '../../customize/src/less2/include/avatar.less'; -@import (reference) '../../customize/src/less2/include/buttons.less'; // body &.cp-app-contacts { @@ -19,9 +18,6 @@ display: flex; // We need this to remove a 3px border at the bottom of the toolbar } - .cp-app-contacts-friends { - .buttons_main(); - } .cp-contacts-muted-table { .avatar_main(50px); .cp-contacts-muted-user { @@ -33,8 +29,6 @@ } } - - .messenger_main(); } diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index f0af6eeca..db796ea61 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -3,7 +3,6 @@ @import (reference) "../../customize/src/less2/include/tools.less"; @import (reference) "../../customize/src/less2/include/markdown.less"; @import (reference) "../../customize/src/less2/include/avatar.less"; -@import (reference) "../../customize/src/less2/include/buttons.less"; // body &.cp-app-kanban { @@ -310,7 +309,6 @@ position: relative; min-height: 50px; .cp-kanban-filterTags { - .buttons_main(); display: inline-flex; align-items: center; flex: 1; diff --git a/www/pad/app-pad.less b/www/pad/app-pad.less index bf607e801..103241a52 100644 --- a/www/pad/app-pad.less +++ b/www/pad/app-pad.less @@ -1,6 +1,5 @@ @import (reference) "../../customize/src/less2/include/framework.less"; @import (reference) "../../customize/src/less2/include/comments.less"; -@import (reference) "../../customize/src/less2/include/buttons.less"; body.cp-app-pad { .framework_main( @@ -71,7 +70,6 @@ body.cp-app-pad { order: 1; } div.cp-comment-bubble { - .buttons_main(); position: relative; order: 2; button { diff --git a/www/secureiframe/app-secure.less b/www/secureiframe/app-secure.less index bece9d4c0..a8bf43a0f 100644 --- a/www/secureiframe/app-secure.less +++ b/www/secureiframe/app-secure.less @@ -8,6 +8,7 @@ @import (reference) '../../customize/src/less2/include/password-input.less'; @import (reference) '../../customize/src/less2/include/modals-ui-elements.less'; @import (reference) '../../customize/src/less2/include/usergrid.less'; +@import (reference) '../../customize/src/less2/include/forms.less'; &.cp-app-secureiframe { .modals-ui-elements_main(); @@ -19,6 +20,7 @@ .password_main(); .modal_main(); .usergrid_main(); + .forms_main(); #cp-filepicker-dialog { display: none; diff --git a/www/whiteboard/app-whiteboard.less b/www/whiteboard/app-whiteboard.less index 0fe594dda..054bc76a7 100644 --- a/www/whiteboard/app-whiteboard.less +++ b/www/whiteboard/app-whiteboard.less @@ -1,6 +1,5 @@ @import (reference) '../../customize/src/less2/include/tools.less'; @import (reference) "../../customize/src/less2/include/framework.less"; -@import (reference) "../../customize/src/less2/include/buttons.less"; &.cp-app-whiteboard { @@ -74,8 +73,6 @@ padding: 10px; - .buttons_main(); - & > * + * { margin: 0; margin-left: 1em; From bfae7215b1c5d3be7956fc52faf145c726699471 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 19 Jun 2020 17:23:54 +0200 Subject: [PATCH 13/40] Translated using Weblate (English) Currently translated at 100.0% (1298 of 1298 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1297 of 1297 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1296 of 1296 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 50ca92b93..2aee6cc19 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1391,5 +1391,8 @@ "support_addAttachment": "Add attachment", "notification_padSharedTeam": "{0} has shared a pad with the team {2}: {1}", "notification_fileSharedTeam": "{0} has shared a file with the team {2}: {1}", - "notification_folderSharedTeam": "{0} has shared a pad with the team {2}: {1}" + "notification_folderSharedTeam": "{0} has shared a folder with the team {2}: {1}", + "oo_refresh": "Refresh", + "oo_refreshText": "This document has been updated", + "support_category": "Choose a category" } From 571a0ccae7115640370e99acf9850ab91694da51 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 19 Jun 2020 17:23:54 +0200 Subject: [PATCH 14/40] Translated using Weblate (German) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ Translated using Weblate (German) Currently translated at 99.2% (1285 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index e792c6cc8..a2d09ca8c 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -21,7 +21,7 @@ "button_newslide": "Neue Präsentation", "button_newwhiteboard": "Neues Whiteboard", "button_newkanban": "Neues Kanban", - "common_connectionLost": "Die Verbindung zum Server ist abgebrochen
Du verwendest jetzt das Dokument schreibgeschützt, bis die Verbindung wieder funktioniert.", + "common_connectionLost": "Die Verbindung zum Server ist abgebrochen
Du kannst das Dokument nicht bearbeiten, bis die Verbindung wieder funktioniert.", "websocketError": "Verbindung zum Websocket fehlgeschlagen...", "typeError": "Dieses Dokument ist nicht mit der ausgewählten Anwendung kompatibel", "onLogout": "Du bist ausgeloggt. {0}Klicke hier{1}, um dich wieder einzuloggen,
oder drücke Escape, um dein Pad schreibgeschützt zu benutzen.", @@ -1123,7 +1123,7 @@ "properties_unknownUser": "{0} unbekannte(r) Benutzer", "fm_morePads": "Mehr", "fc_openInCode": "Im Code-Editor öffnen", - "uploadFolder_modal_title": "Optionen für Ordnerupload", + "uploadFolder_modal_title": "Optionen für Hochladen des Ordners", "uploadFolder_modal_filesPassword": "Passwort für Dateien", "uploadFolder_modal_owner": "Eigene Dateien", "uploadFolder_modal_forceSave": "Dateien im CryptDrive speichern", @@ -1181,7 +1181,7 @@ "team_rosterPromote": "Befördern", "team_rosterDemote": "Degradieren", "team_rosterKick": "Aus dem Team entfernen", - "team_inviteButton": "Kontakte einladen", + "team_inviteButton": "Mitglieder einladen", "team_leaveButton": "Dieses Team verlassen", "team_leaveConfirm": "Wenn du dieses Team verlässt, verlierst du den Zugriff auf das dazugehörige CryptDrive, den Chatverlauf und andere Inhalte. Bist du sicher?", "team_owner": "Eigentümer", @@ -1381,5 +1381,15 @@ "settings_safeLinkDefault": "Sichere Links sind nun standardmäßig aktiviert. Bitte verwende zum Kopieren von Links das Menü Teilen und nicht die Adressleiste des Browsers.", "info_imprintFlavour": "Rechtliche Informationen über die Administratoren dieses Servers.", "info_privacyFlavour": "Unsere Datenschutzerklärung beschreibt, wie wir deine Daten verarbeiten.", - "user_about": "Über CryptPad" + "user_about": "Über CryptPad", + "support_cat_all": "Alle", + "support_cat_other": "Anderes", + "support_cat_account": "Benutzerkonto", + "support_cat_data": "Datenverlust", + "notification_folderSharedTeam": "{0} hat einen Ordner mit dem Team {2} geteilt: {1}", + "notification_fileSharedTeam": "{0} hat eine Datei mit dem Team {2} geteilt: {1}", + "notification_padSharedTeam": "{0} hat ein Pad mit dem Team {2} geteilt: {1}", + "support_addAttachment": "Anhang hinzufügen", + "support_attachments": "Anhänge", + "support_cat_bug": "Fehlerbericht" } From f71e31beafb63693c89c0c093314b98d9d59529d Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 19 Jun 2020 17:23:54 +0200 Subject: [PATCH 15/40] Translated using Weblate (French) Currently translated at 100.0% (1298 of 1298 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ Translated using Weblate (French) Currently translated at 100.0% (1297 of 1297 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ Translated using Weblate (French) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ Translated using Weblate (French) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ Translated using Weblate (French) Currently translated at 99.6% (1290 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 3a4536b1c..ef33ad144 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1164,7 +1164,7 @@ "team_inviteModalButton": "Inviter", "team_pcsSelectLabel": "Sauver dans", "team_pcsSelectHelp": "Créer un pad dans le drive d'une équipe rend cette équipe propriétaire du pad si l'option est cochée.", - "team_invitedToTeam": "{0} vous à inviter à rejoindre l'équipe : {1}", + "team_invitedToTeam": "{0} vous a invité à rejoindre l'équipe : {1}", "team_kickedFromTeam": "{0} vous a exclu de l'équipe : {1}", "team_acceptInvitation": "{0} a accepté votre offre de rejoindre l'équipe : {1}", "team_declineInvitation": "{0} a refusé votre offre de rejoindre l'équipe : {1}", @@ -1381,5 +1381,18 @@ "support_languagesPreamble": "L'équipe de support parle les langues suivantes :", "info_privacyFlavour": "Description de la confidentialité de vos données.", "user_about": "À propos de CryptPad", - "info_imprintFlavour": "Informations légales sur les administateurs de cette instance." + "info_imprintFlavour": "Informations légales sur les administateurs de cette instance.", + "support_cat_all": "Tout", + "support_cat_other": "Autre", + "support_cat_bug": "Rapport de bug", + "support_cat_data": "Perte de données", + "support_cat_account": "Compte utilisateur", + "notification_folderSharedTeam": "{0} a partagé un dossier avec l'équipe {2} : {1}", + "notification_fileSharedTeam": "{0} a partagé un fichier avec l'équipe {2} : {1}", + "notification_padSharedTeam": "{0} a partagé un pad avec l'équipe {2} : {1}", + "support_addAttachment": "Ajouter une pièce jointe", + "support_attachments": "Pièces jointes", + "oo_refreshText": "Ce document a été mis à jour", + "oo_refresh": "Recharger", + "support_category": "Choisir une catégorie" } From d285c6b7916d0e28a2dd61d42c6ef6cf17f1d0ac Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 19 Jun 2020 17:45:01 +0200 Subject: [PATCH 16/40] Fix UI issues in kanban --- www/kanban/app-kanban.less | 4 +++- www/kanban/inner.js | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index db796ea61..879121be7 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -141,6 +141,8 @@ .kanban-edit-item { padding: 5px; + border: 0; + background: transparent; align-self: flex-start; } @@ -344,7 +346,7 @@ margin-left: 10px; display: flex; flex-wrap: wrap; - &:not(:empty) { + &:not(.cp-empty) { margin-top: -5px; } em { diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 10db6261b..f328c3bc8 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -503,7 +503,7 @@ define([ $container.find('.kanban-item').each(function (i, el) { var itemId = $(el).attr('data-eid'); $('