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

8742 commits

This branch
This branch
All branches
Author SHA1 Message Date
ansuz
36e790dee6 style support tickets from premium users via a class 2020-04-29 14:40:42 -04:00
yflory
9e947e4fd6 Fix modal errors 2020-04-29 18:18:59 +02:00
ansuz
d35b015c3f log some info on successful file uploads 2020-04-28 17:12:03 -04:00
ansuz
37d3995ac1 unify format of console output with stored logs 2020-04-28 17:05:15 -04:00
ansuz
8a5d012edf add special error handling for a few special serverside errors 2020-04-28 16:57:52 -04:00
ansuz
8bee95d13d improve error reporting in GET_HISTORY 2020-04-28 16:56:11 -04:00
yflory
2a7dbc1294 Fix sort issue in the drive 2020-04-23 11:33:45 +02:00
ansuz
1f42eb4184 Merge branch 'soon' into staging 2020-04-22 15:14:44 -04:00
ansuz
0a97ae8c52 Merge branch 'master' into soon 2020-04-22 15:14:37 -04:00
ansuz
c860819eb1 guard against coercing undefined to a string 
visible in the author's tooltip when author marks were enabled
for the document, but hidden by the local user
 2020-04-22 15:09:27 -04:00
Weblate
52da3eae5d Translated using Weblate (Italian) 
Currently translated at 100.0% (1257 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
 2020-04-22 17:46:38 +02:00
yflory
37bbb815f0 Remove cba on non-owned pads 2020-04-22 10:44:35 +02:00
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
ansuz
7bdd367d88 remove log statements 2020-04-21 09:15:42 -04: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