Commit graph

767 commits

Author SHA1 Message Date
yflory
3ae8d983f7 Merge branch 'history' into historyOO 2020-09-22 15:27:20 +02:00
yflory
e6bcd71d89 lint compliance 2020-09-22 11:00:54 +02:00
yflory
4f147d4fd2 Add support for onlyoffice history 2020-09-18 17:54:57 +02:00
yflory
b31707098a Improve getHistoryRange to support 'toHash' 2020-09-18 12:42:09 +02:00
yflory
6e4e932cc0 Merge branch 'staging' into history 2020-09-17 11:31:57 +02:00
yflory
fff2956393 Fix team edit rights not applied without a worker reload 2020-09-08 15:49:11 +02:00
yflory
16a95eb3fd Dismiss messages from a mailbox when closing it 2020-09-08 12:21:00 +02:00
yflory
9210bbd4fc Clear localStorage settings on logout 2020-09-08 11:50:52 +02:00
yflory
1bd6c134ae Remove console.log 2020-09-07 15:01:21 +02:00
yflory
7048f0d814 Fix an issue that could result in a self-kick from a team 2020-08-31 12:01:00 +02:00
yflory
e69df1b7dd Remove debugging logs 2020-08-31 11:03:36 +02:00
yflory
6aac0b91ce Improve team invitation notifications 2020-08-31 11:01:00 +02:00
yflory
63a7609a55 Fix typo 2020-08-31 10:52:08 +02:00
yflory
9d0f33bad1 Fix team invitation issues 2020-08-31 10:48:15 +02:00
yflory
bbd101ec8a Fix login issues with safe links 2020-08-05 15:03:06 +02:00
ansuz
2302d6ef7e Merge branch 'sfTrash' into staging 2020-07-21 11:18:56 -04:00
yflory
a798873230 Add basic support for versioned link 2020-07-08 14:59:23 +02:00
yflory
ba854e88c0 Merge branch 'staging' into history 2020-07-08 11:22:13 +02:00
yflory
f5831cccb0 Add support for version hash 2020-07-08 11:21:51 +02:00
yflory
2bac4193df lint compliance 2020-07-07 15:03:55 +02:00
yflory
f78c02a646 Fix drive issue after deleting a shared folder 2020-07-07 14:53:40 +02:00
yflory
abbdb496c3 Allow shared folders in the trash 2020-07-06 10:48:26 +02:00
yflory
1321c08a62 Merge branch 'staging' into sfAllow 2020-07-02 17:09:26 +02:00
yflory
27124997a5 lint compliance 2020-07-02 17:07:57 +02:00
yflory
415375d034 Merge branch 'owned' into staging 2020-06-30 18:02:56 +02:00
yflory
23648cc62b New empty trash button 2020-06-30 17:55:36 +02:00
yflory
e25756ceca Don't add the shared folder to your drive is there is an access list 2020-06-24 11:20:43 +02:00
yflory
bf8c43e9af Merge branch 'staging' into sfAllow 2020-06-24 10:40:59 +02:00
yflory
87af3569da Load team rpc when receiving edit rights 2020-06-23 11:29:52 +02:00
yflory
17e22d87af Don't leave the team automatically in case of GET_HISTORY error 2020-06-23 11:02:48 +02:00
ansuz
a79a5f6a2d remove some extraneous logs that were used for debugging 2020-06-22 14:58:56 -04:00
yflory
bb043914ab Remove console.error 2020-06-22 10:27:49 +02:00
ansuz
b663c20233 Merge branch 'staging' into teamBox 2020-06-18 07:19:43 -04:00
yflory
2c57a2d872 Add allow lists for shared folders 2020-06-17 17:40:33 +02:00
ansuz
4e2fc277e0 remove XXX notes 2020-06-16 07:11:54 -04:00
yflory
a8b4bdcfc6 lint compliance 2020-06-12 16:43:53 +02:00
yflory
84f1ea7bfb Allow user to remove owned pads from the drive without deleting them 2020-06-12 15:49:50 +02:00
yflory
580e5b9560 temp 2020-06-10 15:43:01 +02:00
yflory
4faa0839f9 Open the mailbox when joining a team 2020-06-10 12:29:29 +02:00
yflory
24c7ea985d Fix issues with the team mailbox 2020-06-10 12:14:51 +02:00
ansuz
c14cb9fa2a remove some XXX notes that have been addressed 2020-06-09 13:57:06 -04:00
yflory
bcfa09f7bc Fix mailbox issue and add XXX 2020-06-09 17:40:52 +02:00
yflory
9737224281 Use safe links by defaults for new users 2020-06-09 10:44:37 +02:00
ansuz
259b3bca65 use safe links by default 2020-06-08 15:34:20 -04:00
yflory
f7b61daff3 lint compliance 2020-06-05 12:08:43 +02:00
yflory
0390d3df75 Don't show your own team notifications 2020-06-05 12:04:28 +02:00
yflory
cb36a49908 Add team mailbox with the SHARE_PAD example 2020-06-04 16:54:56 +02:00
ansuz
cf426c24e5 WIP 2020-05-28 11:43:06 -04:00
yflory
8d9301e427 Fix account deletion issue 2020-05-28 17:27:47 +02:00
yflory
de684edfe2 Todo migration 2020-05-15 15:27:55 +02:00
ansuz
f941890017 Merge branch 'guards' into staging2 2020-05-05 09:51:27 -04:00
yflory
d7ce297d0d Fix user verifisation in mailbox messages 2020-05-05 11:12:58 +02:00
yflory
c26bbba73a lint compliance 2020-05-04 13:34:48 +02:00
yflory
977301dfc3 Get the pad data from team drives when mentionned in a comment 2020-05-04 12:16:34 +02:00
yflory
7c17d34d12 Fix errors 2020-04-29 12:30:59 +02:00
yflory
a05015ad3c Display mention notification if you don't have access to the pad 2020-04-28 16:43:44 +02:00
yflory
60555f65a7 Little fixes and improvements to comments 2020-04-28 16:40:40 +02:00
yflory
7309ae1b23 Add mentions 2020-04-28 15:54:12 +02:00
yflory
0cbe14acf5 Ability to disable comments notifications 2020-04-27 15:09:36 +02:00
yflory
473577a9f1 Send a notification when replying to a comment 2020-04-27 14:38:29 +02:00
yflory
b208ca367d Merge branch 'staging' into cba 2020-04-20 15:38:47 +02:00
yflory
41c0704ad8 Page mode by default in rich text 2020-04-20 11:56:12 +02:00
yflory
dd814713dd Merge branch 'staging' into cba 2020-04-17 15:17:24 +02:00
yflory
92738828ff Merge branch 'debugtime' into cba 2020-04-17 10:31:42 +02:00
yflory
62187d855f lint compliance 2020-04-07 14:29:58 +02:00
yflory
4672bf794b Make sure we don't try to get metadata for blobs 2020-04-07 11:03:35 +02:00
ansuz
2e290a6667 last minute fixes and notes 2020-04-06 18:21:07 -04:00
yflory
ae78f0a5df Merge branch 'staging' into debugtime 2020-04-03 11:20:03 +02:00
yflory
1169156e55 Replay history in order 2020-04-02 10:21:12 +02:00
yflory
c7688b7c8c Merge branch 'duplicateText2' into staging 2020-03-26 16:23:12 +01:00
yflory
e15196bd53 Merge branch 'reconnect' into staging 2020-03-26 15:24:38 +01:00
yflory
9aaddea148 Add edPublic to user profiles 2020-03-24 13:18:32 +01:00
yflory
8e8b371690 Fix issues with trim history in spreadsheets 2020-03-23 12:32:03 +01:00
yflory
fbae166702 Remove XXX 2020-03-16 14:51:43 +01:00
yflory
d69ad7c0e6 Send the error to chainpad when a patch is not sent 2020-03-16 12:06:18 +01:00
yflory
27c1291182 Fix duplicate text bug on reconnect or ACK timeout 2020-03-16 11:19:04 +01:00
yflory
578042154e Better reconnect after invalid lastKnownHash 2020-03-13 17:39:16 +01:00
yflory
7cd3701f26 Debug reconnect issues 2020-03-11 18:00:46 +01:00
yflory
718cdee907 Check if the worker is available when focusing a tab again 2020-03-11 16:24:39 +01:00
ansuz
6b657c47ce change an XXX to a TODO 2020-03-10 09:49:55 -04:00
yflory
d73b32a05e Make sure users can't block themselves with SF allow list 2020-03-09 12:12:29 +01:00
yflory
43787e1140 Allow list reconnect 2020-03-06 16:49:56 +01:00
yflory
62725caace Fix allow list UI issues 2020-03-06 12:55:20 +01:00
yflory
224b207a68 Fix migration from very old drive 2020-03-04 15:48:44 +01:00
yflory
60862d9f87 Fix isLoggedIn issue 2020-02-28 15:48:50 +01:00
ansuz
0989595358 lint compliance 2020-02-27 13:40:48 -05:00
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