Merge branch 'soon' into staging

CHANGELOG.md

@@ -1,3 +1,31 @@
+# Donkey release (v2.3.0)
+
+## Goals
+
+For this release we wanted to deploy some new features related to our encrypted file functionality.
+
+## Update notes
+
+* new clientside dependencies. run `bower update`
+* new serverside APIs. Restart your server
+
+## What's new
+
+### Features
+
+* When uploading files to your CryptDrive or a pad, users will now be prompted to protect the file with a password (in addition to some random data)
+  * this adds an additional layer of security in case a third party gains access to the file's link, but not the password.
+* Users are also able to claim an encrypted file as their own, allowing them the option to delete it from the server at a later date.
+* We've refactored the Media-Tag library to be much smaller and easier to use.
+
+### Bug fixes
+
+* When setting a title for a pad which was created from a template, titles were not correctly inferred from the content of a document. This has been fixed.
+* We discovered that users who had installed _AdBlock Plus_ and configured it to **Block social media icons tracking** were unable to use the _share menu_ to construct alternative links to the same pad, but with different attributes. We have worked around the problem.
+* Admins who had configured their CryptPad instance to use custom icons for applications in the CryptDrive may have noticed that the same icons were not used on the home page. We've fixed this such that the same icons will be used everywhere
+* We have also updated the icon for the Kanban app to a more appropriate symbol
+* We found that the download button in the _file_ app was downloading the user's avatar, instead of the correct encrypted file embedded in the page. We've since fixed this
+
 # Coati release (v2.2.0)
 
 ## Goals

customize.dist/pages.js

@@ -181,10 +181,10 @@ define([
                     ]),
                 ]),
                 h('div.row.align-items-center',[
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-2.cp-bio-avatar.cp-bio-avatar-right', [
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-lg-2.cp-bio-avatar.cp-bio-avatar-right', [
                             h('img.img-fluid', {'src': '/customize/images/AaronMacSween.jpg'})
                     ]),
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-1.cp-profile-det',[
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-lg-1.cp-profile-det',[
                         h('h3', "Aaron MacSween"),
                         h('hr'),
                         setHTML(h('div#bioAaron'), '<p>Aaron transitioned into distributed systems development from a background in jazz and live stage performance. <br/> He appreciates the elegance of biological systems and functional programming, and focused on both as a student at the University of Toronto, where he studied cognitive and computer sciences.<br/>He moved to Paris in 2015 to work as a research engineer at XWiki SAS, after having dedicated significant time to various cryptography-related software projects.<br/>He spends his spare time experimenting with guitars, photography, science fiction, and spicy food.</p>'),
@@ -232,10 +232,10 @@ define([
                     ]),
                 ]),
                 h('div.row.align-items-center',[
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-2.cp-bio-avatar.cp-bio-avatar-right', [
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-lg-2.cp-bio-avatar.cp-bio-avatar-right', [
                             h('img.img-fluid', {'src': '/customize/images/Catalin.jpg'})
                     ]),
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-1.cp-profile-det',[
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-lg-1.cp-profile-det',[
                         h('h3', "Catalin Scripcariu"),
                         h('hr'),
                         setHTML(h('div#bioCatalin'), '<p> Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end.<br/>At the beginning of 2017 he joined the XWiki, where he worked both on the business and the community side of XWiki, including the research team and CryptPad. </p>'),
@@ -470,28 +470,28 @@ define([
                     h('div.col-12',
                         setHTML(h('h4.text-center'), Msg.main_about_p26)
                     ),
-                    h('div.col-6.col-sm-3.col-md-3.col-lg-3',
+                    h('div.col-12.col-sm-6.col-md-3.col-lg-3',
                         h('a.card', {href : "https://twitter.com/cryptpad"}, 
                             h('div.card-body', 
                                 setHTML(h('p'), Msg.main_about_p22)
                             )
                         )
                     ),
-                    h('div.col-6.col-sm-3.col-md-3.col-lg-3',
+                    h('div.col-12.col-sm-6.col-md-3.col-lg-3',
                         h('a.card', {href : "https://github.com/xwiki-labs/cryptpad/issues/"},
                             h('div.card-body', 
                                 setHTML(h('p'), Msg.main_about_p23)
                             )
                         )
                     ),
-                    h('div.col-6.col-sm-3.col-md-3.col-lg-3',
+                    h('div.col-12.col-sm-6.col-md-3.col-lg-3',
                         h('a.card', {href : "https://riot.im/app/#/room/#cryptpad:matrix.org"},
                             h('div.card-body', 
                                 setHTML(h('p'), Msg.main_about_p24)
                             )
                         )
                     ),
-                    h('div.col-6.col-sm-3.col-md-3.col-lg-3',
+                    h('div.col-12.col-sm-6.col-md-3.col-lg-3',
                         h('a.card', {href : "mailto:research@xwiki.com"},
                             h('div.card-body', 
                                 setHTML(h('p'), Msg.main_about_p25)

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

@@ -161,6 +161,9 @@
         background-size: contain;
         height: 50px;
         width: 250px;
+        @media (max-width: 326px) {
+            width: 180px;
+        }
         margin-right: 0;
     }
     a {

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

@@ -73,7 +73,7 @@
     }
 }
 .cp-regis-user {
-    @media (max-width:767px) {
+    @media (max-width:575px) {
         margin-top: 3em;
     }
     .card-body {