yflory
|
4ee62b0372
|
Merge branch 'ooReload' into may13
|
2020-05-12 13:46:54 +02:00 |
|
yflory
|
0018f71175
|
Bump cp interval in onlyoffice to 100
|
2020-05-12 13:46:09 +02:00 |
|
yflory
|
091192b697
|
Fix userID issues with the reload script and add reload modal
|
2020-05-12 13:21:56 +02:00 |
|
yflory
|
0feb4441da
|
Fix misisng html flag in tippy
|
2020-05-11 16:12:52 +02:00 |
|
ansuz
|
3e71b3afac
|
Merge branch 'master' into soon
|
2020-05-06 13:55:31 -04:00 |
|
ansuz
|
5b2929a6fc
|
suppress some useless info from some commonly logged errors
|
2020-05-06 13:50:48 -04:00 |
|
ansuz
|
bc8a122b87
|
update changelog for 3.17.0 (RedGazelle)
|
2020-05-06 13:44:47 -04:00 |
|
yflory
|
ab7c31c681
|
Fix trim history from a pad
|
2020-05-06 16:50:03 +02:00 |
|
yflory
|
a7f98cbed9
|
Fix infinite loop
|
2020-05-06 16:31:17 +02:00 |
|
Weblate
|
3c0c9efc0f
|
Translated using Weblate (French)
Currently translated at 100.0% (1270 of 1270 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
|
2020-05-06 14:33:11 +02:00 |
|
ansuz
|
9f1f01f3b4
|
disable worker task queueing and address a probable memory leak
|
2020-05-05 18:06:28 -04:00 |
|
yflory
|
6f1b04ca57
|
Fix print in ckeditor with firefox
|
2020-05-05 18:11:00 +02:00 |
|
ansuz
|
b0af6b5488
|
fix an incorrect condition when checking for available server workers
Also, log when the RPC queue has a backlog and when it is drained
|
2020-05-05 10:53:42 -04:00 |
|
ansuz
|
fff87fd42b
|
change a little wording in the readme
|
2020-05-05 09:53:22 -04:00 |
|
ansuz
|
f941890017
|
Merge branch 'guards' into staging2
|
2020-05-05 09:51:27 -04:00 |
|
ansuz
|
823c71c91f
|
Merge branch 'soon' into staging
|
2020-05-05 09:42:46 -04:00 |
|
Weblate
|
f02b96c689
|
Translated using Weblate (German)
Currently translated at 100.0% (1270 of 1270 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
|
2020-05-05 15:41:14 +02:00 |
|
ansuz
|
796bd35adf
|
Merge branch 'soon' into staging
|
2020-05-05 09:28:17 -04:00 |
|
ansuz
|
4011ff036d
|
Merge branch 'master' into soon
|
2020-05-05 09:25:39 -04:00 |
|
ansuz
|
fd25da5592
|
Merge pull request #541 from promasu/master
Remove docker related files
|
2020-05-05 09:24:35 -04:00 |
|
ansuz
|
f68a1a3b1b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-05-05 09:20:07 -04:00 |
|
yflory
|
2cf46328a5
|
Fix reply notifications with mentions
|
2020-05-05 15:12:47 +02:00 |
|
yflory
|
6edbe019d6
|
Fix fixSheets
|
2020-05-05 15:03:20 +02:00 |
|
yflory
|
84b5741cdf
|
Reload when a checkpoint has drawings
|
2020-05-05 14:41:02 +02:00 |
|
yflory
|
f087837e67
|
Loop over all oo checkpoints until you find one available
|
2020-05-05 14:03:30 +02:00 |
|
yflory
|
74eb4ffc6d
|
Merge branch 'soon' into staging
|
2020-05-05 12:15:22 +02:00 |
|
yflory
|
53f72e2d9c
|
Fix type error
|
2020-05-05 12:14:26 +02:00 |
|
David Benqué
|
09d1ddf825
|
remove // XXX related to translations
|
2020-05-05 10:19:32 +01:00 |
|
David Benqué
|
0eb89871cf
|
use translation key for comment error
|
2020-05-05 10:16:09 +01:00 |
|
yflory
|
d7ce297d0d
|
Fix user verifisation in mailbox messages
|
2020-05-05 11:12:58 +02:00 |
|
Weblate
|
258a4bc8cb
|
Translated using Weblate (German)
Currently translated at 99.9% (1269 of 1270 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
|
2020-05-05 11:08:56 +02:00 |
|
Weblate
|
fbfc9267af
|
Translated using Weblate (German)
Currently translated at 100.0% (1269 of 1269 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
|
2020-05-05 11:05:35 +02:00 |
|
Weblate
|
b24e78e22c
|
Translated using Weblate (French)
Currently translated at 100.0% (1270 of 1270 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
|
2020-05-05 11:05:35 +02:00 |
|
Weblate
|
c561c43126
|
Translated using Weblate (English)
Currently translated at 100.0% (1270 of 1270 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
|
2020-05-05 11:05:35 +02:00 |
|
Adrian Nöthlich
|
2919ee3fb0
|
Link cryptpad-docker repository in readme
Signed-off-by: Adrian Nöthlich <git@promasu.tech>
|
2020-05-05 05:43:18 +02:00 |
|
Adrian Nöthlich
|
68e33bb902
|
Remove docker related files
Signed-off-by: Adrian Nöthlich <git@promasu.tech>
|
2020-05-05 03:42:44 +02:00 |
|
ansuz
|
eed2886071
|
increment CryptPad version to 3.17.0 (RedGazelle)
|
2020-05-04 15:50:34 -04:00 |
|
ansuz
|
4037270a23
|
add a FIXME note for a sketchy implementation in history keeper
|
2020-05-04 15:46:08 -04:00 |
|
ansuz
|
c9846e532b
|
compare live blob activity against 'inactiveTime' instead of 'retentionTime' which is intended for archived content expiration
|
2020-05-04 15:40:51 -04:00 |
|
ansuz
|
7d15583b0e
|
lint compliance
|
2020-05-04 15:39:40 -04:00 |
|
ansuz
|
f50c3caf08
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-05-04 11:57:50 -04:00 |
|
ansuz
|
84909f8c30
|
Merge remote-tracking branch 'origin/communities-comments' into staging
|
2020-05-04 11:57:38 -04:00 |
|
ansuz
|
9714783818
|
Merge remote-tracking branch 'origin/lessonce' into staging
|
2020-05-04 11:54:55 -04:00 |
|
yflory
|
1d2b838b05
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-05-04 15:56:25 +02:00 |
|
yflory
|
dfc669154c
|
Fix issue with sheet ID in onlyoffice
|
2020-05-04 15:56:19 +02:00 |
|
yflory
|
c26bbba73a
|
lint compliance
|
2020-05-04 13:34:48 +02:00 |
|
yflory
|
7c7bfe72d7
|
Allow comments on mathjax
|
2020-05-04 13:30:08 +02:00 |
|
yflory
|
05f164a2e5
|
Fix issue with the addComment button in the toolbar
|
2020-05-04 12:20:18 +02:00 |
|
yflory
|
977301dfc3
|
Get the pad data from team drives when mentionned in a comment
|
2020-05-04 12:16:34 +02:00 |
|
yflory
|
bafe4718ef
|
Merge branch 'communities-comments' of github.com:xwiki-labs/cryptpad into communities-comments
|
2020-05-04 11:59:49 +02:00 |
|