resolve merge conflicts and jquery errors

customize.dist/application_config.js

@@ -32,7 +32,10 @@ define(function() {
         '#FF00C0', // hot pink
         '#800080', // purple
     ];
+
     config.enableTemplates = true;
 
+    config.enableHistory = true;
+
     return config;
 });

customize.dist/src/less/toolbar.less

@@ -409,6 +409,31 @@
 .cryptpad-toolbar-rightside {
     text-align: right;
 }
+.cryptpad-toolbar-history {
+    display: none;
+    text-align: center;
+    .next {
+        float: right;
+    }
+    .previous {
+        float: left;
+    }
+    .goto {
+        display: inline-block;
+        input { width: 50px; }
+    }
+    .gotoInput {
+        vertical-align: middle;
+    }
+}
+.cke_toolbox .cryptpad-toolbar-history {
+    input.gotoInput {
+        background: white;
+        height: 20px;
+        padding: 3px 3px;
+        border-radius: 5px;
+    }
+}
 .cryptpad-spinner {
     height: 16px;
     width: 16px;

customize.dist/toolbar.css

@@ -472,6 +472,31 @@
 .cryptpad-toolbar-rightside {
   text-align: right;
 }
+.cryptpad-toolbar-history {
+  display: none;
+  text-align: center;
+}
+.cryptpad-toolbar-history .next {
+  float: right;
+}
+.cryptpad-toolbar-history .previous {
+  float: left;
+}
+.cryptpad-toolbar-history .goto {
+  display: inline-block;
+}
+.cryptpad-toolbar-history .goto input {
+  width: 50px;
+}
+.cryptpad-toolbar-history .gotoInput {
+  vertical-align: middle;
+}
+.cke_toolbox .cryptpad-toolbar-history input.gotoInput {
+  background: white;
+  height: 20px;
+  padding: 3px 3px;
+  border-radius: 5px;
+}
 .cryptpad-spinner {
   height: 16px;
   width: 16px;

customize.dist/translations/messages.fr.js

@@ -115,6 +115,17 @@ define(function () {
     out.cancel = "Annuler";
     out.cancelButton = 'Annuler (Echap)';
 
+    out.historyButton = "Afficher l'historique du document";
+    out.history_next = "Voir la version suivante";
+    out.history_prev = "Voir la version précédente";
+    out.history_goTo = "Voir la version sélectionnée";
+    out.history_close = "Retour";
+    out.history_closeTitle = "Fermer l'historique";
+    out.history_restore = "Restaurer";
+    out.history_restoreTitle = "Restaurer la version du document sélectionnée";
+    out.history_restorePrompt = "Êtes-vous sûr de vouloir remplacer la version actuelle du document par la version affichée ?";
+    out.history_restoreDone = "Document restauré";
+
     // Polls
 
     out.poll_title = "Sélecteur de date Zero Knowledge";

customize.dist/translations/messages.js

@@ -117,6 +117,17 @@ define(function () {
     out.cancel = "Cancel";
     out.cancelButton = 'Cancel (esc)';
 
+    out.historyButton = "Display the document history";
+    out.history_next = "Go to the next version";
+    out.history_prev = "Go to the previous version";
+    out.history_goTo = "Go to the selected version";
+    out.history_close = "Back";
+    out.history_closeTitle = "Close the history";
+    out.history_restore = "Restore";
+    out.history_restoreTitle = "Restore the selected version of the document";
+    out.history_restorePrompt = "Are you sure you want to replace the current version of the document by the displayed one?";
+    out.history_restoreDone = "Document restored";
+
     // Polls
 
     out.poll_title = "Zero Knowledge Date Picker";