Commit Graph

5502 Commits (7f4dbd3245ee29b77528ad169f66764c3c821184)

Author SHA1 Message Date
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