ansuz
|
663a1138b4
|
trim leading spaces from domains
|
2019-12-18 12:01:58 -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
|
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é
|
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é
|
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 |
|
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
|
da4399e3dc
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-16 20:58:23 -05: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
|
495cb4403b
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-16 18:37:53 +01:00 |
|
yflory
|
0716014eef
|
Refactoring joining team from link
|
2019-12-16 18:36:34 +01:00 |
|
ansuz
|
0cbde8d90f
|
Merge branch 'staging' into inviteUI
|
2019-12-16 12:07:46 -05:00 |
|
ansuz
|
af6b77a2ff
|
fix script errors
|
2019-12-16 11:59:12 -05:00 |
|
David Benqué
|
71da3ed723
|
add button keys
|
2019-12-16 16:51:53 +00:00 |
|
Weblate
|
5a55bcde3d
|
Translated using Weblate (French)
Currently translated at 100.0% (1173 of 1173 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
|
2019-12-16 16:51:03 +00:00 |
|
Weblate
|
c21a45fbde
|
Translated using Weblate (English)
Currently translated at 100.0% (1173 of 1173 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1172 of 1172 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
|
2019-12-16 16:51:03 +00:00 |
|
Weblate
|
daf5017bda
|
Translated using Weblate (German)
Currently translated at 98.9% (1158 of 1171 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
|
2019-12-16 16:40:21 +00:00 |
|
Weblate
|
6d4bfe4dfd
|
Translated using Weblate (French)
Currently translated at 100.0% (1171 of 1171 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
|
2019-12-16 16:40:21 +00:00 |
|
Weblate
|
b332c97db9
|
Translated using Weblate (English)
Currently translated at 100.0% (1171 of 1171 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1170 of 1170 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1169 of 1169 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1168 of 1168 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1167 of 1167 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1166 of 1166 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1165 of 1165 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1164 of 1164 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
|
2019-12-16 16:40:21 +00:00 |
|
yflory
|
4626d036cb
|
Cryptget in common/invitation
|
2019-12-16 17:12:58 +01:00 |
|
David Benqué
|
01e7ec7e88
|
Merge remote-tracking branch 'origin/inviteUI' into inviteUI
|
2019-12-16 16:09:40 +00:00 |
|