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

This commit is contained in:
yflory 2018-01-29 19:04:14 +01:00
commit f6926699bc
2 changed files with 15 additions and 3 deletions

View File

@ -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 * 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 * the people who have accounts. This check-in will also send the version of your CryptPad

View File

@ -8,9 +8,10 @@
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
.cp-limit-bar { .cp-limit-bar {
padding: 5px; display: inline-flex;
justify-content: center;
align-items: center;
display: inline-block;
max-width: 100%; max-width: 100%;
margin: 3px; margin: 3px;
box-sizing: border-box; box-sizing: border-box;
@ -18,7 +19,6 @@
background: white; background: white;
position: relative; position: relative;
text-align: center; text-align: center;
vertical-align: middle;
width: ~"calc(100% - 6px)"; width: ~"calc(100% - 6px)";
height: 35px; height: 35px;
line-height: 25px; line-height: 25px;