668ea95de2
Merge branch 'soon' into staging
2020-02-21 13:47:03 -05:00
e8142d983b
fix an invalid use of dropChannel
2020-02-21 13:46:48 -05:00
386add7c58
fix an invalid use of dropChannel
2020-02-21 13:46:11 -05:00
76d369bc83
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2020-02-21 13:39:07 -05:00
33c12c27a1
ignore successive metadata errors with the same message
2020-02-21 13:38:56 -05:00
78c292bc2e
Translated using Weblate (Italian)
...
Currently translated at 41.3% (501 of 1213 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-02-21 17:16:56 +01:00
e292a0b295
Translated using Weblate (French)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-02-21 17:16:56 +01:00
01ba2c4d40
Translated using Weblate (English)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1214 of 1214 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-02-21 17:16:56 +01:00
316d2a4689
Translated using Weblate (German)
...
Currently translated at 100.0% (1213 of 1213 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-02-21 17:16:55 +01:00
ff97c2cf63
Add (copy) to the title for copied pads
2020-02-21 17:10:50 +01:00
3abe522a9f
Make a copy
2020-02-21 15:45:16 +01:00
2cceb54aac
Fix cornerPopup timeout not always applied
2020-02-21 12:15:34 +01:00
d0bce11c21
Fix errors when an anonymous user leaves the shared worker
2020-02-21 12:07:53 +01:00
d3939e87b2
Fix readOnly mode in spreadsheets
2020-02-20 16:39:50 +01:00
4fee896b5d
update chainpad-listmap's dependency chain
2020-02-20 09:51:47 -05:00
c8b0907fbe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2020-02-20 09:50:44 -05:00
0edcdcb1b8
oups! fix a missing callback that's been here for a while...
2020-02-18 16:15:05 -05:00
04009bf9bb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2020-02-18 17:24:43 +01:00
d48cecf28e
Load mailboxes after teams
2020-02-18 17:24:28 +01:00
72564a7cfe
Merge remote-tracking branch 'origin/staging' into staging
2020-02-18 17:23:46 +01:00
70b87f31dd
Translated using Weblate (French)
...
Currently translated at 100.0% (1213 of 1213 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-02-18 17:23:12 +01:00
7cf9758428
Translated using Weblate (English)
...
Currently translated at 100.0% (1213 of 1213 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1212 of 1212 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1211 of 1211 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1210 of 1210 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1209 of 1209 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1208 of 1208 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1207 of 1207 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1206 of 1206 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1205 of 1205 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1204 of 1204 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1203 of 1203 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (1202 of 1202 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-02-18 17:23:12 +01:00
9943e3be78
Translated using Weblate (Italian)
...
Currently translated at 41.6% (500 of 1201 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-02-18 17:23:12 +01:00
d6c3ad1597
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2020-02-18 17:05:17 +01:00
f04a6056ae
Fix race condition with team access rights #497
2020-02-18 17:04:49 +01:00
99949ce838
Merge remote-tracking branch 'origin/staging' into staging
2020-02-18 14:24:11 +01:00
1f99c185f6
add new error key
2020-02-18 14:14:46 +01:00
64964e1f80
remove XXXs related to keys
2020-02-18 14:14:29 +01:00
ecce654ca6
add 'resource:' to script-src to enable shared-worker debugging in firefox
2020-02-17 12:48:10 -05:00
626a031115
resolve conflict with master/staging
2020-02-17 12:04:01 -05:00
ff73e96cb8
reimplement the trim history fix from staging
2020-02-17 12:02:49 -05:00
79f1280cf3
Merge branch 'soon' into staging
2020-02-17 11:42:08 -05:00
b56367414b
don't overwrite cached indices when new users join a channel
2020-02-17 11:31:00 -05:00
e8949168ec
lint compliance
2020-02-17 10:30:44 -05:00
5dff6535ed
add a simple guard against unparsed messages when trimming history
2020-02-17 10:19:51 -05:00
f86196e40a
implement shared environment between historyKeeper and RPC
2020-02-17 09:01:10 -05:00
8700345ccc
add missing connect-src directives to example nginx conf
2020-02-17 08:49:21 -05:00
1fc8c1de16
add missing connect-src directives to example nginx conf
2020-02-17 08:48:15 -05:00
d9ab8d3f62
lint compliance
2020-02-14 16:48:14 -05:00
3f606d8c75
remove some duplicated code
2020-02-14 16:45:53 -05:00
d274be6de4
remove ancient import script
2020-02-14 16:37:00 -05:00
725d10fc60
nest storage directory inside './lib'
2020-02-14 16:29:30 -05:00
58193a1969
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2020-02-14 13:49:23 -05:00
38c1700173
Respond to pinning RPCs as soon as possible
...
(instead of waiting until you've read an unbounded number
of pin logs while queries back up in memory)
Also replace instances of 'publicKey' with 'safeKey' or 'unsafeKey'
to clearly and correctly indicate their format.
2020-02-14 13:46:40 -05:00
10f97354fe
Fix text duplication bug #352
2020-02-14 18:11:22 +01:00
cded52f83f
replicate existing pinned.load API correctly
2020-02-14 11:45:51 -05:00
adc64f0c6e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2020-02-14 12:30:51 +01:00
1d24c85ca4
Add author and time of patches in debug app
2020-02-14 12:06:52 +01:00
65f88617cf
add support for an optional handler for each pin log
...
great for analyzing which files are most in need of optimization
2020-02-13 18:16:32 -05:00
a172bad30f
drop unnecessary reference to 'window' in Util.throttle
2020-02-13 17:50:17 -05:00
ansuz