Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
0a68f06cc8
|
@ -62,7 +62,7 @@ define([
|
|||
var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
|
||||
'/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
|
||||
Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "cryptpad",
|
||||
"version": "3.19.0",
|
||||
"version": "3.19.1",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "cryptpad",
|
||||
"description": "realtime collaborative visual editor with zero knowlege server",
|
||||
"version": "3.19.0",
|
||||
"version": "3.19.1",
|
||||
"license": "AGPL-3.0+",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
@ -2155,6 +2155,11 @@ define([
|
|||
'class': 'fa fa-caret-down',
|
||||
}).prependTo($button);
|
||||
}
|
||||
if (config.angleDown) {
|
||||
$('<span>', {
|
||||
'class': 'fa fa-angle-down',
|
||||
}).prependTo($button);
|
||||
}
|
||||
|
||||
// Menu
|
||||
var $innerblock = $('<div>', {'class': 'cp-dropdown-content'});
|
||||
|
|
|
@ -117,6 +117,7 @@ define([
|
|||
});
|
||||
var dropdownCfg = {
|
||||
text: Messages.support_category,
|
||||
angleDown: 1,
|
||||
options: categories,
|
||||
container: $(container),
|
||||
isSelect: true
|
||||
|
|
Loading…
Reference in New Issue