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 |
|
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 |
|
yflory
|
7f5c5c18a3
|
Merge branch 'mute' into sidebarbuttons
|
2019-12-16 13:58:21 +01:00 |
|
yflory
|
ac5100b3b2
|
Update mute icon in profile
|
2019-12-16 13:57:49 +01:00 |
|
yflory
|
0ee6fcb6bc
|
Add unmute contacts button
|
2019-12-16 13:09:52 +01:00 |
|
yflory
|
9e08a97d72
|
Alertify buttons and inputs added to sidebar layout
|
2019-12-16 12:51:12 +01:00 |
|
ansuz
|
4a83103f52
|
WIP invitation API
|
2019-12-13 18:38:05 -05:00 |
|
ansuz
|
7a5bfe8245
|
pw => password, /common/invitation.js scaffolding
|
2019-12-13 18:27:48 -05:00 |
|
yflory
|
fb8be19657
|
Fix buttons UI in contacts
|
2019-12-13 18:43:40 +01:00 |
|
yflory
|
e8c1eb9f11
|
Improve mute/unmute process
|
2019-12-13 18:22:14 +01:00 |
|
yflory
|
be9dce674f
|
Open and Scrypt invitation link
|
2019-12-13 17:03:24 +01:00 |
|
yflory
|
9391698f54
|
Add scrypt and spinner to the link creation process
|
2019-12-13 11:59:14 +01:00 |
|
yflory
|
fa8096fc76
|
lint compliance
|
2019-12-12 18:16:42 +01:00 |
|
yflory
|
ef05ac440e
|
Invitation link UI
|
2019-12-12 18:14:17 +01:00 |
|
yflory
|
510fd9a1a6
|
Merge branch 'master' into staging
|
2019-12-12 16:24:05 +01:00 |
|
yflory
|
d04d36c8cd
|
Merge branch 'master' into inviteUI
|
2019-12-12 16:23:53 +01:00 |
|
yflory
|
f2a84fba78
|
Merge branch 'soon'
|
2019-12-12 16:17:52 +01:00 |
|
Weblate
|
408bc94765
|
Translated using Weblate (German)
Currently translated at 100.0% (1155 of 1155 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
|
2019-12-12 16:12:04 +01:00 |
|
Weblate
|
5ad69fcec8
|
Translated using Weblate (French)
Currently translated at 100.0% (1158 of 1158 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
|
2019-12-12 16:11:58 +01:00 |
|
Weblate
|
f110162164
|
Translated using Weblate (English)
Currently translated at 100.0% (1158 of 1158 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1157 of 1157 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1156 of 1156 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
|
2019-12-12 16:11:51 +01:00 |
|
Weblate
|
13307e40e5
|
Translated using Weblate (German)
Currently translated at 100.0% (1155 of 1155 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
|
2019-12-12 15:09:44 +00:00 |
|
Weblate
|
1778200b57
|
Translated using Weblate (French)
Currently translated at 100.0% (1158 of 1158 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
|
2019-12-12 15:09:44 +00:00 |
|
Weblate
|
9673795d65
|
Translated using Weblate (English)
Currently translated at 100.0% (1158 of 1158 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1157 of 1157 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1156 of 1156 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
|
2019-12-12 15:09:44 +00:00 |
|
yflory
|
5f0244beb3
|
Fix kanban UI issues
|
2019-12-12 16:09:07 +01:00 |
|
yflory
|
998e2f81d2
|
Invite to team modal
|
2019-12-12 15:30:14 +01:00 |
|
yflory
|
585138aeee
|
Fix links in profile description
|
2019-12-11 17:18:32 +01:00 |
|
yflory
|
3ecad6fa73
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2019-12-11 16:40:55 +01:00 |
|
yflory
|
32891be320
|
Fix export and username prompt
|
2019-12-11 16:40:39 +01:00 |
|
yflory
|
aa8dd95310
|
Add unfriend, mute and unmute buttons in profile
|
2019-12-11 13:28:07 +01:00 |
|
yflory
|
e169e02d94
|
Use large icons in team invite usergrid
|
2019-12-10 16:27:15 +01:00 |
|
David Benqué
|
8293a125a9
|
add label to contacts list
|
2019-12-10 13:41:55 +00:00 |
|
yflory
|
11ddb96422
|
Mute friends: dismiss notifications and fix UI issues
|
2019-12-10 13:07:57 +01:00 |
|
Weblate
|
9d9835ddb5
|
Translated using Weblate (German)
Currently translated at 100.0% (1155 of 1155 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
|
2019-12-10 10:07:36 +00:00 |
|
Weblate
|
9743ea6e06
|
Translated using Weblate (French)
Currently translated at 100.0% (1155 of 1155 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
|
2019-12-10 10:07:36 +00:00 |
|
Weblate
|
bc8f6fd683
|
Translated using Weblate (English)
Currently translated at 100.0% (1155 of 1155 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1154 of 1154 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1153 of 1153 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1152 of 1152 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1151 of 1151 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1151 of 1151 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1150 of 1150 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1149 of 1149 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1148 of 1148 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
|
2019-12-10 10:07:36 +00:00 |