Merge pull request #792 from ArthurHoaro/feature/private-filter-visual

Display private only filter as search criteria

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 466c910736cfafcbf0ae3c381a6bb515e1bcd06a..1a87a8ca8ab712fa87ac75860228ca880f4d2b3e 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -160,6 +160,10 @@ Please use our release archives, or follow the
 - XSRF token now generated each time a page is rendered
 
 
+## [v0.7.1](https://github.com/shaarli/Shaarli/releases/tag/v0.7.1) - 2017-03-08
+### Security
+- Markdown plugin: escape HTML entities by default
+
 ## [v0.7.0](https://github.com/shaarli/Shaarli/releases/tag/v0.7.0) - 2016-05-14
 ### Added
 - Adds an option to encode redirector URL parameter

diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index d6f81f9651edd8aaf4ebae8193759092a9b179a9..2180c080aa4467f8ba5fd8ffc5e489f107c5f056 100644 (file)
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -59,7 +59,7 @@
 
 
       <div class="submit-buttons center">
-        <input type="submit" value="{'Save'|t}" name="save_edit" class="">
+        <input type="submit" value="{'Save'|t}" name="save_edit" class="" id="button-save-edit">
         {if="!$link_is_new"}
         <a href="?delete_link&amp;lf_linkdate={$link.id}&amp;token={$token}"
            title="" name="delete_link" class="button button-red confirm-delete">

diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index d47c257f1773b38e10c7f2904ead3fd1ff170f6a..f7de0a49894ae84a35e68cb48f34829b349deddc 100644 (file)
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -256,7 +256,14 @@ window.onload = function () {
 
         resize();
     }
+
     if (description != null) {
         init();
+        // Submit editlink form with CTRL + Enter in the text area.
+        description.addEventListener('keydown', function (event) {
+            if (event.ctrlKey && event.keyCode === 13) {
+                document.getElementById('button-save-edit').click();
+            }
+        });
     }
 };