blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7764 commits 72 branches 132 tags 541 MiB
Commit graph

5535 commits

Author SHA1 Message Date
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
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
David Benqué
516181acf2 fix buttons for no contacts 2019-12-09 16:21:48 +00:00
David Benqué
b6228421f6 Merge branch 'staging' into get_contacts 2019-12-09 16:17:04 +00:00
David Benqué
06f46129fc add functionality to buttons for no contacts 2019-12-09 16:16:13 +00:00
yflory
3528516ab9 Merge branch 'staging' into ooPassword 2019-12-09 16:05:24 +01:00
yflory
111141628c lint compliance 2019-12-09 16:02:24 +01:00
David Benqué
1f48ee36ef linting 2019-12-09 14:15:38 +00:00
yflory
73a03e8d80 Fix getFullHistory and getHistory errors 2019-12-09 15:05:03 +01:00
David Benqué
e8b2c5c4e8 use secondary buttons 2019-12-09 14:01:15 +00:00
ansuz
70e5532a27
Merge pull request #475 from xwiki-labs/fastAuth 
Fast auth
 2019-12-09 08:40:52 -05:00
ansuz
8879c6b583
Merge pull request #474 from xwiki-labs/design_dialogs_passwords 
Design dialogs passwords
 2019-12-09 08:36:21 -05:00
David Benqué
df9f2c9c29 dismiss warning about sharing links 
- remember if warning has been dismissed
- include this in tips that can be reset
- move the option to reset tips to the account settings
 2019-12-09 11:14:05 +00:00
yflory
b558d6e354 Fix null item in kanban 2019-12-09 11:03:11 +01:00
David Benqué
be40254f1a remove spaces in password messages 
- space between icon and text is now a margin
 2019-12-09 10:02:44 +00:00
David Benqué
9b5c3878b1 add password messages to file share modal 2019-12-09 09:57:41 +00:00
David Benqué
713d67439f review 2019-12-06 16:52:53 +00:00
David Benqué
72a855aa6a change link alert to warning 2019-12-06 15:35:10 +00:00
yflory
bbf2e3a9ae Mute and unmute users 2019-12-06 16:10:19 +01:00
ansuz
3f77a800cf revert addition of underlines to some mermaid titles 2019-12-06 09:14:33 -05:00
David Benqué
15a8054d31 show messages when user has no contacts 
cases:
- No contacts, logged in: show button to copy profile URL
- Not logged in: show buttons to log in or register
 2019-12-06 12:01:27 +00:00
ansuz
edd2274262 add a few default styles for gantt charts 2019-12-05 17:42:37 -05:00
ansuz
daf6482ace throttle markdown rendering in the code app 2019-12-05 17:42:13 -05:00
ansuz
62c50d9e23 avoid redrawing mermaid graphs which have not changed 2019-12-05 17:41:54 -05:00
David Benqué
0e4b7623ff adjust spacing 
- fixed spacing to work also in properties modal
 2019-12-05 15:52:16 +00:00
David Benqué
bee6aa42bf add inline alert in link tab 2019-12-05 14:57:18 +00:00
David Benqué
78488d00bf adjust spacing 2019-12-05 14:56:01 +00:00
David Benqué
0be5b90495 avoid underlined space at start of FAQ link 2019-12-05 11:28:46 +00:00
David Benqué
708ad7a10d linting 2019-12-05 11:19:46 +00:00
David Benqué
22873fe1f7 adjustments to FAQ password links 2019-12-05 11:16:12 +00:00
David Benqué
e138dc8c6a display embed code in textarea 2019-12-05 10:58:54 +00:00
David Benqué
951a59f3ea add password FAQ links to share modal tabs 2019-12-05 10:55:52 +00:00
yflory
f3b1761d0d Enable openURL and gotoURL in the share iframe 2019-12-05 11:33:43 +01:00
David Benqué
1d2f40e6cc try to add link to password FAQ 2019-12-05 10:10:48 +00:00
yflory
fb50fe09ce Merge branch 'master' into staging 2019-12-04 17:39:54 +01:00
yflory
366e45cac4 Merge branch 'soon' 2019-12-04 17:36:12 +01:00
yflory
f3d7a97c23 Fix contacts app 2019-12-04 17:34:28 +01:00
David Benqué
ee35c1d151 display share link in textarea 2019-12-04 12:46:56 +00:00
David Benqué
1ba03dee45 position and style alert 2019-12-04 11:41:08 +00:00
David Benqué
5b18e3a633 Merge branch 'design_dialogs_usergrid' into design_dialogs_passwords 2019-12-04 11:29:15 +00:00
yflory
0b0ce98fc7 Kanban UI 2019-12-04 11:18:25 +01:00
yflory
187eb4afde Load only one network to get history keeper ID from cryptget 2019-12-04 11:13:05 +01:00
yflory
69d8b413a6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-12-04 10:50:13 +01:00
yflory
ba74fc8d4f Send warning to accounts when we can't update pin limit 2019-12-04 10:49:51 +01:00
David Benqué
a38fa71d57 use translation key for alert message 2019-12-03 14:52:46 +00:00
David Benqué
3b7732ceb2 display alert in link tab 2019-12-03 12:01:31 +00:00
David Benqué
2f087a392a clean up XXXes 2019-12-03 11:03:57 +00:00
David Benqué
5657793e9c use .large avatars in manage owners 2019-12-03 10:25:56 +00:00
David Benqué
26c681c3cb remove padding in prop modal 
- caused a vertical scrollbar
- now constructed like the share modal (customModals inside tabs)
 2019-12-03 10:11:52 +00:00
