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 |
|
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 |
|
yflory
|
798296489a
|
Merge branch 'staging' into team
|
2019-09-10 15:32:05 +02:00 |
|
yflory
|
7e238245e6
|
Fix pad not stored in drive when accepting ownership
|
2019-09-10 15:30:36 +02:00 |
|
ansuz
|
532ba9b9fd
|
update XXX comments which are no longer valid or can wait
|
2019-09-10 10:29:08 +02:00 |
|
yflory
|
2bd8c2d363
|
Fix onreconnect in cursor
|
2019-09-09 18:56:49 +02:00 |
|
yflory
|
29075b7898
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-09-09 18:47:46 +02:00 |
|
yflory
|
c19ff5958c
|
Fix duplicate join in cursor.js
|
2019-09-09 18:47:34 +02:00 |
|
ansuz
|
9f9bce7ac5
|
create the 'what is cryptpad' pad as owned when you register
|
2019-09-09 18:12:05 +02:00 |
|
yflory
|
b84c4be69c
|
Display OS notifications when receiving a notification on CryptPad
|
2019-09-09 17:37:11 +02:00 |
|
yflory
|
dbe63f254a
|
Merge branch 'staging' into team
|
2019-09-09 15:39:28 +02:00 |
|
yflory
|
d993827c7e
|
Fix expiration time not updated properly on accept ownership
|
2019-09-09 15:31:59 +02:00 |
|
yflory
|
5e5d1ecddb
|
Update local metadata when fetching latest values from the server
|
2019-09-09 14:59:40 +02:00 |
|
yflory
|
84249a92b5
|
Keep only one getPadMetadata in outer
|
2019-09-09 14:47:57 +02:00 |
|
yflory
|
bb0365622b
|
re-encrypt the mailbox field when changing a pad password
|
2019-09-09 14:13:27 +02:00 |
|
yflory
|
0a5bf7a5c2
|
Update atime when updating the owners of a pad
|
2019-09-09 12:19:29 +02:00 |
|
yflory
|
634d24b46c
|
Team APP UI
|
2019-09-06 18:47:18 +02:00 |
|
yflory
|
15387af020
|
Merge branch 'staging' into team
|
2019-09-06 15:46:19 +02:00 |
|
yflory
|
834e12fcba
|
Teams: async-store refactoring
|
2019-09-06 15:45:56 +02:00 |
|
ansuz
|
ee3ac1cd56
|
drop unnecessary lint compliance
|
2019-09-06 13:36:59 +02:00 |
|
yflory
|
1d53e7d8a1
|
Teams: listAllTags and getTemplates
|
2019-09-05 19:03:42 +02:00 |
|
yflory
|
35a429d30c
|
Teams: setPadAttribute and getPadAttribute
|
2019-09-05 18:25:14 +02:00 |
|
yflory
|
4c339afc6c
|
Refactoring part2
|
2019-09-05 17:55:23 +02:00 |
|
yflory
|
7222d34dc0
|
Refactor async-store to make it work with teams
|
2019-09-05 13:56:47 +02:00 |
|
ansuz
|
096b0fb44a
|
move 'getDefaultName' out of 'common-hash'
|
2019-09-05 12:22:30 +02:00 |
|
yflory
|
a2edf5be64
|
Preparations for the Team refactoring
|
2019-09-04 17:59:44 +02:00 |
|
yflory
|
fd7567188b
|
Clean some code
|
2019-09-04 17:54:32 +02:00 |
|
yflory
|
670d845262
|
Move the shared folder loader to the new module
|
2019-09-04 17:46:52 +02:00 |
|
yflory
|
05caf86033
|
Merge branch 'staging' into team
|
2019-09-04 17:19:28 +02:00 |
|
yflory
|
dda115a6aa
|
lint compliance
|
2019-09-04 17:19:10 +02:00 |
|
yflory
|
8ff4e2fd8e
|
Test all shared folders with getDeletedPads because of editable metadata
|
2019-09-04 17:18:30 +02:00 |
|
yflory
|
7658dbcaeb
|
Add shared folder module
|
2019-09-04 17:14:44 +02:00 |
|
yflory
|
3745bb76dc
|
Add Team module
|
2019-09-04 16:37:52 +02:00 |
|
ansuz
|
12dd647a46
|
lint compliance
|
2019-09-04 11:13:17 +02:00 |
|
ansuz
|
cdb98ee27f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-09-03 18:08:11 +02:00 |
|
yflory
|
a8ec344203
|
Fix UI and rendering issues in the notifications panel
|
2019-09-03 17:58:56 +02:00 |
|
ansuz
|
83d0b1ad30
|
WIP clientside components of private mailbox messages
|
2019-09-03 17:53:12 +02:00 |
|
yflory
|
a6a40c3f6a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-09-03 17:05:23 +02:00 |
|
yflory
|
32f1d1627f
|
Refresh properties modal when receiving metadata updates
|
2019-09-03 13:30:35 +02:00 |
|
yflory
|
4708d59a65
|
Add notifications when removed from owners or pending_owners
|
2019-09-02 18:46:52 +02:00 |
|
yflory
|
d190b8acd0
|
Don't send user updates to friends via chat if you know their mailbox
|
2019-09-02 18:19:56 +02:00 |
|
ansuz
|
31c6e7241e
|
Merge branch 'soon' into staging
|
2019-09-02 15:25:20 +02:00 |
|
yflory
|
a7bc83ac5d
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2019-09-02 11:33:36 +02:00 |
|
yflory
|
9e8c717035
|
Fix onlyoffice lastKnownHash bug
|
2019-09-02 11:30:48 +02:00 |
|
yflory
|
e131661673
|
Accept and decline ownership offers
|
2019-08-30 17:36:27 +02:00 |
|
yflory
|
9822c28f3b
|
Implement ADD_OWNER notification with pending_owner metadata
|
2019-08-30 16:41:48 +02:00 |
|
ansuz
|
1b7d984d39
|
Merge branch 'soon' into staging
|
2019-08-30 11:57:46 +02:00 |
|
yflory
|
416e0cde17
|
Fix removeOwnedChannel
|
2019-08-29 11:29:50 +02:00 |
|
yflory
|
2a91643d59
|
Remove an owner
|
2019-08-28 16:37:13 +02:00 |
|
yflory
|
f6762f7c01
|
Make the friends list from the share modal reusable
|
2019-08-28 15:29:38 +02:00 |
|
yflory
|
06809fd3ba
|
Update codemirror settings in realtime
|
2019-08-19 16:53:17 +02:00 |
|
yflory
|
c608bdd2dc
|
Merge branch 'off' into staging
|
2019-08-19 15:38:22 +02:00 |
|
yflory
|
656b129543
|
Ability to remove handlers from worker-channel and metadata-manager
|
2019-08-19 15:37:08 +02:00 |
|
yflory
|
c1656d7b5b
|
Merge branch 'unifiedMetadata' into staging
|
2019-08-19 15:27:59 +02:00 |
|
yflory
|
6f0062d023
|
Add comments and timeout errors
|
2019-08-19 14:37:55 +02:00 |
|
ansuz
|
04feef793b
|
resolve merge conflicts
|
2019-08-16 17:39:22 +02:00 |
|
yflory
|
c4a90a90f2
|
Fix disconnection event not propagating to the UI
|
2019-08-16 11:33:57 +02:00 |
|
yflory
|
eaeb995661
|
Remove debugging code
|
2019-08-14 10:38:42 +02:00 |
|
yflory
|
06748dcfb3
|
missing comma
|
2019-08-13 14:23:29 +02:00 |
|
yflory
|
970dcb8b8b
|
null is an object
|
2019-08-12 15:40:25 +02:00 |
|
yflory
|
3303e9738d
|
Fix drive deletion
|
2019-08-12 15:38:21 +02:00 |
|
yflory
|
5c6b3155ac
|
Add safety measures to avoid removing your drive by accident
|
2019-08-12 15:30:59 +02:00 |
|
ClemDee
|
b49c39b895
|
Fix file progress value going over 100%
|
2019-07-19 11:34:30 +02:00 |
|
yflory
|
51facff6fd
|
Send a mailbox address (encrypted) to the owned pads metadata
|
2019-07-17 17:01:25 +02:00 |
|
yflory
|
f0d753e3f4
|
Merge branch 'staging' into unifiedMetadata
|
2019-07-17 15:25:01 +02:00 |
|
yflory
|
7bc0c7ce95
|
Fix duplicate notifications n reconnect
|
2019-07-17 10:49:26 +02:00 |
|
yflory
|
9b45f0dd79
|
Add translation keys
|
2019-07-16 17:29:55 +02:00 |
|
yflory
|
65d76a9241
|
Merge branch 'request' into staging
|
2019-07-16 14:37:03 +02:00 |
|
yflory
|
a169b4c3b3
|
Display a notification when there is a new message from the support team
|
2019-07-16 14:31:57 +02:00 |
|
yflory
|
5be37f2e45
|
Unified metadata
|
2019-07-13 15:24:54 +02:00 |
|
yflory
|
60bea6b33b
|
Request capabilities part 2
|
2019-07-13 11:47:58 +02:00 |
|
yflory
|
4156b1988f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-07-11 14:16:31 +02:00 |
|
yflory
|
6f1e281cf8
|
request capabilities temp
|
2019-07-11 14:16:04 +02:00 |
|
ansuz
|
5f5cd1e045
|
oups, add a missing closing brace
|
2019-07-08 12:12:42 +02:00 |
|
ansuz
|
8be6c84e2f
|
guard against null elements in the drive
|
2019-07-08 12:10:57 +02:00 |
|
yflory
|
9d476ce9cd
|
Fix error in the console
|
2019-07-05 17:06:02 +02:00 |
|
yflory
|
abf8ef6276
|
Pin admin mailbox
|
2019-07-04 10:37:05 +02:00 |
|
yflory
|
77e893c3ea
|
Merge branch 'staging' into support
|
2019-07-02 14:46:36 +02:00 |
|
yflory
|
3f500cfd5c
|
lint compliance
|
2019-07-01 18:19:54 +02:00 |
|
yflory
|
7a0f30488c
|
Hide duplicates when receiving access to a pad via notifications
|
2019-07-01 18:07:40 +02:00 |
|
yflory
|
2e8e6e6de2
|
Return th timestamp in mailbox history
|
2019-07-01 13:42:40 +02:00 |
|
yflory
|
75e0b68f51
|
Add mailbox history
|
2019-06-27 18:21:54 +02:00 |
|
yflory
|
93b4dac8bb
|
Support mailbox in the support and admin apps
|
2019-06-27 17:08:23 +02:00 |
|
yflory
|
22c9af6961
|
Support page
|
2019-06-25 16:39:15 +02:00 |
|
yflory
|
59d5723f3e
|
Fix read-only spreadsheets
|
2019-06-24 18:17:42 +02:00 |
|
yflory
|
bba3e355d0
|
Invalid ID fix
|
2019-06-24 12:28:49 +02:00 |
|
yflory
|
f5858f524d
|
Fix invalid file ID in the drive
|
2019-06-24 12:17:08 +02:00 |
|
yflory
|
f3dd85a7af
|
Fix infinite loading screen
|
2019-06-20 10:54:15 +02:00 |
|
yflory
|
2c661310c7
|
Merge branch 'staging' into foldersColor
|
2019-06-18 15:36:22 +02:00 |
|
yflory
|
1f5eb66fe0
|
Merge branch 'soon' into staging
|
2019-06-18 11:27:57 +02:00 |
|
yflory
|
eaa389fcb8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-06-18 11:10:56 +02:00 |
|
yflory
|
07775d6e13
|
Use shared folders events to pin and unpin pads
|
2019-06-18 11:10:46 +02:00 |
|
ClemDee
|
e9598de655
|
Add folder metadata and folder color
|
2019-06-18 10:44:27 +02:00 |
|
yflory
|
04d8578f4e
|
Shared folder history
|
2019-06-17 14:13:06 +02:00 |
|
ansuz
|
7b8ac3d8c8
|
Merge branch 'soon' into staging
|
2019-06-14 10:45:25 +02:00 |
|
yflory
|
3e4ee75137
|
Fix race condition with pins
|
2019-06-14 10:03:52 +02:00 |
|
yflory
|
db84b41225
|
Merge branch 'shareModal' into staging
|
2019-06-07 11:16:41 +02:00 |
|
yflory
|
ae9caecc52
|
fix race condition 2
|
2019-06-06 15:40:08 +02:00 |
|
yflory
|
62c96d562f
|
Fix race condition with nthen
|
2019-06-06 15:33:08 +02:00 |
|
yflory
|
9b5104c59e
|
Update the friends when changing the username or avatar
|
2019-06-05 18:23:15 +02:00 |
|
yflory
|
250d9f3bc6
|
Fix friend migration and handle UPDATE_DATA mails
|
2019-06-05 16:05:00 +02:00 |
|
yflory
|
6de97cac14
|
Migrate friends
|
2019-06-04 18:44:55 +02:00 |
|
yflory
|
d317053db4
|
Increase tab/worker timeout value
|
2019-05-28 14:14:09 +02:00 |
|
yflory
|
cc44fe846a
|
Update userlist when receiving unfriend
|
2019-05-28 10:56:13 +02:00 |
|
yflory
|
9d8433d104
|
Unfriend via mailbox
|
2019-05-27 18:58:35 +02:00 |
|
yflory
|
5512d1fab7
|
Remove test code
|
2019-05-27 17:55:28 +02:00 |
|
yflory
|
c3e9b51f76
|
Realtime update of the friendship status in the profile
|
2019-05-27 17:51:55 +02:00 |
|
yflory
|
6370c0eeae
|
Update the profile page when receiving a answer for a friend request
|
2019-05-27 16:03:10 +02:00 |
|
yflory
|
61161c034c
|
Fix profile not updating the user name
|
2019-05-27 15:45:26 +02:00 |
|
yflory
|
28c8834fa4
|
Remove the 'enablePinning' config property
|
2019-05-27 15:29:36 +02:00 |
|
yflory
|
bf0fd64a70
|
lint compliance
|
2019-05-27 15:07:11 +02:00 |
|
yflory
|
ccff67cf42
|
Fix missing name in notifications
|
2019-05-27 15:06:30 +02:00 |
|
yflory
|
727470d9ed
|
Add missing file
|
2019-05-27 14:59:08 +02:00 |
|
yflory
|
6404e5c430
|
Fix duplicate notications
|
2019-05-27 14:03:15 +02:00 |
|
yflory
|
8dd557a0f6
|
Remove the ACCEPT or DECLINE friend request messages instantly
|
2019-05-27 11:18:53 +02:00 |
|
yflory
|
df7a2f35fb
|
Profile refactoring with friend request
|
2019-05-24 17:45:03 +02:00 |
|
yflory
|
64b0a8c5e3
|
Re-join the mailboxes channels when reconnecting
|
2019-05-24 10:29:42 +02:00 |
|
yflory
|
e1b8d0bc6c
|
Fix friend request issue
|
2019-05-23 16:13:51 +02:00 |
|
yflory
|
4240d1c0d5
|
Fix empty username when declining a friend request
|
2019-05-23 16:02:21 +02:00 |
|
yflory
|
7666a008d7
|
Merge branch 'mailbox' into staging
|
2019-05-23 15:49:18 +02:00 |
|
yflory
|
19a91f11c6
|
Never dismiss friend requests
|
2019-05-23 15:33:23 +02:00 |
|
yflory
|
06a07d069e
|
Decline a friend request
|
2019-05-23 15:25:23 +02:00 |
|
yflory
|
9cb1a059f2
|
Improve friend request process and UI
|
2019-05-22 18:03:52 +02:00 |
|
yflory
|
38f8535dd5
|
Add the mailboxes channels to the pin list
|
2019-05-22 15:38:27 +02:00 |
|
yflory
|
991c56fec3
|
Friend requests with mailboxes
|
2019-05-21 18:43:11 +02:00 |
|
yflory
|
3be85b155d
|
Fix issues with templates in polls #375
|
2019-05-20 17:18:02 +02:00 |
|
yflory
|
0732773bba
|
lint compliance
|
2019-05-17 18:28:45 +02:00 |
|
yflory
|
11a365557c
|
Clear notifications viewed from another store (browser/worker)
|
2019-05-17 18:28:15 +02:00 |
|
yflory
|
7fd3bba2a6
|
Test sending a message from a pad (inner iframe)
|
2019-05-17 17:42:33 +02:00 |
|
yflory
|
9ead40a332
|
Test sending a message to a friend
|
2019-05-17 17:23:21 +02:00 |
|
yflory
|
b15c67e8d4
|
Enable encryption in mailboxes and post to other users
|
2019-05-17 16:55:56 +02:00 |