Commit Graph

8662 Commits (f4f4e0011f43b1b8293506d6a80581cf2780de3f)

Author SHA1 Message Date
ansuz f4f4e0011f don't merge this, it's very wrong 2020-04-20 12:32:07 -04:00
ansuz df6e12877b update changelog for 3.16.0 2020-04-20 12:15:46 -04:00
ansuz cb04bec348 Merge branch 'soon' into staging 2020-04-20 08:57:36 -04: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
ansuz f03f70345a remove an XXX note 2020-04-17 17:05:14 -04:00
ansuz b56c73be6e delegate more work from getOlderHistory to the worker 2020-04-17 17:01:47 -04:00
ansuz fd169ff39c close streams after 2 minutes instead of 5
Hopefully this helps to even out our memory and CPU usage.
There's also some improved labels so that IF streams time out
we will know the exact origin of the offending call.
2020-04-17 15:05:48 -04:00
ansuz f42c8e35b1 update version to 3.16.0 (Quagga) 2020-04-17 14:58:16 -04:00
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
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
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 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
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 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
ansuz 89262cd29e resolve silly conflict and merge staging 2020-04-09 16:35:24 -04:00
ansuz 44a3c72f13 Merge branch 'soon' into staging 2020-04-09 16:31:35 -04:00
ansuz de6594f4c9 add some XXX notes 2020-04-09 16:31:16 -04:00
ansuz 09bf0a54d8 add access control header 2020-04-09 16:30:22 -04:00
ansuz e527867e2e queue blob and channel deletions per-user 2020-04-09 16:29:52 -04:00
Weblate ebd4998edd Translated using Weblate (Catalan)
Currently translated at 50.8% (633 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ca/
2020-04-09 19:08:24 +02:00
ansuz bd3e18d1a8 only cache a user's pinned channels if there are no errors when loading them 2020-04-08 12:08:26 -04:00