Commit Graph

  • a440359bc7 Commit patches provided to me by someone who Seemed Trustworthy At The Time (should fix false negatives in shared-worker detection) Caleb James DeLisle 2018-07-12 16:59:36 +02:00
  • cb8888ea1a Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :| Caleb James DeLisle 2018-07-12 16:51:48 +02:00
  • fabdbc3b61 Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad... Caleb James DeLisle 2018-07-12 16:02:46 +02:00
  • 8516587ece lint compliance yflory 2018-07-11 15:28:34 +02:00
  • 9787f5304a Don't unpin channels that are still in another proxy yflory 2018-07-11 15:28:24 +02:00
  • 3fb6cb3d00 lint compliance ansuz 2018-07-11 11:35:44 +02:00
  • ca409e5eaa support import/export in kanban ansuz 2018-07-11 10:50:42 +02:00
  • 9b37d58f95 Total revision of german translation ilu33 2018-07-11 08:03:42 +02:00
  • 321c7d5512 Move pin/unpin outside of userObject yflory 2018-07-10 18:23:16 +02:00
  • 1d8943e673 support deprecation of non-owned drives ansuz 2018-07-10 18:09:33 +02:00
  • 8574128efd unstub password change function ansuz 2018-07-10 16:44:24 +02:00
  • 25b0d764ed pass initialState variable when copying your drive in the changeUserPassword function ansuz 2018-07-10 16:42:11 +02:00
  • 54bc29f28c WIP maybe I missed something ansuz 2018-07-10 15:16:43 +02:00
  • 66a494cbd2 temp yflory 2018-07-10 15:10:07 +02:00
  • 4b86ed2dec Shared folders UI yflory 2018-07-10 14:41:37 +02:00
  • 0a9ea95796 always set userHash in localStorage even with modern users ansuz 2018-07-10 13:11:22 +02:00
  • bc7524c134 Fix tippy yflory 2018-07-10 10:39:21 +02:00
  • 6312dadb60 Fix shared folders names in the drive yflory 2018-07-09 18:11:04 +02:00
  • ce7ebf0326 don't stop users from registering if they cancel out of a prompt ansuz 2018-07-09 15:31:20 +02:00
  • e0cc1a6eb6 Display a shared folder in the drive yflory 2018-07-09 14:36:55 +02:00
  • 16f276a18c fix anon pad import ansuz 2018-07-09 14:34:33 +02:00
  • a15e232469 complete modern user registration/login. general cleanup ansuz 2018-07-09 14:20:38 +02:00
  • 3d4b693722 use correctly scoped variable ansuz 2018-07-06 11:54:01 +02:00
  • d79064a4c5 Merge branch 'staging' into modern-users2 ansuz 2018-07-06 11:37:50 +02:00
  • 4ef2cfa88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-07-06 11:37:00 +02:00
  • 57a39258c3 WIP big commit ansuz 2018-07-06 11:36:48 +02:00
  • 0c3b898000 simple one line fixes ansuz 2018-07-06 10:28:41 +02:00
  • 0c9dfc1fb5 Add proxy manager inner yflory 2018-07-05 16:33:37 +02:00
  • bd6a199dca Add missing functions to the proxy manager yflory 2018-07-05 13:56:16 +02:00
  • a25a72b5db Add a proxy manager to handle operations between shared folders yflory 2018-07-05 10:37:06 +02:00
  • ab04a7cb46 fix the bug I caused while trying to silence the linter ansuz 2018-07-02 17:43:39 +02:00
  • 66591a3654 Merge branch 'rohref' into sharedfolder yflory 2018-07-02 14:12:06 +02:00
  • 846755b0a7 Increase requirejs timeout (thanks Firefox...) yflory 2018-07-02 14:02:05 +02:00
  • a3e0e765b5 derive block URI and URL in dedicated functions ansuz 2018-07-02 11:11:50 +02:00
  • a99e5a3aaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-07-02 11:03:58 +02:00
  • af5cc30381 Fix undefined function when calling error() in the drive yflory 2018-07-02 10:51:27 +02:00
  • 071c34d4fa Fix undefined secret with password-protected files (#250) yflory 2018-07-02 10:50:30 +02:00
  • 27797c0520 Fix undefined secret with password-protected files (#250) yflory 2018-07-02 10:50:30 +02:00
  • 425ac8ea57 Migration for read-only links + fix issues with read-only pads yflory 2018-06-29 18:16:04 +02:00
  • 0f9a71686e Add support for read-only href stored in filesData yflory 2018-06-28 18:16:34 +02:00
  • 12cf1993b9 flow compliance for loginBlock RPCs ansuz 2018-06-28 16:52:23 +02:00
  • 34914785eb lint compliance yflory 2018-06-28 16:15:38 +02:00
  • a537f7de8b Fix infinite loading screen caused by some browser settings yflory 2018-06-28 16:13:52 +02:00
  • 470f404a24 temp yflory 2018-06-28 15:31:30 +02:00
  • 57d0738f32 Merge branch 'modern-users' into staging ansuz 2018-06-28 15:30:10 +02:00
  • cc6f3dc0e4 lint compliance ansuz 2018-06-28 15:25:22 +02:00
  • cfc81e8c96 allocate blockSeed as Uint8Array ansuz 2018-06-28 15:21:13 +02:00
  • 554b4a978d Load shared folders in the store yflory 2018-06-28 14:15:30 +02:00
  • 7aa7b82c60 merge staging ansuz 2018-06-28 13:33:54 +02:00
  • c85a551546 Merge pull request #249 from xwiki-labs/de-translation-pl ansuz 2018-06-28 13:30:23 +02:00
  • 76c9b01d45 update changelog one more time ansuz 2018-06-27 15:13:47 +02:00
  • fc6322b105 ignore /block/ ansuz 2018-06-27 15:03:48 +02:00
  • 2c56972be6 update changelog and example nginx config ansuz 2018-06-27 15:03:38 +02:00
  • 232ef4c243 Merge branch 'master' of /home/ansuz/Desktop/cryptpad ansuz 2018-06-27 13:51:32 +02:00
  • 04d080d5a8 2.4.0 changelog ansuz 2018-06-27 13:48:36 +02:00
  • 6d94f6ce21 roll back to pre-socket.io code ansuz 2018-06-26 15:31:57 +02:00
  • 02169bfa83 Revert "Use socket.io instead of WebSocket" ansuz 2018-06-26 15:30:20 +02:00
  • 6dc7e7eff4 Disable WebWorkers by default yflory 2018-06-26 14:15:25 +02:00
  • bfb850554d Fix the contacts app with workers yflory 2018-06-25 18:08:47 +02:00
  • 87dc528a99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-06-25 16:59:52 +02:00
  • 6d8693ff8c Fix history mode UI yflory 2018-06-25 16:59:40 +02:00
  • 7dc393a2d2 remove debug log ansuz 2018-06-25 15:33:54 +02:00
  • d76f3dceab remove comment ansuz 2018-06-25 14:30:41 +02:00
  • fb5553f918 fix typo ansuz 2018-06-25 14:25:37 +02:00
  • 9820ac278f address npm warnings ansuz 2018-06-25 13:45:25 +02:00
  • 76bc82ac13 lint compliance yflory 2018-06-25 13:42:17 +02:00
  • 0160ef30b7 Fix pad password change yflory 2018-06-25 12:08:06 +02:00
  • 9b6895b47a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-06-25 11:13:08 +02:00
  • 355dc5c993 Hide account password change form in settings yflory 2018-06-25 11:13:02 +02:00
  • 4e9baff0b6 bump version ansuz 2018-06-25 11:00:59 +02:00
  • fbe940c024 Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge) yflory 2018-06-22 19:43:07 +02:00
  • 01614c4256 verify old user password before proceeding to change passwords ansuz 2018-06-22 15:34:50 +02:00
  • e03b9fe630 remove login-block dependency from settings ansuz 2018-06-22 11:46:08 +02:00
  • 85bcaa51f7 export a constant for the number of required bytes at login time ansuz 2018-06-22 11:37:48 +02:00
  • da35d94f73 don't require Block in /settings/ ansuz 2018-06-22 10:58:46 +02:00
  • 5c87bcf94a Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users yflory 2018-06-22 10:39:35 +02:00
  • a146f6acc9 Change user account password function yflory 2018-06-22 10:37:54 +02:00
  • a037f46b62 Merge branch 'staging' into modern-users ansuz 2018-06-22 10:28:11 +02:00
  • 52cc007431 Merge branch 'master' into staging yflory 2018-06-21 16:56:44 +02:00
  • ddcbd000dc Bump chainpad-server version yflory 2018-06-21 16:55:54 +02:00
  • 567a4d2d98 use more restrictive semver for chainpad-server ansuz 2018-06-21 16:54:57 +02:00
  • 89e64a7243 dispense bytes for block location ansuz 2018-06-21 16:52:04 +02:00
  • 990471460c lint compliance ansuz 2018-06-21 16:51:28 +02:00
  • ad0663c168 :q yflory 2018-06-21 16:48:09 +02:00
  • 29aca1da02 Bump listmap version yflory 2018-06-21 14:36:38 +02:00
  • 30beec0102 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-06-21 14:08:18 +02:00
  • d9c186a3da Merge branch 'staging' into socketio yflory 2018-06-21 14:01:56 +02:00
  • 10c76c6d4b Merge branch 'staging' into modern-users ansuz 2018-06-21 10:42:41 +02:00
  • fc35d06c83 Merge branch 'soon' into staging ansuz 2018-06-21 10:42:25 +02:00
  • 184708f859 fix login from register page ansuz 2018-06-21 10:40:09 +02:00
  • 6fde027a6c add some TODOs ansuz 2018-06-21 10:26:46 +02:00
  • 508521664f use nthen to sequence async events ansuz 2018-06-21 10:26:23 +02:00
  • 9a7abe0b1e Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users ansuz 2018-06-21 10:16:25 +02:00
  • c2014c5906 a bit of cleanup, bug fixes, and lint compliance ansuz 2018-06-21 10:16:16 +02:00
  • 36d1ae0f6c Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users yflory 2018-06-20 16:39:52 +02:00
  • 71b085ba23 Owned drive migration UI yflory 2018-06-20 16:39:01 +02:00
  • c3741f847d resolve conflicts from merge with staging ansuz 2018-06-20 14:29:13 +02:00
  • d03339f20b check for the presence of a blockHash in localStorage when logging in ansuz 2018-06-20 14:27:44 +02:00
  • a5b207d57b Password change UI yflory 2018-06-20 10:02:56 +02:00
  • 3ba0ad3cf1 get, set, and clear blocks from localStorage ansuz 2018-06-19 18:08:14 +02:00