The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into degraded

Browse Source
This commit is contained in:
ansuz 2021-03-15 15:41:25 +05:30
commit 0d50cdd835
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/src/less2/include/toolbar.less
View File

@ -278,6 +278,7 @@
cursor: pointer;
}
&> p {
text-align: center;
margin: 20px;
}
&> div {

1
lib/hk-util.js
View File

@ -893,6 +893,7 @@ HK.onChannelMessage = function (Env, Server, channel, msgStruct, cb) {
// more straightforward and reliable.
if (Array.isArray(id) && id[2] && id[2] === channel.lastSavedCp) {
// Reject duplicate checkpoints
// XXX not an error? the checkpoint is already here so we can assume it's stored
return void cb('DUPLICATE');
}
}

2
www/common/common-ui-elements.js
View File

@ -1936,7 +1936,7 @@ define([
$body: $('body')
});
var $modal = modal.$modal;
var $title = $('<h3>').text(Messages.fm_newFile);
var $title = $('<h3>').html("<i class='fa fa-plus'></i> " + Messages.fm_newButton);
var $description = $('<p>').html(Messages.creation_newPadModalDescription);
$modal.find('.cp-modal').append($title);
$modal.find('.cp-modal').append($description);

4
www/common/drive-ui.js
View File

@ -3067,14 +3067,14 @@ define([
'class': 'cp-app-drive-element-row cp-app-drive-new-ghost'
}).prepend($addIcon.clone()).appendTo($list);
$element.append($('<span>', {'class': 'cp-app-drive-element-name'})
.text(Messages.fm_newFile));
.text(Messages.fm_newButton));
$element.click(function () {
var modal = UI.createModal({
id: 'cp-app-drive-new-ghost-dialog',
$body: $('body')
});
var $modal = modal.$modal;
var $title = $('<h3>').text(Messages.fm_newFile);
var $title = $('<h3>').html("<i class='fa fa-plus'></i> " + Messages.fm_newButton);
var $description = $('<p>').text(Messages.fm_newButtonTitle);
$modal.find('.cp-modal').append($title);
$modal.find('.cp-modal').append($description);

2
www/common/onlyoffice/v2b/web-apps/apps/presentationeditor/main/app.js
View File

File diff suppressed because one or more lines are too long

2
www/common/onlyoffice/v2b/web-apps/apps/spreadsheeteditor/main/app.js
View File

File diff suppressed because one or more lines are too long

2
www/common/translations/messages.fr.json
View File

@ -493,7 +493,7 @@
"mdToolbar_check": "Liste de tâches",
"mdToolbar_code": "Code",
"home_host": "Ceci est une instance communautaire et indépendante de CryptPad.",
"main_catch_phrase": "Outils collaboratifs,<br>chiffrés et open source",
"main_catch_phrase": "Outils collaboratifs<br>chiffrés de bout en bout et open source",
"footer_aboutUs": "À propos",
"about": "À propos",
"privacy": "Charte de confidentialité",

2
www/common/translations/messages.json
View File

@ -508,7 +508,7 @@
"mdToolbar_code": "Code",
"mdToolbar_toc": "Table of Contents",
"home_host": "This is an independent community instance of CryptPad.",
"main_catch_phrase": "Collaboration suite,<br>encrypted and open-source",
"main_catch_phrase": "Collaboration suite<br>end-to-end encrypted and open-source",
"footer_aboutUs": "About us",
"about": "About",
"privacy": "Privacy Policy",