yflory
|
de5feeda13
|
Remove some tippy titles
|
2019-12-19 11:27:41 +01:00 |
|
David Benqué
|
f78a4c538c
|
Merge remote-tracking branch 'origin/inviteUI' into inviteUI
|
2019-12-19 10:10:00 +00:00 |
|
David Benqué
|
c6e7b5d552
|
add translation keys for errors
|
2019-12-19 10:09:39 +00:00 |
|
yflory
|
262ccf1265
|
Merge branch 'staging' into inviteUI
|
2019-12-19 11:08:26 +01:00 |
|
Weblate
|
92c6bbc99a
|
Translated using Weblate (French)
Currently translated at 100.0% (1185 of 1185 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
|
2019-12-19 10:08:10 +00:00 |
|
Weblate
|
675ef60362
|
Translated using Weblate (English)
Currently translated at 100.0% (1185 of 1185 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1184 of 1184 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
|
2019-12-19 10:08:09 +00:00 |
|
yflory
|
3bebab57e4
|
Remove XXX
|
2019-12-19 10:54:58 +01:00 |
|
yflory
|
bfc519331b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-12-19 10:35:38 +01:00 |
|
yflory
|
d2ba375491
|
Improve profile UI
|
2019-12-19 10:34:08 +01:00 |
|
Weblate
|
e3fc741402
|
Translated using Weblate (German)
Currently translated at 99.9% (1182 of 1183 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
|
2019-12-18 23:21:39 +00:00 |
|
Weblate
|
dc4feda738
|
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 23:21:38 +00:00 |
|
ansuz
|
ceb7fc4f66
|
remove XXX notes which have been addressed
|
2019-12-18 18:18:14 -05:00 |
|
ansuz
|
ea7d254d2f
|
remove XXX
|
2019-12-18 18:00:27 -05:00 |
|
ansuz
|
167a846cf3
|
remove unused dependency
|
2019-12-18 17:59:28 -05:00 |
|
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
|
3cd93b1d52
|
Fix UI issue
|
2019-12-18 18:47:08 +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
|
b402b3c552
|
Add wrong password handler
|
2019-12-18 18:25:44 +01:00 |
|
yflory
|
0b6539893b
|
Fix missing curvePublic
|
2019-12-18 18:17:05 +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 |
|
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 |
|
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 |
|
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 |
|
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é
|
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 |
|
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 |