Commit graph

7214 commits

Author SHA1 Message Date
yflory
9a2a11c778 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-12-17 11:58:04 +01:00
yflory
182d684fc4 Add a command to fix roster rights 2020-12-17 11:57:53 +01:00
ansuz
6b7a8dd6c4 fix mp3 audio in media-tags for firefox 2020-12-15 14:32:47 +05:30
ansuz
245190aba0 Merge branch 'main' of github.com:xwiki-labs/cryptpad into main 2020-12-15 10:56:19 +05:30
ansuz
ad7133c53c fix a typo. closes #662 2020-12-15 10:55:37 +05:30
yflory
b8780d468b Fix ReferenceError with Notification 2020-12-14 16:34:38 +01:00
yflory
249483798f Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-12-14 16:01:12 +01:00
yflory
23e6dac8d4 Update teams slots default values 2020-12-14 16:01:01 +01:00
ansuz
9cb683c73e fix whiteboard image embed too large warning 2020-12-14 20:16:19 +05:30
yflory
efcb30234a Add max upload size in the upload errors 2020-12-14 15:26:24 +01:00
yflory
0aea86b7bb Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-12-14 14:53:46 +01:00
yflory
db80b7541a Fix mediatag size in settings 2020-12-14 14:53:37 +01:00
ansuz
c604df1865 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-12-14 18:41:22 +05:30
ansuz
74340c66d6 use inline styles to prevent leaking css 2020-12-14 18:41:07 +05:30
yflory
aaba903123 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-12-14 13:51:48 +01:00
yflory
eb5c93965a Clear cache when channel or blob is deleted 2020-12-14 13:51:36 +01:00
ansuz
a4e4968b52 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-12-14 18:15:42 +05:30
ansuz
a691b73f80 align the 'self-destruct' button to the right on the loading screen 2020-12-14 18:14:55 +05:30
yflory
dfc2d6ce0d Remove deleted pad from cache 2020-12-14 13:31:39 +01:00
yflory
453b207bcc Remove the throttled function from memory only 2020-12-14 12:09:19 +01:00
yflory
51ebdf4ed2 Clear throttled functions in cache 2020-12-14 12:06:18 +01:00
yflory
b3f91dd9a2 Fix button margin in admin panel 2020-12-14 12:02:48 +01:00
yflory
ab4739005b Fix X icon in the share modal 2020-12-14 11:57:46 +01:00
yflory
e3102d2746 Throttle channel cache 2020-12-14 11:52:24 +01:00
yflory
e656a67c16 Fix channel cache 2020-12-14 11:05:39 +01:00
ansuz
beab767016 Merge branch 'soon' into staging 2020-12-14 08:05:36 +05:30
Weblate
54f5fa67aa Translated using Weblate (German)
Currently translated at 100.0% (1400 of 1400 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-12-14 03:34:03 +01:00
yflory
4ca51c06e9 Spreadsheets editors are marked as viewers before they make a change 2020-12-11 16:12:52 +01:00
yflory
e26c6592df Fix scrambled data in spreadsheets: disable 'undo' 2020-12-11 16:12:43 +01:00
ansuz
d5970868f7 use the correct order of magnitude when editing an existing user quota 2020-12-11 20:38:39 +05:30
yflory
7926d86b51 Spreadsheets editors are marked as viewers before they make a change 2020-12-11 16:07:18 +01:00
yflory
15f85bbea1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-12-11 15:49:39 +01:00
yflory
5ee4cd5b5f Fix scrambled data in spreadsheets: disable 'undo' 2020-12-11 15:49:29 +01:00
ansuz
255527cc23 reject protocol-relative URLs in 'parsePadURL' 2020-12-11 17:48:15 +05:30
ansuz
5f9061cab1 Merge branch 'soon' into staging 2020-12-11 17:08:56 +05:30
ansuz
e9033d8b0a rule out double-callbacks when clearing cache 2020-12-11 17:06:37 +05:30
ansuz
b307b98926 remove hardcoded translation from /profile/ 2020-12-11 17:05:43 +05:30
ansuz
4a3ac980f4 remove unnecessary console.log 2020-12-11 17:04:57 +05:30
Weblate
18d4d498a7 Translated using Weblate (French)
Currently translated at 100.0% (1400 of 1400 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-12-11 12:27:48 +01:00
Weblate
08606e26a3 Translated using Weblate (English)
Currently translated at 100.0% (1400 of 1400 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-12-11 12:27:47 +01:00
ansuz
860b5a33cb remove hardcoded translation 2020-12-11 16:57:09 +05:30
ansuz
dad7a16135 add some uncommitted notes as code review 2020-12-11 16:44:32 +05:30
ansuz
e9b7332357 Merge branch 'soon' into staging 2020-12-11 16:40:14 +05:30
yflory
0506e717b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-12-10 13:03:36 +01:00
yflory
f21eb64fc2 lint compliance 2020-12-10 13:03:22 +01:00
David Benqué
32e572d056 De-emphasise "copy key" button on profile 2020-12-10 11:57:42 +00:00
David Benqué
1c1333068a Fix buttons on user profile 2020-12-10 11:44:00 +00:00
yflory
0411aa3c4a Fix cache issue with Firefox Private browsing 2020-12-10 12:11:03 +01:00
yflory
ed7becbb54 lint compliance 2020-12-09 15:36:30 +01:00
yflory
59f369659a Fix button style conflict wiht bootstrap 2020-12-09 15:11:42 +01:00