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

5693 Commits (626a031115b48d29ed650fc667f228cb8bdf2662)

Author SHA1 Message Date
Weblate 27f864128d Translated using Weblate (German) 
Currently translated at 100.0% (1199 of 1199 strings)

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

Translated using Weblate (German)

Currently translated at 100.0% (1199 of 1199 strings)

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

Translated using Weblate (German)

Currently translated at 100.0% (1199 of 1199 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2020-01-27 10:12:30 +00:00
Weblate 6f6bbaf75e Translated using Weblate (French) 
Currently translated at 100.0% (1199 of 1199 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2020-01-27 10:12:29 +00:00
Weblate b6a6249eb4 Translated using Weblate (Finnish) 
Currently translated at 71.3% (855 of 1199 strings)

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

Translated using Weblate (Finnish)

Currently translated at 71.4% (855 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
 2020-01-27 10:12:29 +00:00
Weblate 66ef508e0e Translated using Weblate (English) 
Currently translated at 100.0% (1199 of 1199 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
 2020-01-27 10:12:29 +00:00
Weblate 0158ce6804 Translated using Weblate (Catalan) 
Currently translated at 48.8% (585 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ca/
 2020-01-27 10:12:28 +00:00
ansuz 4fd68b672e drop clientside hooks wrappers for authenticated GET_FILE_SIZE 2020-01-24 12:42:31 -05:00
David Benqué 9a53b3b9fd style messages 
- blue text for messages from admins
- red text and background for messages needing a response.
 2020-01-24 16:52:44 +00:00
ansuz 1ecb61fe85 put an ugly red border on support thread messages from admins 2020-01-24 10:30:23 -05:00
yflory 009bbd69bd Fix import button in onlyoffice 2020-01-24 16:25:47 +01:00
yflory 4a2b0fc114 Allow ooslide and oodoc imports 2020-01-24 15:58:42 +01:00
yflory e3f5c89333 Remove window.location.hash and window.location.href from common-hash 2020-01-23 16:11:06 +01:00
yflory a9b7b51547 Check if fileType is an array 2020-01-22 17:29:23 +01:00
yflory cdbe4ed8eb Only allow image upload in onlyoffice 2020-01-22 17:15:37 +01:00
yflory 6fd079bfb0 Clean images in onlyoffice 2020-01-22 15:47:12 +01:00
yflory ad94e97444 Fix missing callback 2020-01-22 15:41:17 +01:00
yflory 7b026868fd Fix images in onlyoffice 2020-01-22 15:35:46 +01:00
yflory b76d308db8 Move new onlyoffice code 2020-01-22 14:54:24 +01:00
yflory af8bda0755 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-01-22 14:18:20 +01:00
yflory 0fd711aebc Remove existing style in the default empty spreadsheet 2020-01-22 12:02:43 +01:00
yflory ad8bf87c3f Ability to force the version of onlyoffice 2020-01-22 11:55:27 +01:00
Weblate 16744cd140 Translated using Weblate (German) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2020-01-22 08:17:54 +00:00
yflory 47e3cffde7 Fix race condition onlyoffice 2020-01-21 18:50:45 +01:00
Weblate 03ad3218de Translated using Weblate (German) 
Currently translated at 99.4% (1191 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2020-01-21 16:52:03 +00:00
Weblate f3867c9d74 Translated using Weblate (French) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2020-01-21 16:52:03 +00:00
Weblate 2cdfbe7104 Translated using Weblate (English) 
Currently translated at 100.0% (1198 of 1198 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1197 of 1197 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1196 of 1196 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1195 of 1195 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
 2020-01-21 16:52:03 +00:00
yflory 0f41dddf92 Fix OnlyOffice UI in readonly mode 2020-01-21 17:50:27 +01:00
yflory ddb3738574 Add translation keys 2020-01-21 17:47:13 +01:00
yflory 1d67e421d0 temp 2020-01-21 17:02:44 +01:00
yflory a7a91fb0a5 Add back old OO 2020-01-21 15:39:15 +01:00
David Benqué a5265e4c61 fix margin on OO export format alert 2020-01-21 14:16:19 +01:00
yflory 0ece81afff Merge branch 'communities-oo' into staging 2020-01-21 12:02:08 +01:00
Weblate d17c115a23 Translated using Weblate (French) 
Currently translated at 100.0% (1195 of 1195 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2020-01-21 11:01:11 +00:00
Weblate 952708113c Translated using Weblate (English) 
Currently translated at 100.0% (1195 of 1195 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1194 of 1194 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1193 of 1193 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1192 of 1192 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
 2020-01-21 11:01:10 +00:00
yflory 404c2a1467 Prevent importing xlsx with non-supported browsers 2020-01-21 12:00:20 +01:00
yflory 4a4146f39d Fix burn after reading with onlyoffice 2020-01-21 11:01:07 +01:00
David Benqué 003a616c81 remove XXXs 2020-01-21 10:13:41 +01:00
ansuz 10cdd5c76b Merge remote-tracking branch 'origin/communities-oo' into staging 2020-01-20 15:59:29 -05:00
Weblate 611aa0be25 Translated using Weblate (German) 
Currently translated at 100.0% (1191 of 1191 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2020-01-20 17:07:17 +00:00
Weblate d4a5f194ee Translated using Weblate (Finnish) 
Currently translated at 67.8% (808 of 1191 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
 2020-01-20 17:07:17 +00:00
yflory dbb726e4ce Pin images included in the spreadsheets 2020-01-20 18:05:31 +01:00
David Benqué f189ba8822 fix translation key for access warning 2020-01-20 16:45:19 +01:00
yflory 7f4dbd3245 Fix text art in spreadsheets 2020-01-20 16:27:23 +01:00
yflory 52e9d2c87a Change Sheet app colors 2020-01-20 15:33:32 +01:00
yflory a56127daf4 lint compliance 2020-01-20 15:11:24 +01:00
yflory 079071bd87 Merge branch 'staging' into communities-oo 2020-01-20 15:10:36 +01:00
yflory 6d216ba1c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-01-20 15:10:08 +01:00
yflory e8b905282a Add config option to link to an imprint 2020-01-20 14:53:02 +01:00
yflory a7ffc038d9 Improve import/export office documents 2020-01-20 13:59:29 +01:00
yflory 5a26be5531 Improve import and export UI. Fix race condition with office import. 2020-01-20 11:35:36 +01:00
yflory bc8fee8a29 Merge branch 'staging' into communities-oo 2020-01-20 11:11:49 +01:00
David Benqué 0bcb89310c remove // XXXs for translation keys 2020-01-17 13:24:31 +00:00
Weblate bca9d223bb Translated using Weblate (Spanish) 
Currently translated at 70.9% (840 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
 2020-01-17 12:11:19 +00:00
Weblate 6a64dd56b8 Translated using Weblate (Italian) 
Currently translated at 40.8% (483 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
 2020-01-17 12:11:19 +00:00
Weblate 12bfea64e2 Translated using Weblate (German) 
Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2020-01-17 12:11:18 +00:00
Weblate 3a66298b3e Translated using Weblate (French) 
Currently translated at 100.0% (1191 of 1191 strings)

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

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/
 2020-01-17 12:11:18 +00:00
Weblate d92b134a94 Translated using Weblate (Finnish) 
Currently translated at 62.5% (744 of 1191 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
 2020-01-17 12:11:18 +00:00
Weblate 4a25298648 Translated using Weblate (English) 
Currently translated at 100.0% (1191 of 1191 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1191 of 1191 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1190 of 1190 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1189 of 1189 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1188 of 1188 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1187 of 1187 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1186 of 1186 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
 2020-01-17 12:11:18 +00:00
Weblate f07a5bc0cd Translated using Weblate (Catalan) 
Currently translated at 44.8% (531 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ca/
 2020-01-17 12:11:18 +00:00
yflory cbe407084d Remove XXX 2020-01-16 17:57:25 +01:00
yflory cb6f0513a2 Fix extension selector in pad export 2020-01-16 17:51:02 +01:00
yflory 47768112b4 Merge branch 'staging' into communities-oo 2020-01-16 14:52:37 +01:00
yflory b80d3cf24f Ability to provide a dropdown container to a text input. Applied to framework export. 2020-01-16 14:52:04 +01:00
yflory 9db30aff1f Improve UI 2020-01-16 13:33:19 +01:00
yflory 663fa9b474 Fix race condition with images 2020-01-16 12:59:18 +01:00
yflory 50a039b40b Hide unused tabs 2020-01-16 11:41:07 +01:00
yflory b14f6e4030 Fix image upload 2020-01-16 11:35:17 +01:00
yflory 9e1f49c177 Enable spreadsheets for anonymous users 2020-01-15 15:33:52 +01:00
yflory aa27eabff1 lint compliance 2020-01-14 14:41:43 +01:00
yflory a1a2e6659e retab + jshint 2020-01-14 14:33:44 +01:00
yflory 4e537e6ddc retab 2020-01-14 14:04:26 +01:00
yflory e5865f8653 Merge branch 'bar' of github.com:xwiki-labs/cryptpad into bar 2020-01-13 17:06:59 +01:00
yflory d02092eb76 Fix cache and storage issues in share and filepicker iframes 2020-01-13 17:06:49 +01:00
yflory 73af078e4a Hide share modal when pad is deleted 2020-01-13 16:44:11 +01:00
David Benqué df03ddcca0 temporary translation keys 2020-01-13 15:26:57 +00:00
yflory 1e6e9fd288 Remove deleted pad from the drive 2020-01-13 15:58:46 +01:00
yflory 09da8ac6a2 Warn the owners when deleting a BAR pad 2020-01-13 15:11:45 +01:00
David Benqué ddb204def4 Change temporary text 2020-01-13 10:32:22 +00:00
yflory bdd338902b Hide radio buttons in share modal when no contacts 2020-01-10 15:53:02 +01:00
David Benqué 5ee12f8da7 hard coded keys for testing 2020-01-10 13:07:31 +00:00
yflory a3b3a9e4fb Fix button not updating when generating a BAR url 2020-01-09 17:47:10 +01:00
yflory 1bf48a5a8c lint compliance 2020-01-09 17:30:53 +01:00
yflory 9ee9e46087 Receiving a burn after reading URL 2020-01-09 17:30:15 +01:00
yflory 96a00f89df Generate burn after reading link for pads 2020-01-09 15:20:11 +01:00
yflory 14905a5693 Support ownerKey in file hash 2020-01-09 11:51:28 +01:00
yflory d4d07f3332 Add support for ownerKey in the hash (version 1 and 2) 2020-01-09 11:20:35 +01:00
yflory 8ccafbc821 Fix tests for invite url 2020-01-09 10:59:20 +01:00
Weblate 488e5804e4 Translated using Weblate (Finnish) 
Currently translated at 62.9% (745 of 1185 strings)

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

Translated using Weblate (Finnish)

Currently translated at 53.2% (631 of 1185 strings)

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

Translated using Weblate (Finnish)

Currently translated at 51.6% (611 of 1185 strings)

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

Translated using Weblate (Finnish)

Currently translated at 51.2% (607 of 1185 strings)

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

Translated using Weblate (Finnish)

Currently translated at 44.2% (524 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
 2020-01-08 21:34:09 +00:00
ansuz 715e9270b7 Merge branch 'modern-buffer' into staging 2020-01-07 08:27:28 -05:00
ansuz 4aaef2d811 remove use of deprecated 'new Buffer' instanciation 2020-01-06 14:29:45 -05:00
yflory f590f60dcb Fix transfer ownership to a team 2020-01-06 17:51:40 +01:00
yflory eb85a5908e Fix pad type in search for read-only pads 2020-01-06 17:05:29 +01:00
yflory 080ffa09a6 Fix 'team is undefined' error 2020-01-06 10:43:04 +01:00
Ludovic Dubost d593f3961c Updated OnlyOffice editors, Updated x2t.js to 5.4.2 2020-01-05 20:32:34 +01:00
Ludovic Dubost aac353c5fc Support importing images for OnlyOffice documents 2020-01-04 14:14:05 +01:00
Ludovic Dubost 453082c080 Modified implementation of image support without change to filename 2020-01-04 10:06:41 +01:00
Ludovic Dubost 4cfa391a17 Fixes in onlyoffice code for image upload realtime and ooslide 2020-01-04 02:02:20 +01:00
Ludovic Dubost 1c19e6f2b5 Fixed callback in case of error on image fetching 2020-01-04 02:01:31 +01:00
Ludovic Dubost 9b2e4816c8 Added support for exporting images 2020-01-02 22:52:49 +01:00
Ludovic Dubost d9fb248504 Fixes for image support 2020-01-02 20:12:00 +01:00
Ludovic Dubost 6155284c4d Merged initial patches for image upload, partially working 2020-01-02 11:09:12 +01:00
Ludovic Dubost cf06614265 Added readme to x2t.js code 2019-12-31 00:35:49 +01:00
Ludovic Dubost 1123928942 Updated x2t library. Added support for Excel2007 2019-12-31 00:29:30 +01:00
ansuz 743f7264e0 prevent form autofill on the team invite modal 2019-12-30 12:58:26 -05:00
ansuz adc29e8b42 Merge branch 'soon' into staging 2019-12-30 12:33:38 -05:00
Ludovic Dubost 2ef61371f4 Added support for ods 2019-12-29 15:24:12 +01:00
Ludovic Dubost 36926e11c9 Support ods import 2019-12-29 15:07:22 +01:00
Ludovic Dubost 7026123bfc Implementing Spreadsheet XLSX import/export using WebAssembly 2019-12-28 19:06:32 +01:00
ansuz 97bc793ca8 simplify websocket configuration even more 2019-12-23 17:39:13 -05:00
ansuz 2dfbb522b0 simplify server websocket configuration 2019-12-23 17:01:00 -05:00
ansuz 31ec784de6 remove examples directoryr 2019-12-23 16:48:15 -05:00
yflory c2c5dbdb64 Remove hash when joining a team with a link 2019-12-20 15:48:29 +01:00
yflory 89d9f22e0e Merge branch 'staging' into soon 2019-12-20 14:48:40 +01:00
Weblate 18c342760a 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-20 13:47:35 +00:00
Weblate 4d265248c9 Translated using Weblate (Finnish) 
Currently translated at 31.7% (376 of 1185 strings)

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

Translated using Weblate (Finnish)

Currently translated at 31.7% (376 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
 2019-12-20 13:47:35 +00:00
yflory a461733aa1 Fix team invitation with no contact 2019-12-20 14:33:28 +01:00
yflory 3be7a387b4 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2019-12-20 14:28:44 +01:00
yflory 4db16faac0 Catch href decryption errors 2019-12-20 14:26:34 +01:00
Weblate f84a876f27 Translated using Weblate (German) 
Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2019-12-19 15:37:49 +00:00
yflory 8a6713e552 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-19 16:21:35 +01:00
yflory 826a86c7d6 Fix joining your own team 2019-12-19 16:21:10 +01:00
David Benqué dc47091637 outline mute button 2019-12-19 14:48:57 +00:00
yflory 361292ff01 Fix button width in profile 2019-12-19 15:37:09 +01:00
yflory 20aeb0fde6 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-19 11:56:31 +01:00
yflory 4869b4e0c3 Delete invitation after using it 2019-12-19 11:56:20 +01:00
yflory aca9ddca06 Display error message when trying to use an invitation link a second time 2019-12-19 11:45:50 +01:00
David Benqué 5db81f3990 add margin to team roster header buttons 2019-12-19 10:43:28 +00:00
yflory 0dc4a1d890 Display error message when using an invalid invitation link 2019-12-19 11:38:09 +01:00
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