web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' into fix

Browse Source
This commit is contained in:
ansuz
2019-08-26 17:22:30 +02:00
parent 0ee41bbec6 2367a60236
commit c18018ca79
6 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
customize.dist/src/less2/pages/page-features.less
View File

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

1
www/common/sframe-common-codemirror.js
View File

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

2
www/common/toolbar3.js
View File

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

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

@@ -1124,7 +1124,6 @@
"requestEdit_request": "{1} souhaite éditer le pad <b>{0}</b>", "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_accepted": "{1} vous a accordé les droits d'édition du pad <b>{0}</b>",
"requestEdit_sent": "Demande envoyée", "requestEdit_sent": "Demande envoyée",
"uploadFolderButton": "Importer un dossier",
"properties_unknownUser": "{0} utilisateur(s) inconnu(s)", "properties_unknownUser": "{0} utilisateur(s) inconnu(s)",
"fm_morePads": "Plus", "fm_morePads": "Plus",
"fc_openInCode": "Ouvrir dans l'application Code", "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_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 ?", "convertFolderToSF_confirm": "Ce dossier va être converti en dossier partagé afin de pouvoir être accessible par d'autres utilisateurs. Continuer ?",
"pricing": "Tarification", "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"
} }

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

@@ -1133,8 +1133,10 @@
"requestEdit_request": "{1} wants to edit the pad <b>{0}</b>", "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_accepted": "{1} granted you edit rights for the pad <b>{0}</b>",
"requestEdit_sent": "Request sent", "requestEdit_sent": "Request sent",
"uploadFolderButton": "Upload folder",
"properties_unknownUser": "{0} unknown user(s)", "properties_unknownUser": "{0} unknown user(s)",
"pricing": "Pricing", "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"
} }

14
www/settings/inner.js
View File

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