Commit graph

767 commits

Author SHA1 Message Date
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
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
yflory
b5a58e3e0b Don't deprecate read-only shared folders 2019-11-12 17:38:00 +01:00
yflory
bfd46fb570 Destroy team rpc when demoted to viewer 2019-11-12 16:45:06 +01:00
ansuz
86bc0bcae7 lint compliance 2019-11-08 11:54:07 -05:00
ansuz
05827d9202 Merge branch 'soon' into staging 2019-11-08 09:31:38 -05:00
yflory
8e403c4f46 Merge branch 'ro' into filePassword 2019-11-08 15:28:35 +01:00
yflory
f44e6f9719 lint compliance 2019-11-08 12:08:21 +01:00
yflory
f42574948e Encrypt href for new pads in old shared folders 2019-11-08 12:07:08 +01:00
yflory
5dcc7643da Fix missing teams in the share modal 2019-11-08 12:04:30 +01:00
yflory
722d813e97 Enable read-only migration for teams 2019-11-08 10:15:54 +01:00
yflory
039ab83440 Improve migration script 2019-11-07 17:02:22 +01:00
yflory
5c223f1ae1 Warn users when the drive is offline 2019-11-07 11:54:58 +01:00
yflory
c64eabc33a Change blob password 2019-10-30 18:29:33 +01:00
yflory
96968f2076 Disable 'forget' button for pads in read-only teams 2019-10-29 12:24:44 +01:00
yflory
57a402da72 Make sure we don't encrypt href twice 2019-10-29 11:44:00 +01:00
yflory
b6d44b2a1a Leave the channel when a shared folder is removed from a drive 2019-10-28 18:41:00 +01:00
yflory
176e667128 Add more migration options 2019-10-28 18:22:42 +01:00
yflory
f6bbe70f3c Fix notification issue 2019-10-28 17:40:26 +01:00
yflory
b04d8c0821 Add permissions table 2019-10-28 17:05:11 +01:00
yflory
289f71ae8b Merge branch 'staging' into ro 2019-10-28 15:10:29 +01:00
yflory
a1e4c52a83 Fix editable UI displayed for team viewers 2019-10-28 14:05:08 +01:00
yflory
ccf4553ed3 Fix share modal with unregistered users #457 2019-10-28 10:37:04 +01:00
yflory
37a72d2f87 Fix more issues when changing password of a readonly folder 2019-10-25 16:36:00 +02:00
yflory
f9723a6183 Fix read-only shared folders with password change 2019-10-24 16:06:37 +02:00
yflory
9477ae0895 Merge branch 'sfPassword' into ro 2019-10-22 17:26:32 +02:00
yflory
126f10b782 Fix shared folder password change issues 2019-10-22 17:23:31 +02:00
yflory
fa2ad4e476 Add /p/ to the hash when adding a password 2019-10-22 13:06:21 +02:00
yflory
427cf836b1 Improve password change workflow 2019-10-22 12:50:10 +02:00
yflory
c894351a30 Fix pinning issue causing unnecessary reset 2019-10-22 11:21:41 +02:00
yflory
b2f89e289d Merge branch 'sfPassword' into ro 2019-10-21 17:43:46 +02:00
yflory
efded1063f Fix shared folder duplication bug 2019-10-21 17:26:52 +02:00
yflory
302030e1ee Shared folder password change 2019-10-21 15:23:13 +02:00
yflory
66f2ece08e Add feedback keys 2019-10-15 18:03:53 +02:00
yflory
50829d3db1 Share a folder with a read-only URL 2019-10-14 17:37:58 +02:00
yflory
a3d273ec47 Update rights in inner 2019-10-14 12:01:44 +02:00
yflory
d443c93893 Upgrade/downgrade shared folders access rights 2019-10-11 18:15:48 +02:00
yflory
8ca7e11150 Add support for viewers in roster 2019-10-10 13:59:10 +02:00
yflory
8dcc2cad82 lint compliance 2019-10-10 13:56:55 +02:00
yflory
13df7e8d38 Fix team editor 2019-10-10 13:56:12 +02:00
yflory
d3b03f46ea Migration script 2019-10-10 12:35:01 +02:00
yflory
9a0251f4ba Ability to open an anonymous read only shared folder 2019-10-08 18:47:54 +02:00
yflory
4e4d01a471 Improve getStrongerHash to also look inside shared folders 2019-10-08 17:54:52 +02:00
yflory
e0a1b8724b Merge branch 'staging' into ro 2019-10-08 17:22:44 +02:00
yflory
50d0abd193 Fix team creation UI issue 2019-10-08 15:26:03 +02:00
yflory
e5deffe21f Fix team deletion 2019-10-08 11:10:26 +02:00
yflory
3015d7f22b Fix team deletion 2019-10-08 11:10:03 +02:00
yflory
75b3c99d04 Remove refactoring comment 2019-10-07 18:38:49 +02:00
yflory
5ab3f39fb8 Encrypted href 2019-10-07 18:30:46 +02:00
yflory
7f3aacefd4 Fix undefined range_requests in messenger 2019-10-07 14:37:00 +02:00
yflory
cf0d0e8e4b Provide the secondaryKey to userObject 2019-10-07 14:35:11 +02:00
yflory
39dbea0c10 Fix notifications displayed once per tab 2019-10-07 10:57:37 +02:00
yflory
d5c4285c61 lint compliance 2019-10-03 16:36:04 +02:00
yflory
b79b4dfe8a Fix messenger blocked for unregistered users 2019-10-03 16:23:51 +02:00
yflory
e80edd4a0b Fix error message printed in the console for unregistered users 2019-10-03 16:23:27 +02:00
yflory
66d7d93496 Send an event to all the teams when adding a pad to a drive 2019-10-03 11:18:43 +02:00
yflory
3648eec7a6 Use only one listmap when a shared folder is stored in multiple teams 2019-10-02 18:56:03 +02:00
yflory
0a8c6dc6b2 Fix issue with a same shared folder loaded in multiple teams 2019-10-02 17:49:51 +02:00
yflory
50e39f9945 Fix a race condition in teams 2019-10-01 11:33:42 +02:00
yflory
123794fe99 Remove console.error 2019-09-30 17:38:09 +02:00
yflory
b5cce5f215 Improve team and account deletion for pads multiple owners 2019-09-30 17:36:56 +02:00
yflory
a530776ba8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-30 15:54:34 +02:00
yflory
1288f28931 Team deletion 2019-09-30 15:49:02 +02:00
ansuz
2a809cf120 roster changes:
* validate that a user can add a role before adding them
* support deletion of non-required metadata attributes via null
2019-09-30 15:35:27 +02:00
yflory
7b4a72b3a2 lint compliance 2019-09-30 15:20:44 +02:00
yflory
295a712942 Transfer team ownership 2019-09-30 15:17:26 +02:00