Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 4 years ago
commit 0a68f06cc8

@ -62,7 +62,7 @@ define([
var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ? var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
'/imprint.html' : AppConfig.imprint); '/imprint.html' : AppConfig.imprint);
Pages.versionString = "CryptPad v3.19.0 (Thylacine)"; Pages.versionString = "CryptPad v3.19.1 (Thylacine's revenge)";
// used for the about menu // used for the about menu
Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined; Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined;

2
package-lock.json generated

@ -1,6 +1,6 @@
{ {
"name": "cryptpad", "name": "cryptpad",
"version": "3.19.0", "version": "3.19.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

@ -1,7 +1,7 @@
{ {
"name": "cryptpad", "name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server", "description": "realtime collaborative visual editor with zero knowlege server",
"version": "3.19.0", "version": "3.19.1",
"license": "AGPL-3.0+", "license": "AGPL-3.0+",
"repository": { "repository": {
"type": "git", "type": "git",

@ -2155,6 +2155,11 @@ define([
'class': 'fa fa-caret-down', 'class': 'fa fa-caret-down',
}).prependTo($button); }).prependTo($button);
} }
if (config.angleDown) {
$('<span>', {
'class': 'fa fa-angle-down',
}).prependTo($button);
}
// Menu // Menu
var $innerblock = $('<div>', {'class': 'cp-dropdown-content'}); var $innerblock = $('<div>', {'class': 'cp-dropdown-content'});

@ -117,6 +117,7 @@ define([
}); });
var dropdownCfg = { var dropdownCfg = {
text: Messages.support_category, text: Messages.support_category,
angleDown: 1,
options: categories, options: categories,
container: $(container), container: $(container),
isSelect: true isSelect: true

Loading…
Cancel
Save