blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8836 commits 72 branches 132 tags 541 MiB
Commit graph

8836 commits

This branch
This branch
All branches
Author SHA1 Message Date
yflory
cf8841cdfa Remove cba on non-owned pads 2020-04-22 10:44:16 +02:00
yflory
e5f1fa7ef0 Fix color by author automatically enabled for non-owned pads 2020-04-22 10:39:57 +02:00
yflory
ee1061be10 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-22 10:39:28 +02:00
yflory
0d2f37890b Fix color by author automatically enabled for non-owned pads 2020-04-22 10:37:51 +02:00
ansuz
b0b4029556 modify changelog with updated instructions for author colors 2020-04-21 12:45:47 -04:00
ansuz
e05891184e fix regression in maxWorkers 2020-04-21 12:23:48 -04:00
yflory
2695b51b0d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-21 16:40:34 +02:00
yflory
440980c4af Display preview with a single click 2020-04-21 16:40:19 +02:00
yflory
9d03d0effb Update rich text app structure to add a comments container 2020-04-21 16:07:04 +02:00
ansuz
7bdd367d88 remove log statements 2020-04-21 09:15:42 -04: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
7e334d0e3a add cursors to media-tags and mermaid in markdown preview 2020-04-20 14:41:37 -04: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
593011a657 Merge branch 'cba' into staging 2020-04-20 18:31:08 +02:00
yflory
8896b2eae2 Fix mediatag preview 2020-04-20 18:19:21 +02:00
ansuz
df6e12877b update changelog for 3.16.0 2020-04-20 12:15:46 -04: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
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