Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-04-13 19:47:04 +02:00
parent 520ae822fc bf047fcf65
commit 63960bd38c
11 changed files with 795 additions and 661 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1407,8 +1407,6 @@ load pinpad dynamically only after you know that it will be needed */
                        console.log('RPC handshake complete');
                        rpc = common.rpc = env.rpc = call;

-                        // TODO check if pin list is up to date
-                        // if not, reset
                        common.arePinsSynced(function (err, yes) {
                            if (!yes) {
                                common.resetPins(function (err, hash) {