yflory
|
563e2161c3
|
Merge branch 'staging' into inviteUI
|
2019-12-18 16:23:15 +01:00 |
|
yflory
|
032186cc4c
|
Fix unsanitized name in profile again
|
2019-12-18 16:15:33 +01:00 |
|
yflory
|
704d42d169
|
Fix unsanitized name in profile
|
2019-12-18 16:08:22 +01:00 |
|
yflory
|
e6e1ef72e7
|
Merge branch 'staging' into inviteUI
|
2019-12-18 15:12:43 +01:00 |
|
yflory
|
a34aad78ab
|
Remove duplicate code
|
2019-12-18 15:12:33 +01:00 |
|
ansuz
|
1dee406365
|
bump footer version
|
2019-12-18 08:25:15 -05:00 |
|
David Benqué
|
091ffc6070
|
fixHTML of user and team names in translation key
|
2019-12-18 13:08:15 +00:00 |
|
David Benqué
|
f548266746
|
add translation keys
|
2019-12-18 12:57:43 +00:00 |
|
yflory
|
a817242fe5
|
Fix join team for anon users
|
2019-12-18 13:05:01 +01:00 |
|
yflory
|
8eed376274
|
Fix default category after joining a team
|
2019-12-18 12:42:24 +01:00 |
|
yflory
|
efa56e5fbc
|
lint compliance
|
2019-12-18 12:32:13 +01:00 |
|
yflory
|
404f5fb4da
|
Handle max teams slots with link invitation
|
2019-12-18 12:29:39 +01:00 |
|
yflory
|
fc8ee58cfb
|
Fix joinTeam undefined data
|
2019-12-18 12:09:41 +01:00 |
|
yflory
|
b58901e229
|
Fix link generation
|
2019-12-18 12:04:36 +01:00 |
|
yflory
|
0574bd9286
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-18 11:37:21 +01:00 |
|
yflory
|
a5f88c505d
|
lint compliance
|
2019-12-18 11:37:17 +01:00 |
|
David Benqué
|
e406bf05e8
|
Merge remote-tracking branch 'origin/inviteUI' into inviteUI
|
2019-12-18 10:35:54 +00:00 |
|
yflory
|
400b39d46a
|
Join a team from a link
|
2019-12-18 11:35:39 +01:00 |
|
David Benqué
|
3c9199ed42
|
UI for invite accept page
|
2019-12-18 10:35:21 +00:00 |
|
yflory
|
3d1b3b5d18
|
Fix RPC data
|
2019-12-18 10:52:20 +01:00 |
|
yflory
|
906b315487
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-18 10:42:03 +01:00 |
|
yflory
|
fc651747ca
|
Fix error message not displayed when creating a invitation link
|
2019-12-18 10:38:30 +01:00 |
|
ansuz
|
89b5e30309
|
more WIP
|
2019-12-17 19:27:39 -05:00 |
|
yflory
|
5b8eb1c070
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-12-17 17:57:28 +01:00 |
|
yflory
|
215cabc053
|
Fix sidebar layout buttons in team drive
|
2019-12-17 17:57:07 +01:00 |
|
David Benqué
|
03cf969c41
|
remove hard-coded key
|
2019-12-17 16:50:00 +00:00 |
|
David Benqué
|
147d6cf232
|
Merge remote-tracking branch 'origin/staging' into staging
|
2019-12-17 16:41:10 +00:00 |
|
David Benqué
|
43d30081e7
|
spacing of buttons in manage mute modal
|
2019-12-17 16:40:02 +00:00 |
|
yflory
|
790c9aa0d7
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-17 17:28:31 +01:00 |
|
yflory
|
cf2a624775
|
Add 'Join team' and 'Decline' buttons
|
2019-12-17 17:28:19 +01:00 |
|
yflory
|
d9ae669015
|
Handle deleted invitation error
|
2019-12-17 17:18:45 +01:00 |
|
David Benqué
|
972f50052d
|
Merge branch 'sidebarbuttons' of github.com:xwiki-labs/cryptpad into sidebarbuttons
|
2019-12-17 16:10:41 +00:00 |
|
David Benqué
|
1588ced325
|
add spacing to manage mute modal
|
2019-12-17 16:10:36 +00:00 |
|
yflory
|
55baf4ab29
|
Merge branch 'sidebarbuttons' of github.com:xwiki-labs/cryptpad into sidebarbuttons
|
2019-12-17 17:04:04 +01:00 |
|
yflory
|
4cc2da7222
|
Fix HTML message displayed as text in profile
|
2019-12-17 17:03:56 +01:00 |
|
yflory
|
0b248348eb
|
Fix mute/unmute button in contacts
|
2019-12-17 17:01:15 +01:00 |
|
David Benqué
|
71ac44e239
|
move help icon color to alertify styles
|
2019-12-17 15:54:02 +00:00 |
|
David Benqué
|
84174dbced
|
re-fix password help icon
|
2019-12-17 15:46:38 +00:00 |
|
David Benqué
|
0f87052198
|
fix password help icon alignment
|
2019-12-17 15:34:53 +00:00 |
|
David Benqué
|
2dd5f5fc2f
|
fix password help icon
|
2019-12-17 15:09:57 +00:00 |
|
David Benqué
|
45e74e416c
|
style manage muted button
|
2019-12-17 14:16:34 +00:00 |
|
yflory
|
64fba3e379
|
Merge branch 'mute' into sidebarbuttons
|
2019-12-17 14:28:37 +01:00 |
|
yflory
|
55acf9d4a0
|
Merge branch 'staging' into mute
|
2019-12-17 14:28:23 +01:00 |
|
David Benqué
|
d2ea3c4221
|
show form and switch buttons if error
|
2019-12-17 11:18:38 +00:00 |
|
David Benqué
|
5302077be1
|
Merge branch 'inviteUI_design' into inviteUI
|
2019-12-17 10:52:18 +00:00 |
|
David Benqué
|
3cd957a552
|
fix button margins
|
2019-12-17 10:51:17 +00:00 |
|
yflory
|
3aa111d8a8
|
lint compliance
|
2019-12-17 11:49:32 +01:00 |
|
yflory
|
5174472329
|
Fix link generation bug
|
2019-12-17 11:48:23 +01:00 |
|
David Benqué
|
4f8ca40d36
|
hide and show buttons to create/copy link
|
2019-12-17 10:30:44 +00:00 |
|
yflory
|
6a712a7b52
|
View pending invitation links and remove them (if admin)
|
2019-12-17 11:24:49 +01:00 |
|