David Benqué
ee1371c8ba try to get rid of vertical scroll 2019-12-03 09:38:39 +00:00
yflory
198786ed90 Login from accounts 2019-12-03 10:37:47 +01:00
ansuz
ff67f8381b oops, I really should have linted before pushing... 2019-12-02 13:10:38 -05:00
ansuz
e7447008ce enable more mermaid modes 2019-12-02 13:08:33 -05:00
ansuz
e39257672c enable gantt chart rendering in rendered markdown 2019-12-02 11:27:13 -05:00
David Benqué
1da5e8ac3c usergrid avatar display and scrolling 2019-12-02 11:34:34 +00:00
yflory
d52acfa5d2 Change initial tab in the file share modal 2019-11-29 17:02:02 +01:00
yflory
e35b1712c3 Change initial tab in the share modal 2019-11-29 16:47:18 +01:00
yflory
e4231956a3 Fix integrity checks 2019-11-29 14:44:11 +01:00
yflory
71d2f8388d Rename a variable 2019-11-29 14:32:40 +01:00
yflory
cc4e6d9a1e Fix integrity checks 2019-11-29 14:30:12 +01:00
yflory
03701f02e0 Remove debug logs 2019-11-29 10:46:34 +01:00
yflory
d6d92531ea Add finnish translation files 2019-11-28 12:46:12 +01:00
yflory
8a0e0621fb Fast auth 2019-11-27 17:26:21 +01:00
yflory
3b6155ffce Change properties icon in the drive 2019-11-27 13:14:33 +01:00
yflory
50886b81da Update orgmode regex in codemirror #466 2019-11-27 11:31:49 +01:00
yflory
580731d560 Merge branch 'staging' into ooPassword 2019-11-26 16:13:41 +01:00
yflory
851437a05b Fix onlyoffice password change 2019-11-26 16:13:21 +01:00
David Benqué
8fc08538a1 open share modal on ready 2019-11-26 11:21:58 +00:00
ansuz
b246fc73a7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 20:59:42 -05:00
ansuz
b5a05c1de3 clean up some dead code and do a quick optimizing pass 2019-11-25 20:37:04 -05:00
yflory
09fdfa2ad2 Fix usergrid UI issues 2019-11-25 17:54:22 +01:00
yflory
28308cb629 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 17:44:01 +01:00
yflory
89cff3c541 Remove invisible title in usergrid 2019-11-25 17:33:56 +01:00
ansuz
27793c6755 remove XXX 2019-11-25 11:09:54 -05:00
yflory
c1c000149b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 17:07:26 +01:00
ansuz
9efceb2234
Merge pull request #470 from xwiki-labs/design_dialogs_props 
remove // XXX
 2019-11-25 11:06:10 -05:00
David Benqué
5be70f7673 remove // XXX 2019-11-25 15:56:39 +00:00
yflory
ff6de41bec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 16:54:55 +01:00
ansuz
79013b27fe
Merge pull request #469 from xwiki-labs/design_dialogs 
remove // XXX
 2019-11-25 10:54:49 -05:00
yflory
d8df3fd034 Remove XXX 2019-11-25 16:53:47 +01:00
yflory
c414bf1d5c Merge branch 'staging' into ooPassword 2019-11-25 16:51:06 +01:00
yflory
0dc0df8aa1 Remove XXX 2019-11-25 16:50:38 +01:00
David Benqué
8b3cea9ad9 remove // XXX 2019-11-25 15:11:49 +00:00