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

customize.dist/pages.js

@@ -62,7 +62,7 @@ define([
     var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
                         '/imprint.html' : AppConfig.imprint);
 
-    Pages.versionString = "v4.0.0";
+    Pages.versionString = "v4.1.0";
 
     // used for the about menu
     Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined;

customize.dist/src/less2/include/colortheme-dark.less

@@ -415,7 +415,7 @@
 
 // Teams
 @cp_teams-card-bg: @cryptpad_color_grey_800;
-@cp_teams-leftside-bg: darken(@cryptpad_color_grey_800, 5%);
+@cp_teams-leftside-bg: darken(@cryptpad_color_grey_800, 10%);
 @cp_teams-invite-bg: fade(@cryptpad_color_brand, 50%);
 @cp_teams-invite-fg: @cryptpad_text_col;
 @cp_teams-roster-odd: fade(@cryptpad_text_col, 15%);

customize.dist/src/less2/include/dropdown.less

@@ -12,7 +12,7 @@
         color: @cp_autocomplete-fg;
     }
     ul.ui-menu {
-        border: 1px solid @cp_autocomplete-border; // XXX doesn't work
+        border: 1px solid @cp_autocomplete-border; // FIXME doesn't work
         .ui-state-active {
             background-color: @cp_autocomplete-hover;
             color: @cp_autocomplete-fg;

customize.dist/src/less2/include/leftside-menu.less

@@ -15,7 +15,7 @@
         min-width: 25px;
     }
     &:hover {
-        background: rgba(0,0,0,0.05);
+        background: fade(@cryptpad_text_col, 10%);
     }
     &.cp-leftside-active {
         background: @cp_sidebar-left-active;

customize.dist/src/less2/pages/page-404.less

@@ -5,7 +5,7 @@ html, body {
     .font_main();
     margin: 0px;
     padding: 0px;
-    background-color: @cp_static-bg; // XXX doesn't get applied
+    background-color: @cp_static-bg; // FIXME doesn't get applied
     color: @cryptpad_text_col;
     font-family: "IBM Plex Mono";
     #cp-main {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",

www/common/LessLoader.js

@@ -95,7 +95,7 @@ define([
 
     var COLORTHEME = '/customize/src/less2/include/colortheme.less';
     var COLORTHEME_DARK = '/customize/src/less2/include/colortheme-dark.less';
-    //COLORTHEME_DARK = '/customize/src/less2/include/colortheme.less'; // XXX
+    //COLORTHEME_DARK = '/customize/src/less2/include/colortheme.less'; // TODO
     var getColortheme = function () {
         return window.CryptPad_theme;
     };
@@ -139,7 +139,7 @@ define([
                         if (col) {
                             //console.warn(text, lastModified);
                             if (getColortheme() === "custom") {
-                                // XXX COLOR: append custom theme here
+                                // TODO COLOR: append custom theme here
                                 var custom = [
                                     '@cryptpad_text_col: #FF0000;'
                                 ].join('\n');

www/settings/inner.js

@@ -450,7 +450,9 @@ define([
             }
 
             if (val === 'default') { val = ''; }
-            window.location.hash = ''; // XXX This is a hack to fix Firefox trying to be smart
+            // browsers try to load iframes from cache if they have the same id as was previously seen
+            // this seems to help?
+            window.location.hash = '';
             sframeChan.query('Q_COLORTHEME_CHANGE', {
                 theme: val,
                 flush: flush