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 |
|