Commit Graph

631 Commits (692da616f9004da6d980db1e02d170cb00aea557)

Author SHA1 Message Date
yflory e84503bd52 fixFiles optimizations 2020-02-27 13:21:10 +01:00
ansuz f951951077 merge communities-allow-list and lint compliance 2020-02-25 09:48:41 -05:00
yflory 6e6ba73eca Remove XXX 2020-02-24 14:55:29 +01:00
ansuz 42ffb4efb6 Merge branch 'staging' into communities-allow-list 2020-02-21 08:40:45 -05:00
yflory d0bce11c21 Fix errors when an anonymous user leaves the shared worker 2020-02-21 12:07:53 +01:00
yflory 620995506e lint compliance 2020-02-19 18:52:17 +01:00
yflory 43492b6df5 Add mute pad option 2020-02-19 18:51:04 +01:00
yflory d48cecf28e Load mailboxes after teams 2020-02-18 17:24:28 +01:00
yflory f04a6056ae Fix race condition with team access rights #497 2020-02-18 17:04:49 +01:00
yflory 1d24c85ca4 Add author and time of patches in debug app 2020-02-14 12:06:52 +01:00
yflory 415fc27539 Pin todo and trim its history 2020-02-11 14:08:11 +01:00
yflory b585cbba42 Improve trim history UI when completed 2020-02-11 12:05:09 +01:00
yflory 0f697ac865 Merge branch 'staging' into communities-trim 2020-02-11 11:10:12 +01:00
yflory 40b144f87b remove XXX 2020-02-10 15:24:27 +01:00
yflory 243abc3e53 Change default settings for hidden hash 2020-02-10 11:16:44 +01:00
yflory 4079f1bfdb Fix RPC command 2020-02-05 18:12:10 +01:00
yflory e6709f03aa Add trim history RPC command 2020-02-05 17:55:25 +01:00
yflory c9676e1c91 Merge branch 'staging' into communities-trim 2020-02-05 17:05:45 +01:00
yflory a973f907e5 Merge branch 'cornerPopup' into staging 2020-02-05 15:18:08 +01:00
yflory 2ee38ccc42 lint compliance 2020-02-05 13:33:32 +01:00
yflory 689ea40a92 Compute history size in the worker 2020-02-04 13:52:32 +01:00
yflory d736f783e7 Add txid in GET_HISTORY 2020-02-04 13:52:11 +01:00
yflory a9f8402110 Fix clear history in contacts 2020-02-04 11:04:52 +01:00
yflory c58a50081b lint compliance 2020-02-03 17:40:26 +01:00
yflory 4ac2f64726 Add history trim in the properties modal 2020-02-03 17:38:15 +01:00
yflory 5ead391706 Add comments and improve trim history warnings 2020-02-03 12:22:26 +01:00
yflory b28f262c86 History trimming placeholder 2020-02-03 12:04:01 +01:00
yflory cfa4c6e7bb Fix type error in mailbox 2020-01-31 17:34:26 +01:00
yflory f253e19575 Merge branch 'communities-hash' into staging 2020-01-29 18:38:26 +01:00
yflory 464eaee49a Restore full hash when safe hash is deleted from the drive 2020-01-29 18:38:13 +01:00
yflory 0a543ae6ea Enable onlyoffice reconnection 2020-01-29 16:40:46 +01:00
yflory e32398b308 lint compliance 2020-01-29 16:37:33 +01:00
yflory f0f91b7ab2 Create the folders recursively if a new pad path doesn't exist 2020-01-28 13:43:31 +01:00
yflory 7a02b074b7 Hidden hash for files 2020-01-27 15:45:57 +01:00
yflory 0ad96e0966 Hide the crypto keys from the hash 2020-01-27 12:18:25 +01:00
David Benqué 003a616c81 remove XXXs 2020-01-21 10:13:41 +01:00
yflory 1e6e9fd288 Remove deleted pad from the drive 2020-01-13 15:58:46 +01:00
yflory 09da8ac6a2 Warn the owners when deleting a BAR pad 2020-01-13 15:11:45 +01:00
yflory 1bf48a5a8c lint compliance 2020-01-09 17:30:53 +01:00
yflory 9ee9e46087 Receiving a burn after reading URL 2020-01-09 17:30:15 +01:00
yflory 96a00f89df Generate burn after reading link for pads 2020-01-09 15:20:11 +01:00
yflory 080ffa09a6 Fix 'team is undefined' error 2020-01-06 10:43:04 +01:00
ansuz 97bc793ca8 simplify websocket configuration even more 2019-12-23 17:39:13 -05:00
ansuz 2dfbb522b0 simplify server websocket configuration 2019-12-23 17:01:00 -05:00
yflory c2c5dbdb64 Remove hash when joining a team with a link 2019-12-20 15:48:29 +01:00
yflory 826a86c7d6 Fix joining your own team 2019-12-19 16:21:10 +01:00
yflory 4869b4e0c3 Delete invitation after using it 2019-12-19 11:56:20 +01:00
ansuz ea7d254d2f remove XXX 2019-12-18 18:00:27 -05:00
ansuz 167a846cf3 remove unused dependency 2019-12-18 17:59:28 -05:00
yflory 9ad2bf2bd6 lint compliance 2019-12-18 19:11:35 +01:00
yflory e0782d753d Fix conflicting curvePublic 2019-12-18 19:10:30 +01:00
yflory 186487cbda Fix cryptput issues 2019-12-18 18:45:17 +01:00
ansuz f4072ae817 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-18 12:02:52 -05:00
ansuz 9824136917 fix a typo 2019-12-18 12:02:42 -05:00
yflory 6945628cf1 handle error in team outer 2019-12-18 17:45:57 +01:00
yflory 97f322753a Add owners to invitation channels 2019-12-18 17:12:29 +01:00
yflory 32fd1b4971 remove debugging console.error 2019-12-18 17:00:38 +01:00
yflory 1826d05e31 Keep cloned data when accepting team invitation 2019-12-18 16:58:02 +01:00
yflory e6e1ef72e7 Merge branch 'staging' into inviteUI 2019-12-18 15:12:43 +01:00
yflory a817242fe5 Fix join team for anon users 2019-12-18 13:05:01 +01:00
yflory fc8ee58cfb Fix joinTeam undefined data 2019-12-18 12:09:41 +01:00
yflory a5f88c505d lint compliance 2019-12-18 11:37:17 +01:00
yflory 400b39d46a Join a team from a link 2019-12-18 11:35:39 +01:00
yflory 3d1b3b5d18 Fix RPC data 2019-12-18 10:52:20 +01:00
ansuz 89b5e30309 more WIP 2019-12-17 19:27:39 -05:00
yflory 3aa111d8a8 lint compliance 2019-12-17 11:49:32 +01:00
yflory 35dbfe0bb5 Pin the invitation link channels 2019-12-17 11:17:31 +01:00
yflory 5a055233c0 Fix cryptget inner 2019-12-17 10:57:13 +01:00
yflory e38d6d1093 Fix link generation 2019-12-17 10:29:02 +01:00
ansuz c82c50c274 WIP team invitations 2019-12-16 20:57:19 -05:00
ansuz 1a521b57c8 implement INVITE and ACCEPT roster methods 2019-12-16 17:22:30 -05:00
yflory 47128802a2 Merge branch 'staging' into mute 2019-12-16 14:43:14 +01:00
ansuz 4a83103f52 WIP invitation API 2019-12-13 18:38:05 -05:00
yflory e8c1eb9f11 Improve mute/unmute process 2019-12-13 18:22:14 +01:00
yflory be9dce674f Open and Scrypt invitation link 2019-12-13 17:03:24 +01:00
yflory 9391698f54 Add scrypt and spinner to the link creation process 2019-12-13 11:59:14 +01:00
yflory fa8096fc76 lint compliance 2019-12-12 18:16:42 +01:00
yflory ef05ac440e Invitation link UI 2019-12-12 18:14:17 +01:00
yflory aa8dd95310 Add unfriend, mute and unmute buttons in profile 2019-12-11 13:28:07 +01:00
yflory 11ddb96422 Mute friends: dismiss notifications and fix UI issues 2019-12-10 13:07:57 +01:00
yflory 3528516ab9 Merge branch 'staging' into ooPassword 2019-12-09 16:05:24 +01:00
yflory 111141628c lint compliance 2019-12-09 16:02:24 +01:00
yflory 73a03e8d80 Fix getFullHistory and getHistory errors 2019-12-09 15:05:03 +01:00
yflory bbf2e3a9ae Mute and unmute users 2019-12-06 16:10:19 +01:00
yflory 71d2f8388d Rename a variable 2019-11-29 14:32:40 +01:00
yflory cc4e6d9a1e Fix integrity checks 2019-11-29 14:30:12 +01:00
yflory 580731d560 Merge branch 'staging' into ooPassword 2019-11-26 16:13:41 +01:00
yflory d8df3fd034 Remove XXX 2019-11-25 16:53:47 +01:00
yflory c414bf1d5c Merge branch 'staging' into ooPassword 2019-11-25 16:51:06 +01:00
yflory 6ee98cac5b Fix premium account detection 2019-11-25 11:47:52 +01:00
yflory 15e23a2d04 Merge branch 'soon' into staging 2019-11-21 15:30:21 +01:00
yflory 2b4c3e9e90 Fix team quota 2019-11-20 17:15:38 +01:00
ansuz e7da5493ee Merge branch 'soon' into staging 2019-11-20 10:09:00 -05:00
yflory 1e2b2a27cf Fix synchronous nthen callback 2019-11-19 17:55:33 +01:00
yflory da32864413 Fix other read-only teams issues 2019-11-19 15:45:37 +01:00
yflory fd36825f45 Fix Team Drive is read only even for owners #464 2019-11-19 12:07:05 +01:00
yflory 62f133dc63 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2019-11-18 14:57:12 +01:00
yflory e7ba890479 Fix href re-encryption on setPadTitle 2019-11-18 14:56:46 +01:00
yflory 6047a8640e temp 2019-11-14 15:49:46 +01:00
yflory c9c19b8395 Offline drive (or team) detection 2019-11-14 11:44:23 +01:00