Commit Graph

10134 Commits (7e1c7c481e3d0221a1b6233a2e4eb7aa17a6f54d)

Author SHA1 Message Date
ansuz d6d4c4c70b Merge branch 'soon' into staging 2020-04-17 11:44:30 -04:00
ansuz 18c5d48474 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-17 11:44:08 -04:00
ansuz bac8ef3c6e lint compliance 2020-04-17 11:43:54 -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 ef1d5bd706 Merge branch 'ckeditor-default-size' into staging 2020-04-17 11:37:12 -04: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
yflory f03713e60a Fix small issues, clean debugging logs and add known issues 2020-04-17 15:16:49 +02:00
yflory 92738828ff Merge branch 'debugtime' into cba 2020-04-17 10:31:42 +02:00
yflory 1d3f0ded81 Fix more markers errors 2020-04-17 10:31:37 +02:00
ansuz 4e57e390da write tasks inside of workers 2020-04-16 16:37:24 -04:00
ansuz c39adb9bff configure ckeditor to allow unsetting font size 2020-04-16 14:59:43 -04:00
ansuz ba6faca02e make the number of workers configurable 2020-04-16 13:53:45 -04:00
ansuz 0465f31a45 add a FIXME note 2020-04-16 13:02:27 -04:00
ansuz 04ab7f538a recover from worker faults and unify worker types 2020-04-16 13:02:07 -04:00
ansuz e0a6852b79 correctly serialize an error log 2020-04-16 10:45:18 -04:00
yflory 38acd01b35 Fix issues with falsy values 2020-04-16 16:24:09 +02:00
yflory b74a4b6bb4 Fix more cba issues and add debugging data 2020-04-16 16:03:17 +02:00
yflory 026bf6a425 Fix obvious issues in cba 2020-04-16 11:20:18 +02:00
yflory 9c5f0c0d6f Use rgba instead of #RRGGBBAA for the author markers 2020-04-16 10:36:51 +02:00
ansuz 9ed82640bf Merge branch 'worker-queue' into staging 2020-04-15 19:32:42 -04:00
ansuz e8b1fcf710 solve some cases where crashing workers could result in an invalid state for the queue 2020-04-15 13:59:54 -04:00
ansuz 9ed26cfeb0 lint compliance 2020-04-15 12:40:18 -04:00
yflory cdcb01623d Merge branch 'q' into staging 2020-04-15 17:03:02 +02:00
yflory 7890342ae1 Add cba hint 2020-04-15 16:49:38 +02:00
yflory fd2ee0fced Add comment 2020-04-15 16:23:36 +02:00
yflory 1dee2fd13c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-15 16:07:29 +02:00
yflory f83179cb62 Fix mediatag cache preventing preview modal 2020-04-15 16:07:18 +02:00
ansuz dc0460780f Merge branch 'soon' into staging 2020-04-15 09:44:30 -04:00
ansuz c46561e98d Merge branch 'master' into soon 2020-04-15 09:44:23 -04:00
ansuz 22186ccb62 Merge branch 'mermaid-styles2' into staging 2020-04-15 09:43:53 -04:00
yflory 94c9e47d32 Remember the state of cba per user in their owned pads 2020-04-15 15:36:37 +02:00
yflory 87fc1f8daf Show/hide and enable/disable cba 2020-04-15 15:20:04 +02:00
yflory 88760fde6a Clean the code 2020-04-15 13:27:25 +02:00
ansuz 74567e0cf4 return process memory usage in GET CACHE STATS RPC 2020-04-14 15:53:58 -04:00
ansuz 713fa9ef9a
Merge pull request #525 from ma-neumann/master
Allow config.defaultStorageLimit to be zero bytes
2020-04-14 15:47:44 -04:00
ansuz 9a7681dc5d add a note about handling syntax errors in mermaid 2020-04-14 15:18:20 -04:00
ansuz ca2dc85b34 reduce eye-bleed with gentler styles for mermaid charts 2020-04-14 15:17:41 -04:00
yflory d41c362d46 Fix more errors after ot 2020-04-14 17:11:47 +02:00
yflory 5fe7f55f51 Fix share with a team when we don't have contacts yet 2020-04-14 10:47:53 +02:00
Martin Alexander Neumann e3f42cbc20 Allow config.defaultStorageLimit to be zero bytes 2020-04-11 20:46:09 +02:00