Commit Graph

6146 Commits (31081eac462b084b1bc2331fad4c3ed5e02efd04)

Author SHA1 Message Date
yflory 31081eac46 Add comments UI 2020-04-22 16:23:45 +02:00
yflory 9d03d0effb Update rich text app structure to add a comments container 2020-04-21 16:07:04 +02:00
yflory fa1e15e7d8 Merge branch 'staging' into communities-comments 2020-04-21 14:59:25 +02:00
yflory 89de5869c5 Fix cursor and scroll position in codemirror after undo 2020-04-21 14:42:49 +02:00
yflory aeb81fdfad lint compliance 2020-04-21 13:35:36 +02:00
yflory 872e636ac5 Fix access modal in drive 2020-04-21 12:13:52 +02:00
yflory 97f9244efd Merge branch 'soon' into staging 2020-04-21 12:05:16 +02:00
yflory c2e0ed0d59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-21 12:05:13 +02:00
yflory 1d0feeb323 Fix cba reset on join. Change how the cba state is stored 2020-04-21 12:04:24 +02:00
Weblate ac2cb29cf7 Translated using Weblate (French)
Currently translated at 100.0% (1257 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-21 11:17:49 +02:00
Weblate 65c8c043d5 Translated using Weblate (German)
Currently translated at 100.0% (1257 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-21 11:17:49 +02:00
Weblate 0544c31bea Translated using Weblate (English)
Currently translated at 100.0% (1257 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-04-21 11:17:49 +02:00
ansuz a8c8b85f0c add an XXX note for the 3.16.0 release 2020-04-20 14:31:02 -04:00
ansuz a04461f7c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-20 14:26:28 -04:00
ansuz 9efbe59361 force a page reload for patch version changes 2020-04-20 14:25:43 -04:00
Weblate b8d13328cb Translated using Weblate (German)
Currently translated at 100.0% (1256 of 1256 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-20 20:07:31 +02:00
yflory d8855ed5f7 Remove XXX 2020-04-20 18:32:13 +02:00
ansuz f4f4e0011f don't merge this, it's very wrong 2020-04-20 12:32:07 -04:00
yflory 8896b2eae2 Fix mediatag preview 2020-04-20 18:19:21 +02:00
yflory 22a2b85fae Fix broken share modal 2020-04-20 18:14:38 +02:00
yflory f2641bc0ee Fix initial marker 2020-04-20 17:57:25 +02:00
yflory 6d84fc5b8a Add initial marker to fix errors while 'joining' markers 2020-04-20 17:32:45 +02:00
Weblate 723549c0ba Translated using Weblate (English)
Currently translated at 100.0% (1256 of 1256 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1256 of 1256 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1255 of 1255 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-04-20 17:00:10 +02:00
Weblate 9656abcade Translated using Weblate (French)
Currently translated at 100.0% (1256 of 1256 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-20 17:00:10 +02:00
yflory c6cb9876a7 Fix secure iframe conflict with cba button 2020-04-20 16:47:04 +02:00
yflory 49eacf752b Fix markers errors 2020-04-20 16:37:40 +02:00
yflory 0ca779dbd1 Fix 'enable cba' button in properties 2020-04-20 16:20:46 +02:00
yflory b208ca367d Merge branch 'staging' into cba 2020-04-20 15:38:47 +02:00
yflory 9f5f4a4d52 Fix possible duplicate author id 2020-04-20 15:38:27 +02:00
yflory 3be884d702 Comments prototype 2020-04-20 15:22:45 +02:00
yflory e6af3476d9 Upgrade ckeditor to 4.14 2020-04-20 15:22:16 +02:00
ansuz cb04bec348 Merge branch 'soon' into staging 2020-04-20 08:57:36 -04:00
yflory 3f2d21fd71 Merge branch 'staging' into communities-comments 2020-04-20 12:10:27 +02:00
yflory 41c0704ad8 Page mode by default in rich text 2020-04-20 11:56:12 +02:00
yflory ca9f874afb Redraw mermaid on preview 2020-04-20 11:09:46 +02:00
Weblate 14b4411110 Translated using Weblate (German)
Currently translated at 100.0% (1254 of 1254 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-18 18:41:04 +02:00
yflory 1e9b9913c5 Better debug function and fix marker error 2020-04-17 18:18:16 +02:00
ansuz d6d4c4c70b Merge branch 'soon' into staging 2020-04-17 11:44:30 -04:00
yflory 19e565a7dc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-17 17:38:22 +02:00
yflory adae4b690b outer.css cache busting 2020-04-17 17:38:15 +02:00
ansuz d0c3f0fa84 remove XXX notes 2020-04-17 11:36:48 -04:00
Weblate 8009c01f70 Translated using Weblate (French)
Currently translated at 100.0% (1254 of 1254 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-17 17:22:13 +02:00
Weblate fab1fcdb33 Translated using Weblate (Dutch)
Currently translated at 30.2% (376 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/nl/
2020-04-17 17:06:07 +02:00
Weblate 5807f3680b Translated using Weblate (German)
Currently translated at 99.4% (1246 of 1254 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-17 17:06:07 +02:00
Weblate 8b0006fba7 Translated using Weblate (French)
Currently translated at 99.4% (1246 of 1254 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-17 17:06:07 +02:00
Weblate 78afbaa6a8 Translated using Weblate (English)
Currently translated at 100.0% (1254 of 1254 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1253 of 1253 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1252 of 1252 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1252 of 1252 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1251 of 1251 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1250 of 1250 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1249 of 1249 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1249 of 1249 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1248 of 1248 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1247 of 1247 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-04-17 17:06:07 +02:00
yflory 9ba2d11cd5 Guard against a type error 2020-04-17 16:50:41 +02:00
yflory d27dc768f3 Fix missing button to enable cba 2020-04-17 15:56:22 +02:00
yflory 283f739be5 lint compliance 2020-04-17 15:30:27 +02:00
yflory dd814713dd Merge branch 'staging' into cba 2020-04-17 15:17:24 +02:00