f4f4e0011f
don't merge this, it's very wrong
2020-04-20 12:32:07 -04:00
593011a657
Merge branch 'cba' into staging
2020-04-20 18:31:08 +02:00
8896b2eae2
Fix mediatag preview
2020-04-20 18:19:21 +02:00
df6e12877b
update changelog for 3.16.0
2020-04-20 12:15:46 -04:00
22a2b85fae
Fix broken share modal
2020-04-20 18:14:38 +02:00
f2641bc0ee
Fix initial marker
2020-04-20 17:57:25 +02:00
6d84fc5b8a
Add initial marker to fix errors while 'joining' markers
2020-04-20 17:32:45 +02:00
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
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
c6cb9876a7
Fix secure iframe conflict with cba button
2020-04-20 16:47:04 +02:00
49eacf752b
Fix markers errors
2020-04-20 16:37:40 +02:00
0ca779dbd1
Fix 'enable cba' button in properties
2020-04-20 16:20:46 +02:00
b208ca367d
Merge branch 'staging' into cba
2020-04-20 15:38:47 +02:00
9f5f4a4d52
Fix possible duplicate author id
2020-04-20 15:38:27 +02:00
3be884d702
Comments prototype
2020-04-20 15:22:45 +02:00
e6af3476d9
Upgrade ckeditor to 4.14
2020-04-20 15:22:16 +02:00
cb04bec348
Merge branch 'soon' into staging
2020-04-20 08:57:36 -04:00
3f2d21fd71
Merge branch 'staging' into communities-comments
2020-04-20 12:10:27 +02:00
41c0704ad8
Page mode by default in rich text
2020-04-20 11:56:12 +02:00
ca9f874afb
Redraw mermaid on preview
2020-04-20 11:09:46 +02:00
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
f03f70345a
remove an XXX note
2020-04-17 17:05:14 -04:00
b56c73be6e
delegate more work from getOlderHistory to the worker
2020-04-17 17:01:47 -04:00
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
f42c8e35b1
update version to 3.16.0 (Quagga)
2020-04-17 14:58:16 -04:00
1e9b9913c5
Better debug function and fix marker error
2020-04-17 18:18:16 +02:00
d6d4c4c70b
Merge branch 'soon' into staging
2020-04-17 11:44:30 -04:00
18c5d48474
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2020-04-17 11:44:08 -04:00
bac8ef3c6e
lint compliance
2020-04-17 11:43:54 -04:00
19e565a7dc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2020-04-17 17:38:22 +02:00
adae4b690b
outer.css cache busting
2020-04-17 17:38:15 +02:00
ef1d5bd706
Merge branch 'ckeditor-default-size' into staging
2020-04-17 11:37:12 -04:00
d0c3f0fa84
remove XXX notes
2020-04-17 11:36:48 -04:00
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
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
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
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
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
9ba2d11cd5
Guard against a type error
2020-04-17 16:50:41 +02:00
d27dc768f3
Fix missing button to enable cba
2020-04-17 15:56:22 +02:00
283f739be5
lint compliance
2020-04-17 15:30:27 +02:00
dd814713dd
Merge branch 'staging' into cba
2020-04-17 15:17:24 +02:00
f03713e60a
Fix small issues, clean debugging logs and add known issues
2020-04-17 15:16:49 +02:00
92738828ff
Merge branch 'debugtime' into cba
2020-04-17 10:31:42 +02:00
1d3f0ded81
Fix more markers errors
2020-04-17 10:31:37 +02:00
4e57e390da
write tasks inside of workers
2020-04-16 16:37:24 -04:00
c39adb9bff
configure ckeditor to allow unsetting font size
2020-04-16 14:59:43 -04:00
ba6faca02e
make the number of workers configurable
2020-04-16 13:53:45 -04:00
0465f31a45
add a FIXME note
2020-04-16 13:02:27 -04:00
04ab7f538a
recover from worker faults and unify worker types
2020-04-16 13:02:07 -04:00
ansuz