Merge branch 'soon' into staging

www/common/outer/async-store.js

@@ -1656,7 +1656,9 @@ define([
             } else if (teams.some(function (teamId) {
                 // We're not allowed: check our teams
                 var ed = Util.find(store, ['proxy', 'teams', teamId, 'keys', 'drive', 'edPublic']);
+                var edPrivate = Util.find(store, ['proxy', 'teams', teamId, 'keys', 'drive', 'edPrivate']);
                 if (allowed.indexOf(ed) === -1) { return false; }
+                if (!edPrivate) { return false; } // XXX: Only editors can authenticate...
                 // This team is allowed: use its rpc
                 var t = teamModule.getTeam(teamId);
                 _store = t;

www/report/main.js

@@ -63,6 +63,7 @@ define([
             network = _network;
         }));
     }).nThen(function (waitFor) {
+        addReport('BEGIN REPORT');
         var secret = Hash.getSecrets('drive', hash);
         addReport('Load drive. ID: ' + secret.channel);
         checkCache(secret.channel, waitFor());
@@ -82,7 +83,6 @@ define([
             }
         }), { network: network, onCacheReady: onCacheReady});
     }).nThen(function (waitFor) {
-        console.log(proxy);
         var drive = proxy.drive || {};
         if (!proxy.drive) {
             addReport('ERROR: no drive');
@@ -184,7 +184,6 @@ define([
                         return;
                     }
                     addReport('Roster channel: ' + d.channel);
-                    console.warn(rosterKeys);
                     checkCache(d.channel, function () {
                         var crypto = Crypto.Team.createEncryptor(rosterKeys);
                         var m = 0;
@@ -233,7 +232,6 @@ define([
                                     _obj.href = cryptor.decrypt(_obj.href);
                                 }
                                 var parsed = Hash.parsePadUrl(_obj.href || _obj.roHref);
-                                console.log(parsed.hash, _obj);
                                 Crypt.get(parsed.hash, function (err, val, errorObj) {
                                     if (err) {
                                         addReport('ERROR: ' + err);

www/settings/inner.js

@@ -84,7 +84,7 @@ define([
             'cp-settings-pad-width',
             'cp-settings-pad-spellcheck',
             'cp-settings-pad-notif',
-            'cp-settings-pad-openlink',
+            //'cp-settings-pad-openlink', // XXX test, translate and re-enable
         ],
         'code': [ // Msg.settings_cat_code
             'cp-settings-code-indent-unit',