From 5db0274fc35b918b538b4d7b968102297ff6baff Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 29 Jan 2018 15:48:53 +0100 Subject: [PATCH 1/2] add default config for new server options --- config.example.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config.example.js b/config.example.js index 8fb4acb00..0af71afbb 100644 --- a/config.example.js +++ b/config.example.js @@ -194,6 +194,18 @@ module.exports = { */ }, + /* some features may require that the server be able to schedule tasks + far into the future, such as: + > "three months from now, this channel should expire" + To disable these features, set 'enableTaskScheduling' to false + */ + enableTaskScheduling: true, + + /* if you would like the list of scheduled tasks to be stored in + a custom location, change the path below: + */ + taskPath: './tasks', + /* * By default, CryptPad also contacts our accounts server once a day to check for changes in * the people who have accounts. This check-in will also send the version of your CryptPad From de838a3184ac8bfc5807c93c6add797c63260003 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 29 Jan 2018 16:12:35 +0100 Subject: [PATCH 2/2] fix usage bar styles --- customize.dist/src/less2/include/limit-bar.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/customize.dist/src/less2/include/limit-bar.less b/customize.dist/src/less2/include/limit-bar.less index 12f26ef4b..4c11183c4 100644 --- a/customize.dist/src/less2/include/limit-bar.less +++ b/customize.dist/src/less2/include/limit-bar.less @@ -8,9 +8,10 @@ width: 100%; margin-top: 20px; .cp-limit-bar { - padding: 5px; + display: inline-flex; + justify-content: center; + align-items: center; - display: inline-block; max-width: 100%; margin: 3px; box-sizing: border-box; @@ -18,7 +19,6 @@ background: white; position: relative; text-align: center; - vertical-align: middle; width: ~"calc(100% - 6px)"; height: 35px; line-height: 25px;