Commit graph

7606 commits

Author SHA1 Message Date
yflory
25b88afeea Fix invitation links 2019-12-18 18:10:33 +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
f98543bb83 Add category icon for link invitation 2019-12-18 18:02:33 +01:00
ansuz
90d8a7a684 remove an unused dependency 2019-12-18 12:02:26 -05:00
Weblate
fc2f8ff01e Translated using Weblate (German)
Currently translated at 100.0% (1173 of 1173 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-12-18 17:02:23 +00:00
Weblate
3a8b7783d5 Translated using Weblate (French)
Currently translated at 100.0% (1182 of 1182 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

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/

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-18 17:02:23 +00:00
Weblate
6111f1dc36 Translated using Weblate (English)
Currently translated at 100.0% (1182 of 1182 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1181 of 1181 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1180 of 1180 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1179 of 1179 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1178 of 1178 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1177 of 1177 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1176 of 1176 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1175 of 1175 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1174 of 1174 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1174 of 1174 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

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/
2019-12-18 17:02:23 +00:00
ansuz
663a1138b4 trim leading spaces from domains 2019-12-18 12:01:58 -05:00
yflory
7008c71605 Clean teams inner code 2019-12-18 17:46:44 +01: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
7db7db262c Fix 'enter' key in team invite modal 2019-12-18 16:36:06 +01:00
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