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

customize.dist/pages.js

@@ -558,8 +558,7 @@ define([
                             placeholder: Msg.login_password,
                         }),
                         h('div.extra', [
-                            h('button.login.first.btn', Msg.login_login),
+                            h('button.login.first.btn', Msg.login_login)
-                            h('button#register.btn.register.cp-login-register', Msg.login_register)
                         ])
                     ])
                 ]),

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

@@ -54,19 +54,11 @@
     }
     .extra {
     	margin-top: 1em;
-    	.cp-login-register {
-    		color: @cryptpad_color_blue;
-	        background: #fff;
-	        border: 2px solid @cryptpad_color_blue;
-	        border-radius: 0;
-	        &:hover {
-	            transform: scale(1.05);
-	        }
-    	}
     	.login {
-    		background: transparent;
+    		background: @cryptpad_color_blue;
-    		color: @cryptpad_color_blue;
+    		color: #fff;
-    		padding: 0;
+    		padding: 10px;
+            border-radius: 0;
     		&:hover {
 	            transform: scale(1.05);
 	        } 

customize.dist/translations/messages.fr.js

@@ -160,6 +160,7 @@ define(function () {
     out.tags_title = "Mots-clés du pad (pour vous uniquement)";
     out.tags_add = "Modifier les mots-clés du pad";
     out.tags_searchHint = "Commencez une recherche par # dans votre CryptDrive pour retrouver vos pads par mot-clé.";
+    out.tags_notShared = "Vos mots-clés ne sont pas partagés avec les autres utilisateurs.";
     out.tags_duplicate = "Mot-clé déjà présent : {0}";
 
     out.slideOptionsText = "Options";

customize.dist/translations/messages.js

@@ -161,7 +161,9 @@ define(function () {
 
     out.tags_title = "Tags (for you only)";
     out.tags_add = "Update this page's tags";
+    out.tags_searchHint = "Find files by their tags by searching in your CryptDrive";
     out.tags_searchHint = "Start a search with # in your CryptDrive to find your tagged pads.";
+    out.tags_notShared = "Your tags are not shared with other users";
 
     out.tags_duplicate = "Duplicate tag: {0}";
 

www/common/common-interface.js

@@ -179,9 +179,11 @@ define([
         var tagger = dialog.frame([
             dialog.message([
                 Messages.tags_add,
-                h('p', Messages.tags_searchHint)
+                h('br'),
+                Messages.tags_searchHint,
             ]),
             input,
+            h('center', h('small', Messages.tags_notShared)),
             dialog.nav(),
         ]);
 

www/slide/slide.js

@@ -83,7 +83,7 @@ define([
         var c = Slide.content;
         var m = '<span class="cp-app-slide-container"><span class="'+slideClass+'">'+DiffMd.render(c).replace(separatorReg, '</span></span><span class="cp-app-slide-container"><span class="'+slideClass+'">')+'</span></span>';
 
-        DiffMd.apply(m, $content);
+        try { DiffMd.apply(m, $content); } catch (e) { return console.error(e); }
 
         var length = getNumberOfSlides();
         $modal.find('style.cp-app-slide-style').remove();