Commit graph

599 commits

Author SHA1 Message Date
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
ansuz
59a361449d don't allow deletion of displayName or notifications via describe command 2019-09-30 14:56:16 +02:00
ansuz
fd31fd3096 roster changes: validate roles when describing. interpret assignment of null as deletion. prevent a typeError when describing somebody that doesn't exist 2019-09-30 11:50:01 +02:00
yflory
3fb0cc38ec Delete team 2019-09-27 18:04:48 +02:00
yflory
aaed0b939e Transfer ownership from or to a team 2019-09-27 16:00:58 +02:00
ansuz
61e66e9add WIP invitation link generation 2019-09-27 12:05:08 +02:00
ansuz
83c19f01f3 Merge branch 'soon' into staging 2019-09-27 11:57:09 +02:00
yflory
8536962fd1 Fix drive event always sent when fetching new pad metadata 2019-09-26 15:01:34 +02:00
yflory
5ad5e32ec8 Change pad password with a team owner 2019-09-26 11:19:16 +02:00
yflory
7c4bc1d583 Teams app improvements 2019-09-25 18:21:45 +02:00
yflory
636b3588cf Fix anonymous shared folders 2019-09-25 12:37:38 +02:00
yflory
007c73d36b Add a limit of teams 2019-09-24 15:25:54 +02:00
yflory
acae946528 Merge branch 'soon' into staging 2019-09-24 15:13:58 +02:00
yflory
5e80efda58 Fix val is undefined 2019-09-24 14:48:52 +02:00
yflory
d90115fbc9 Add translation keys and remove/fix XXX 2019-09-24 10:52:03 +02:00
yflory
b3041bd59a Store latest metadata when loading a team 2019-09-23 17:56:16 +02:00
yflory
851f6db7fb Fix type error in messenger 2019-09-23 17:52:15 +02:00
yflory
0de7395258 Fix metadata not updated when creating a team 2019-09-23 17:01:30 +02:00
yflory
b1dab8e75a Add team usage bar 2019-09-23 15:45:24 +02:00
yflory
83bc0d84f0 Add comments and XXX 2019-09-23 14:35:57 +02:00
yflory
4128c34b93 Fix messenger issues 2019-09-23 14:35:43 +02:00
yflory
f27451e51c Fix leave team error 2019-09-23 12:10:46 +02:00
yflory
9e43e8226f Merge branch 'staging' into team 2019-09-23 11:53:50 +02:00
ansuz
2d761388c1 always return errors as strings when sending roster messages. fix getLastCheckpointHash logic 2019-09-23 11:43:28 +02:00
yflory
97efaf2417 Update roster last known hash 2019-09-23 11:38:57 +02:00
yflory
78022fa527 Merge branch 'staging' into team 2019-09-23 11:35:20 +02:00
yflory
4381ff8107 Leave a team 2019-09-23 11:34:57 +02:00
ansuz
c8389ba657 implement roster.getLastCheckpointHash 2019-09-23 11:07:18 +02:00
yflory
9e7dfed98b Update roster checkpoints hash 2019-09-23 11:04:05 +02:00
yflory
1a9229e0ec Notify the other user when we kick them from a team 2019-09-23 10:51:46 +02:00
yflory
45d37acc84 lint compliance 2019-09-20 17:29:21 +02:00
yflory
5d18dcc8ba Realtime updates when the roster changes 2019-09-20 17:27:15 +02:00
yflory
3cc8b5eb83 Fix roster.stop fix 2019-09-20 16:49:38 +02:00
yflory
5b006a8819 Fix roster.stop 2019-09-20 16:38:04 +02:00
yflory
e4e2c3a19d Team invitation 2019-09-20 15:27:20 +02:00
yflory
1e1d24c6c3 Merge branch 'staging' into team 2019-09-19 13:47:43 +02:00
ansuz
047d64a3c2 clone objects passed to roster commands to avoid mutating the passed value 2019-09-19 13:44:48 +02:00
yflory
30d9cf31c3 Display roster in the team app 2019-09-19 13:30:31 +02:00
ansuz
ce5c841a42 implement auto-checkpoint logic 2019-09-19 09:18:07 +02:00
yflory
3d96f3d7b1 lint compliance 2019-09-18 18:01:37 +02:00
yflory
1b9a8828e9 Update team name and add an avatar to the team 2019-09-18 18:00:44 +02:00
yflory
bd8df41fde Merge branch 'staging' into team 2019-09-18 16:32:35 +02:00
ansuz
7230ee71a8 fix json.sortify in browser contexts. lint compliance 2019-09-18 16:31:23 +02:00
ansuz
4269cb1ec7 fixed a few roster bugs 2019-09-18 16:27:01 +02:00
yflory
84833afcfa Merge branch 'staging' into team 2019-09-18 16:16:46 +02:00
yflory
0d3f9db184 Improve sharing between drive and teams 2019-09-18 16:02:58 +02:00
ansuz
073543fe3d more WIP for roster 2019-09-18 15:04:08 +02:00
yflory
fc2938a27e Fix back button in teams with messenger and drive 2019-09-18 13:30:24 +02:00
yflory
5e58f7db4c Merge branch 'staging' into team 2019-09-17 18:50:14 +02:00
ansuz
5c984854c7 WIP 2019-09-17 18:49:49 +02:00
yflory
9cbe9dbf50 Load the team roster 2019-09-17 18:49:19 +02:00
yflory
fa89ab410d Revert previous commit and make the team pin everything 2019-09-17 16:54:09 +02:00
yflory
02cd15882b Fix reset pin with teams 2019-09-17 16:33:13 +02:00
yflory
74d7c00134 Store team chat keys in the user proxy 2019-09-17 16:24:48 +02:00
yflory
a7c274e6ae Merge branch 'staging' into team 2019-09-17 11:34:03 +02:00
yflory
fb22a4a792 Merge branch 'chat3' into team 2019-09-17 11:33:26 +02:00
ansuz
be8b014b36 WIP roster implementation 2019-09-17 11:28:22 +02:00
yflory
b58b6fa691 Fix back button in teams 2019-09-17 11:09:40 +02:00
yflory
81c2df389a Team chat 2019-09-17 11:05:32 +02:00
yflory
08b105bc10 Remove dead code 2019-09-16 17:27:52 +02:00
yflory
641b69446d Fix issues and replace chat module 2019-09-16 16:48:32 +02:00
yflory
c6a4f78097 Chat V3 2019-09-16 15:56:50 +02:00
yflory
b76cef9660 Store a pad in a team drive 2019-09-13 16:45:07 +02:00
yflory
306fc6cdb9 Create and store pads in a team 2019-09-12 17:54:50 +02:00
yflory
7f0dd4f576 Load shared folder and register change events in teams 2019-09-11 18:01:48 +02:00
yflory
fa2d148df4 Display a team drive 2019-09-11 16:24:04 +02:00
ansuz
c17a28cced WIP roster definition 2019-09-11 15:41:50 +02:00
yflory
222ea650d1 lint compliance 2019-09-10 18:37:11 +02:00
yflory
1b31d8f7c6 Create a team 2019-09-10 18:32:12 +02:00