Commit graph

7655 commits

Author SHA1 Message Date
yflory
afae952f64 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-02-26 14:31:05 +01:00
yflory
62df09e48c Fix XXX 2021-02-26 14:30:55 +01:00
ansuz
a0fcf71f99 Merge branch 'soon' into staging 2021-02-26 18:21:01 +05:30
Weblate
86770fbd1f Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2021-02-26 13:32:06 +01:00
ansuz
336b8339eb remove two unused keys 2021-02-26 18:00:46 +05:30
ansuz
16534fa65d Merge branch 'more-unused-keys' into staging 2021-02-26 17:57:23 +05:30
ansuz
06bfbbd283 exclude fewer onlyoffice paths and add more annotations 2021-02-26 17:35:04 +05:30
yflory
c9cec838d9 Add error message when import is failing 2021-02-26 12:35:56 +01:00
yflory
b7c2858c30 Fix error when importing wrong format 2021-02-26 12:18:33 +01:00
yflory
958fa726f9 Fix account deletion 2021-02-26 12:03:15 +01:00
ansuz
f7bada95ed flag some duplicated code 2021-02-26 16:08:21 +05:30
ansuz
c8a3a0bd16 annotate unusual translation keys so our script recognizes them 2021-02-26 16:08:04 +05:30
yflory
aa335909a4 Only allow file upload in the Documents section of your drive 2021-02-26 11:14:22 +01:00
yflory
e83f15fe14 Show max upload size before trying to upload 2021-02-26 10:53:37 +01:00
yflory
3262456b8a Fix kanban import 2021-02-26 10:39:52 +01:00
ansuz
112afc0de2 add a 'refresh' button to the performance tab of the admin panel 2021-02-26 13:32:48 +05:30
ansuz
c0d11b7f86 Merge branch 'unused-file-deps' into staging 2021-02-26 12:03:11 +05:30
ansuz
7bc12ff427 use brand link color for attachments in the admin support page 2021-02-26 12:03:01 +05:30
yflory
1edfbadf4e Fix invisible restricted shared folders in teams 2021-02-25 18:31:44 +01:00
yflory
5ade53ebba Merge branch 'soon' into staging 2021-02-25 16:13:03 +01:00
yflory
18dc5d9d23 Fix share folder with empty password 2021-02-25 16:11:37 +01:00
yflory
e692a85e1d Fix missing translation key 2021-02-25 15:09:40 +01:00
yflory
86b436582c Fix ERESTRICTED loop 2021-02-25 14:54:29 +01:00
yflory
61753aff4f Merge branch 'c' into staging 2021-02-25 14:42:36 +01:00
yflory
f5a0d541a5 lint compliance 2021-02-25 14:42:18 +01:00
ansuz
8af7e6054b lint compliance 2021-02-25 18:56:01 +05:30
yflory
e5992c29fa Merge branch 'soon' into staging 2021-02-25 14:22:10 +01:00
yflory
70b796c406 Fix shared folders with offline teams 2021-02-25 14:11:05 +01:00
yflory
058922918d Merge branch 'fixallow' into fixsf 2021-02-25 13:05:15 +01:00
yflory
daeae8b74e Fix race condition with the allow list 2021-02-25 11:27:39 +01:00
yflory
f071e2df25 Fix shared folders allow list 2021-02-25 11:15:24 +01:00
ansuz
8d87536640 remove unused dependencies from file app 2021-02-25 10:47:30 +05:30
yflory
9913efad7a Merge branch 'staging' into c 2021-02-24 11:35:08 +01:00
yflory
9e0a1285a6 Merge branch 'soon' into staging 2021-02-24 11:34:57 +01:00
yflory
7cc92d1399 Disable latest fix 2021-02-24 11:34:43 +01:00
ansuz
e77a95a93e restore an accidentally removed translation 2021-02-24 15:45:30 +05:30
yflory
6cbeb9c28f Merge branch 'staging' into c 2021-02-24 10:08:39 +01:00
ansuz
c84ecbabc0 more tests for the checkup page 2021-02-24 13:53:59 +05:30
ansuz
dc6446b088 use markdown block styles for plaintext in the file app 2021-02-24 09:12:39 +05:30
ansuz
cdf4006549 Merge branch 'soon' into staging 2021-02-24 09:05:48 +05:30
yflory
701d350fac Fix shared folders access list 2021-02-23 18:44:45 +01:00
yflory
3d4adb4598 Fix whiteboard download and export 2021-02-23 18:07:40 +01:00
yflory
193ea3033e Fix OO locks when reloading a page within the same worker 2021-02-23 17:37:37 +01:00
yflory
3496862ed9 Fix improved locks 2021-02-23 13:57:15 +01:00
yflory
ae985cef20 Merge branch 'staging' into c 2021-02-23 13:51:44 +01:00
yflory
7d6f7f374c Remove debugging log 2021-02-23 13:49:52 +01:00
yflory
94622fc34b Fix mute access requests when the pad is not in your drive 2021-02-23 13:49:25 +01:00
ansuz
a88ce23d55 Merge branch 'soon' into staging 2021-02-23 15:44:13 +05:30
Weblate
60e3fc7bd9 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2021-02-23 11:06:32 +01:00
ansuz
a5e3deb21a
Merge pull request #686 from xwiki-labs/keys
Delete unused translation keys
2021-02-23 05:06:04 -05:00