Commit Graph

6984 Commits (7b4a72b3a224b493e8eb3fdec929c89a3f5a28dc)

Author SHA1 Message Date
ansuz 1d8943e673 support deprecation of non-owned drives 2018-07-10 18:09:33 +02:00
ansuz 8574128efd unstub password change function 2018-07-10 16:44:24 +02:00
ansuz 25b0d764ed pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
2018-07-10 16:42:11 +02:00
ansuz 54bc29f28c WIP maybe I missed something 2018-07-10 15:16:43 +02:00
yflory 66a494cbd2 temp 2018-07-10 15:10:07 +02:00
yflory 4b86ed2dec Shared folders UI 2018-07-10 14:41:37 +02:00
ansuz 0a9ea95796 always set userHash in localStorage even with modern users 2018-07-10 13:11:22 +02:00
yflory bc7524c134 Fix tippy 2018-07-10 10:39:21 +02:00
yflory 6312dadb60 Fix shared folders names in the drive 2018-07-09 18:11:04 +02:00
ansuz ce7ebf0326 don't stop users from registering if they cancel out of a prompt 2018-07-09 15:31:20 +02:00
yflory e0cc1a6eb6 Display a shared folder in the drive 2018-07-09 14:36:55 +02:00
ansuz 16f276a18c fix anon pad import 2018-07-09 14:34:33 +02:00
ansuz a15e232469 complete modern user registration/login. general cleanup 2018-07-09 14:20:38 +02:00
ansuz 3d4b693722 use correctly scoped variable 2018-07-06 11:54:01 +02:00
ansuz d79064a4c5 Merge branch 'staging' into modern-users2 2018-07-06 11:37:50 +02:00
ansuz 4ef2cfa88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-06 11:37:00 +02:00
ansuz 57a39258c3 WIP big commit 2018-07-06 11:36:48 +02:00
ansuz 0c3b898000 simple one line fixes 2018-07-06 10:28:41 +02:00
yflory 0c9dfc1fb5 Add proxy manager inner 2018-07-05 16:33:46 +02:00
yflory bd6a199dca Add missing functions to the proxy manager 2018-07-05 13:56:16 +02:00
yflory a25a72b5db Add a proxy manager to handle operations between shared folders 2018-07-05 10:37:06 +02:00
ansuz ab04a7cb46 fix the bug I caused while trying to silence the linter 2018-07-02 17:43:39 +02:00
yflory 66591a3654 Merge branch 'rohref' into sharedfolder 2018-07-02 14:12:06 +02:00
yflory 846755b0a7 Increase requirejs timeout (thanks Firefox...) 2018-07-02 14:02:05 +02:00
ansuz a3e0e765b5 derive block URI and URL in dedicated functions 2018-07-02 11:11:50 +02:00
yflory a99e5a3aaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-02 11:03:58 +02:00
yflory af5cc30381 Fix undefined function when calling error() in the drive 2018-07-02 11:02:43 +02:00
yflory 071c34d4fa Fix undefined secret with password-protected files (#250) 2018-07-02 10:51:43 +02:00
yflory 27797c0520 Fix undefined secret with password-protected files (#250) 2018-07-02 10:50:30 +02:00
yflory 425ac8ea57 Migration for read-only links + fix issues with read-only pads 2018-06-29 18:16:04 +02:00
yflory 0f9a71686e Add support for read-only href stored in filesData 2018-06-28 18:16:38 +02:00
ansuz 12cf1993b9 flow compliance for loginBlock RPCs 2018-06-28 16:52:23 +02:00
yflory 34914785eb lint compliance 2018-06-28 16:15:38 +02:00
yflory a537f7de8b Fix infinite loading screen caused by some browser settings 2018-06-28 16:13:52 +02:00
yflory 470f404a24 temp 2018-06-28 15:31:30 +02:00
ansuz 57d0738f32 Merge branch 'modern-users' into staging 2018-06-28 15:30:10 +02:00
ansuz cc6f3dc0e4 lint compliance 2018-06-28 15:25:22 +02:00
ansuz cfc81e8c96 allocate blockSeed as Uint8Array 2018-06-28 15:21:13 +02:00
yflory 554b4a978d Load shared folders in the store 2018-06-28 14:15:30 +02:00
ansuz 7aa7b82c60 merge staging 2018-06-28 13:33:54 +02:00
ansuz c85a551546
Merge pull request #249 from xwiki-labs/de-translation-pl
Translating one extra line.
2018-06-28 13:30:23 +02:00
ansuz 76c9b01d45 update changelog one more time 2018-06-27 15:13:47 +02:00
ansuz fc6322b105 ignore /block/ 2018-06-27 15:03:48 +02:00
ansuz 2c56972be6 update changelog and example nginx config 2018-06-27 15:03:38 +02:00
ansuz 232ef4c243 Merge branch 'master' of /home/ansuz/Desktop/cryptpad 2018-06-27 13:51:32 +02:00
ansuz 04d080d5a8 2.4.0 changelog 2018-06-27 13:48:36 +02:00
ansuz 6d94f6ce21 roll back to pre-socket.io code 2018-06-26 15:31:57 +02:00
ansuz 02169bfa83 Revert "Use socket.io instead of WebSocket"
In hindsight this may have been a terrible idea.

RIP uptime.

This reverts commit 9195c57445.
2018-06-26 15:30:40 +02:00
yflory 6dc7e7eff4 Disable WebWorkers by default 2018-06-26 14:15:25 +02:00
yflory bfb850554d Fix the contacts app with workers 2018-06-25 18:08:47 +02:00