Commit Graph

3394 Commits (9ad2bf2bd6bc95e5c199c804a8454f79c460f6cc)

Author SHA1 Message Date
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
yflory 8c09e7d43c Merge branch 'staging' into inviteUI 2019-12-18 18:26:41 +01:00
yflory a518cbcce7 Fix translation keys 2019-12-18 18:26:25 +01:00
yflory 62c6765c21 Merge branch 'staging' into inviteUI 2019-12-18 18:14:10 +01:00
Weblate a6c5ba4013 Translated using Weblate (French)
Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-12-18 17:13:51 +00:00
Weblate df4664f877 Translated using Weblate (English)
Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-12-18 17:13:51 +00:00
yflory 4d1079e1e2 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-18 18:11:12 +01:00
yflory 994eefaf63 Merge branch 'staging' into inviteUI 2019-12-18 18:10:50 +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
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
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 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 8eed376274 Fix default category after joining a team 2019-12-18 12:42:24 +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 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
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
David Benqué 03cf969c41 remove hard-coded key 2019-12-17 16:50:00 +00: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 0b248348eb Fix mute/unmute button in contacts 2019-12-17 17:01:15 +01:00
David Benqué 45e74e416c style manage muted button 2019-12-17 14:16:34 +00: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
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 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