Commit graph

6685 commits

Author SHA1 Message Date
ansuz
c17938a8e3 cache the metadata to save a few lookups 2019-08-21 14:04:23 +02:00
ansuz
c5de4164bc make sure getIndex is always async in historyKeeper 2019-08-21 13:49:39 +02:00
ansuz
255f208a4a always enable tasks, but allow for admins to disable the integrated loop in the main server process 2019-08-21 13:36:27 +02:00
ansuz
d30470f1aa correct an invalid comment 2019-08-21 13:22:43 +02:00
ansuz
cdfbaf5ad9 write tasks along with metadata 2019-08-21 13:22:05 +02:00
ansuz
9623efd10b fix another non-standard instance of checking for metadata 2019-08-21 13:05:01 +02:00
ansuz
b360d79a76 simplify 'isNewChannel' rpc 2019-08-21 12:54:24 +02:00
ansuz
7e13f7e3ca validate owners against amended metadata when removing channels 2019-08-21 12:46:45 +02:00
ansuz
31f7c4b90a validate owners against amended metadata when clearing channels 2019-08-21 12:45:19 +02:00
ansuz
8c92d3dc02 move metadata to the top of the file with all the other imports 2019-08-21 12:30:01 +02:00
ansuz
c5ca82f0e1 throw errors if you try to update expiration times, as this isn't implemented yet 2019-08-21 12:28:19 +02:00
ansuz
0a0c64d240 only increment the metadata line index if you can parse the line 2019-08-21 12:26:46 +02:00
ansuz
1c37ec7aee prevent duplicated owners in metadata amendments 2019-08-21 12:25:17 +02:00
ansuz
a3a7bcbe35 add comments for lots of functions 2019-08-21 12:15:27 +02:00
ansuz
d6d7f4f601 include the size of the metadata log in the computed size of a channel 2019-08-21 12:14:49 +02:00
ansuz
2aebadcff3 use the correct path for channel data when restoring logs from the archive 2019-08-21 12:13:39 +02:00
ansuz
238d547a46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-20 17:37:43 +02:00
ansuz
50a6479854 merge latest staging into editable metadata 2019-08-20 17:32:46 +02:00
yflory
f966a479de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-20 13:55:46 +02:00
yflory
24ea640397 Kill the testworker to save memory usage 2019-08-20 13:55:37 +02:00
ansuz
30671cd570
Merge pull request #430 from ClemDee/responsiveContextMenu
Make context submenus don't overflow on Y axis
2019-08-20 13:45:21 +02:00
Clément Desableau
e1477bd32e Make context submenus don't overflow on Y axis 2019-08-20 01:58:49 +02:00
ansuz
1521220560 fix loading screen spinner color to match CryptPad icon 2019-08-19 17:32:37 +02:00
yflory
06809fd3ba Update codemirror settings in realtime 2019-08-19 16:53:17 +02:00
yflory
92a41f84f7 Fix wrong owner in the properties modal 2019-08-19 16:00:55 +02:00
yflory
c608bdd2dc Merge branch 'off' into staging 2019-08-19 15:38:22 +02:00
yflory
656b129543 Ability to remove handlers from worker-channel and metadata-manager 2019-08-19 15:37:08 +02:00
yflory
c1656d7b5b Merge branch 'unifiedMetadata' into staging 2019-08-19 15:27:59 +02:00
ansuz
aedc92362a update chainpad-listmap dependency version 2019-08-19 15:25:42 +02:00
yflory
6f0062d023 Add comments and timeout errors 2019-08-19 14:37:55 +02:00
yflory
3dba20776f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-19 13:40:24 +02:00
yflory
7988a30338 Fix folder upload UI 2019-08-19 13:39:40 +02:00
ansuz
08e9080dec
Merge pull request #428 from xwiki-labs/folderToSF
Folder to sf
2019-08-19 12:12:22 +02:00
ansuz
a368948fb6 handle errors when converting folders to shared folders 2019-08-19 12:06:06 +02:00
ansuz
7d583975b8 fix a few things, add comments for others 2019-08-19 11:56:52 +02:00
ansuz
5dacc6ceeb Merge branch 'soon' into staging 2019-08-16 17:39:54 +02:00
ansuz
04feef793b resolve merge conflicts 2019-08-16 17:39:22 +02:00
Weblate
1af467aa84 Translated using Weblate (French)
Currently translated at 100.0% (1039 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-08-16 14:51:04 +00:00
ansuz
1c55ac15d5 Merge branch 'staging' into editable-metadata 2019-08-16 16:43:42 +02:00
ansuz
dc65213130 Merge branch 'merge-plainTextFiles' into staging 2019-08-16 16:02:53 +02:00
ClemDee
bd717f16e3 Add translation keys 2019-08-16 16:02:29 +02:00
ansuz
bf3e638adc resolve merge conflicts, lint compliance 2019-08-16 16:02:10 +02:00
Weblate
c9569a136d Translated using Weblate (Russian)
Currently translated at 48.7% (502 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/

Translated using Weblate (Russian)

Currently translated at 47.1% (485 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-08-16 13:37:15 +00:00
Weblate
c555a0f500 Translated using Weblate (Portuguese (Brazil))
Currently translated at 32.3% (333 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/pt_BR/
2019-08-16 13:37:15 +00:00
Weblate
242677300b Translated using Weblate (German)
Currently translated at 100.0% (1030 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-08-16 13:37:15 +00:00
Weblate
3511f3b802 Translated using Weblate (French)
Currently translated at 100.0% (1030 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-08-16 13:37:15 +00:00
ansuz
32fa527dc9
Merge pull request #427 from xwiki-labs/exportFolder
Export folder
2019-08-16 15:02:02 +02:00
ClemDee
58a3f76464 Fix two comments 2019-08-16 14:35:07 +02:00
ClemDee
f2063f3748 Remove translation fallbacks 2019-08-16 13:56:25 +02:00
ClemDee
e8c98200ec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-16 13:52:32 +02:00