Commit graph

7605 commits

Author SHA1 Message Date
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
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
David Benqué
4173bf168f alert margins 2019-12-16 16:05:59 +00:00
David Benqué
fccd1d5cc0 resize spinner 2019-12-16 16:05:41 +00:00
David Benqué
8b333a8147 size message textarea and remove resize 2019-12-16 16:05:06 +00:00
David Benqué
00b0499db5 add translation keys 2019-12-16 16:03:56 +00:00
ansuz
6686e0e841 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-16 10:22:44 -05:00
ansuz
af463c2de9 use the same APIs when creating invites as you do when redeeming them 2019-12-16 10:22:22 -05:00
yflory
cfb6318b86 Team invitation link, add alert 2019-12-16 16:06:22 +01:00
David Benqué
1af0dfb065 fix expiration time padding 2019-12-16 14:42:18 +00:00
ansuz
042cfffbe8 use APIs instead of creating invitations inline 2019-12-16 09:38:36 -05:00
David Benqué
27638e7f63 button colors in pad creation settings 2019-12-16 14:25:15 +00:00
yflory
07ef60418b Merge branch 'mute' into sidebarbuttons 2019-12-16 14:46:36 +01:00
yflory
47128802a2 Merge branch 'staging' into mute 2019-12-16 14:43:14 +01:00
Weblate
89e08704e5 Translated using Weblate (German)
Currently translated at 100.0% (1158 of 1158 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-12-16 13:42:19 +00:00
Weblate
d3718679c0 Translated using Weblate (French)
Currently translated at 99.6% (1158 of 1163 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-12-16 13:42:18 +00:00
Weblate
92f78afb01 Translated using Weblate (Finnish)
Currently translated at 2.7% (31 of 1158 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
2019-12-16 13:42:18 +00:00
Weblate
df938c141b Translated using Weblate (English)
Currently translated at 100.0% (1163 of 1163 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1163 of 1163 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1162 of 1162 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1161 of 1161 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1160 of 1160 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1159 of 1159 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-12-16 13:42:18 +00:00
yflory
b5193914e3 Add mute info in the profile app 2019-12-16 14:17:40 +01:00
yflory
f64c11dc3a Fix profile app 2019-12-16 14:12:33 +01:00