infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
yflory 2017-12-21 18:21:14 +01:00
parent fa6106a6bb b0fe323a4c
commit 888739e333
2 changed files with 2 additions and 1 deletions

1
customize.dist/application_config.js
View File

@ -13,6 +13,7 @@ define(function() {
*/
config.notificationTimeout = 5000;
config.disableUserlistNotifications = false;
config.hideLoadingScreenTips = false;
config.enablePinning = true;

2
www/common/common-interface.js
View File

@ -430,7 +430,7 @@ define([
UI.addLoadingScreen = function (config) {
config = config || {};
var loadingText = config.loadingText;
var hideTips = config.hideTips;
var hideTips = config.hideTips || AppConfig.hideLoadingScreenTips;
var hideLogo = config.hideLogo;
var $loading, $container;
if ($('#' + LOADING).length) {