infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity
7,588 Commits
1 Branch
3 Tags
274 MiB
Commit Graph

3409 Commits (20aeb0fde606e981e044a7bfe6615aa71e5eb6c8)

Author SHA1 Message Date
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
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
ansuz 042cfffbe8 use APIs instead of creating invitations inline 2019-12-16 09:38:36 -05: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 0ee6fcb6bc Add unmute contacts button 2019-12-16 13:09:52 +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 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
yflory 998e2f81d2 Invite to team modal 2019-12-12 15:30:14 +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 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
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
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 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 69d8b413a6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-12-04 10:50:13 +01:00
David Benqué a38fa71d57 use translation key for alert message 2019-12-03 14:52:46 +00:00