Commit graph

572 commits

Author SHA1 Message Date
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