diff --git a/cryptpad/docs/example.nginx.conf b/cryptpad/docs/example.nginx.conf index f5c0e1643..a2d1cb1ce 100644 --- a/cryptpad/docs/example.nginx.conf +++ b/cryptpad/docs/example.nginx.conf @@ -237,7 +237,7 @@ server { # The nodejs server has some built-in forwarding rules to prevent # URLs like /pad from resulting in a 404. This simply adds a trailing slash # to a variety of applications. - location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report|convert)$ { + location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report|convert|checkup)$ { rewrite ^(.*)$ $1/ redirect; } diff --git a/cryptpad/www/assert/assertions.js b/cryptpad/www/assert/assertions.js index d5f806e03..6db10fb24 100644 --- a/cryptpad/www/assert/assertions.js +++ b/cryptpad/www/assert/assertions.js @@ -16,20 +16,18 @@ define([], function () { } if (called) { return; } + if (msg && !msg.innerText) { + msg.innerText = "An unexpected error occurred. See your browser's console for more details"; + } + called = true; _cb(arg); }; - var _msg = document.createElement('span'); - _msg.innerText = "An unexpected error occurred. See your browser's console for more details"; - if (msg && !msg.innerText) { - msg.innerText = _msg.innerText; - } - to = setTimeout(function () { cb({ test: i, - message: msg || _msg, + message: msg, output: "TIMEOUT", }); }, 25000); @@ -42,7 +40,7 @@ define([], function () { } else { cb({ test: i, - message: msg || _msg, + message: msg, output: result, }); } @@ -54,7 +52,7 @@ define([], function () { //from ${err.fileName} line ${err.lineNumber}`; cb({ test: i, - message: msg || _msg, + message: msg, output: { message: err.message, file: err.fileName, diff --git a/cryptpad/www/kanban/app-kanban.less b/cryptpad/www/kanban/app-kanban.less index 79d5a87a3..accff3219 100644 --- a/cryptpad/www/kanban/app-kanban.less +++ b/cryptpad/www/kanban/app-kanban.less @@ -64,6 +64,9 @@ display: flex; flex-flow: column; overflow: hidden; + .cp-markdown-toolbar { + display: block; + } } #cp-kanban-edit-conflicts { padding: 5px;