Merge branch 'master' into staging

CHANGELOG.md

@@ -1,3 +1,24 @@
+# Jerboa release (v2.9.0)
+
+## Goals
+
+Since last release introduced several big features, this release was allocated towards usability improvements largely related to those new features.
+
+## Update notes
+
+This is a simple release. Just deploy the latest source.
+
+### Features
+
+* At a user's request, we now highlight annotated code blocks according to their language's syntax
+* Shared folders can now be viewed by unregistered users (in read-only mode)
+* The authentication process that we use for handling accounts has been improved so as to tolerate very slow networks more effectively
+* The chat system embedded within pads can now optionally use the browser's system notifications API
+
+### Bugfixes
+
+* We found and fixed a race condition when initializing two tabs at once, which could leave one of the tabs in a broken state
+
 # Ibis release (v2.8.0)
 
 ## Goals

config.example.js

@@ -2,7 +2,7 @@
 /*
     globals module
 */
-var domain = 'http://localhost:3000/';
+var _domain = 'http://localhost:3000/';
 
 // You can `kill -USR2` the node process and it will write out a heap dump.
 // If your system doesn't support dumping, comment this out and install with
@@ -15,7 +15,7 @@ var domain = 'http://localhost:3000/';
 
 // we prepend a space because every usage expects it
 // requiring admins to preserve it is unnecessarily confusing
-domain = ' ' + domain;
+var domain = ' ' + _domain;
 module.exports = {
 
     // the address you want to bind to, :: means all ipv4 and ipv6 addresses
@@ -137,34 +137,27 @@ module.exports = {
     /*  Limits, Donations, Subscriptions and Contact
      *
      *  By default, CryptPad limits every registered user to 50MB of storage. It also shows a
-     *  donate button which allows for making a donation to support CryptPad development.
+     *  subscribe button which allows them to upgrade to a paid account. We handle payment,
+     *  and keep 50% of the proceeds to fund ongoing development.
      *
-     *  You can either:
+     *  You can:
-     *    A: Leave it exactly as it is.
+     *  A: leave things as they are
-     *    B: Hide the donate button.
+     *  B: disable accounts but display a donate button
-     *    C: Change the donate button to a subscribe button, people who subscribe will get more
+     *  C: hide any reference to paid accounts or donation
-     *       storage on your instance and you get 50% of the revenue earned.
      *
-     *  CryptPad is developed by people who need to live and who deserve an equivilent life to
+     *  If you chose A then there's nothing to do.
-     *  what they would get at a company which monitizes user data. However, we intend to have
+     *  If you chose B, set 'allowSubscriptions' to false.
-     *  a mutually positive relationship with every one of our users, including you. If you are
+     *  If you chose C, set 'removeDonateButton' to true
-     *  getting value from CryptPad, you should be giving equal value back.
+     */
+    allowSubscriptions: true,
+    removeDonateButton: false,
+
+    /*  Sales coming from your server will be identified by your domain
      *
      *  If you are using CryptPad in a business context, please consider taking a support contract
      *  by contacting sales@cryptpad.fr
-     *
-     *  If you choose A then there's nothing to do.
-     *
-     *  If you choose B, set this variable to true and it will remove the donate button.
-     */
-    removeDonateButton: false,
-    /*
-     *  If you choose C, set allowSubscriptions to true, then set myDomain to the domain which people
-     *  use to reach your CryptPad instance. Then contact sales@cryptpad.fr and tell us your domain.
-     *  We will tell you what is needed to get paid.
      */
-    allowSubscriptions: false,
+    myDomain: _domain,
-    myDomain: 'i.did.not.read.my.config.myserver.tld',
 
     /*
      *  If you are using CryptPad internally and you want to increase the per-user storage limit,

www/common/toolbar3.js

@@ -1096,8 +1096,8 @@ Messenger, MessengerUI, Messages) {
         tb['useradmin'] = createUserAdmin;
         tb['unpinnedWarning'] = createUnpinnedWarning;
 
-        var addElement = toolbar.addElement = function (arr, additionnalCfg, init) {
+        var addElement = toolbar.addElement = function (arr, additionalCfg, init) {
-            if (typeof additionnalCfg === "object") { $.extend(true, config, additionnalCfg); }
+            if (typeof additionalCfg === "object") { $.extend(true, config, additionalCfg); }
             arr.forEach(function (el) {
                 if (typeof el !== "string" || !el.trim()) { return; }
                 if (typeof tb[el] === "function") {