Commit graph

9285 commits

Author SHA1 Message Date
yflory
b0eebf1071 Add error message when trying to copy a restricted pad 2020-07-03 15:31:40 +02:00
yflory
84e32d73a3 Add icon for buttons in the empty trash modal 2020-07-03 13:07:24 +02:00
ansuz
dfd50d103d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-07-02 12:34:34 -04:00
ansuz
4891f60aa3 correctly render inline html in hyperscript 2020-07-02 12:33:50 -04:00
ansuz
f6b7eee30c remove hardcoded translations and outdated notes 2020-07-02 12:11:58 -04:00
David Benqué
d907b57d32 fix drive alignments
- breadcrumbs left-aligned with drive contents
- tag list left aligned with breadcrumbs
2020-07-02 16:53:48 +01:00
ansuz
20e62f7938 Merge branch 'soon' into staging 2020-07-02 11:45:14 -04:00
Weblate
7a41ba5ecb Translated using Weblate (French)
Currently translated at 99.9% (1300 of 1301 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-07-02 17:41:20 +02:00
Weblate
a3ee9de896 Translated using Weblate (English)
Currently translated at 100.0% (1301 of 1301 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1300 of 1300 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1299 of 1299 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-07-02 17:41:19 +02:00
yflory
cb1701ec97 Merge branch 'sfAllow' into staging 2020-07-02 17:13:27 +02:00
yflory
1321c08a62 Merge branch 'staging' into sfAllow 2020-07-02 17:09:26 +02:00
yflory
27124997a5 lint compliance 2020-07-02 17:07:57 +02:00
yflory
a44c19f996 Add missing error logs 2020-07-02 17:05:23 +02:00
David Benqué
54e625fa60 update cptools
- slight corrections on the destroy icon
2020-07-02 15:30:53 +01:00
David Benqué
f82579a063 Merge remote-tracking branch 'origin/staging' into staging 2020-07-02 15:18:15 +01:00
David Benqué
7db04d10e8 add destroy icon to cp-tools font 2020-07-02 15:17:59 +01:00
yflory
79c3f5525b Fix onlyoffice export UI issue 2020-07-02 11:49:44 +02:00
yflory
89c19b136b Deduplicate code 2020-07-01 16:28:02 +02:00
yflory
1b1487c2e4 Fix onlyoffice reload issue 2020-07-01 16:05:35 +02:00
yflory
baa35a2a02 Fix edit title font size issue 2020-07-01 13:30:03 +02:00
yflory
daa4675a44 Fix new kanban card deleted on content update 2020-07-01 13:15:45 +02:00
yflory
04af753a81 lint compliance 2020-07-01 12:10:12 +02:00
yflory
f3662ab7de Merge branch 'merge-owned' into staging 2020-07-01 12:04:44 +02:00
yflory
b8f7efc0de Add title to all categories in drive 2020-07-01 11:56:36 +02:00
yflory
67e1f5ca63 Add 'delete from server' option in the drive tree 2020-07-01 11:31:47 +02:00
ansuz
6519f8242e Merge branch 'signing-key-format' into staging 2020-06-30 14:52:57 -04:00
ansuz
03be102ce4 deduplicate some code by reusing the client definition on the server 2020-06-30 14:33:00 -04:00
ansuz
1a6dc200e2 remove a boilerplate test that got implemented elsewhere 2020-06-30 14:23:05 -04:00
yflory
6c5c412230 Fix less error 2020-06-30 18:29:06 +02:00
yflory
415375d034 Merge branch 'owned' into staging 2020-06-30 18:02:56 +02:00
yflory
d7697eaaf6 Fix small UI issues in the drive 2020-06-30 18:00:28 +02:00
yflory
23648cc62b New empty trash button 2020-06-30 17:55:36 +02:00
ansuz
737c42b447 update nginx.example.conf for latest rich text CSP 2020-06-29 16:51:58 -04:00
ansuz
fd355d789f suppress some noisy log statements 2020-06-29 16:51:28 -04:00
ansuz
526c17810b update rich text toolbar comment button to reflect state 2020-06-29 14:39:07 -04:00
yflory
2051f38f25 Don't send a notification to yourself when removing an owner 2020-06-29 17:24:51 +02:00
yflory
9c68714018 Fix comments panel not hidden when all the comments are removed 2020-06-29 17:21:11 +02:00
yflory
5031ed79f4 FIx 'default' values in rich text dropdown menus 2020-06-29 16:39:49 +02:00
yflory
3ff6a1a11c Fix scroll issue with dropdown menus in rich text 2020-06-29 16:30:27 +02:00
yflory
006a4ae144 Fix CSP error in the console in rich text pads 2020-06-29 16:19:48 +02:00
yflory
3f632f90f6 Fix scroll issue in rich text pads #406 2020-06-29 16:05:42 +02:00
ansuz
26765596e4 fix a regression 2020-06-26 15:44:50 -04:00
ansuz
c40eeff50f override some CKEditor internals to invalide inline event handlers 2020-06-26 14:40:40 -04:00
yflory
c01cd42da2 Fix special char dialog in pad 2020-06-26 18:39:49 +02:00
yflory
61a37fb919 Merge branch 'staging' into padcsp 2020-06-26 16:41:53 +02:00
yflory
98cc87888e Fix kanban rendering issues 2020-06-26 16:41:13 +02:00
yflory
c04c22cbb8 Add missing buttons to debug app 2020-06-26 15:58:03 +02:00
yflory
74b379999e Improve error message when opening an expired pad 2020-06-26 15:42:50 +02:00
yflory
163c6556a0 Update atime when embedding a mediatag to a pad 2020-06-26 15:38:30 +02:00
yflory
abba6e8653 Fix ckeditor checkbox size 2020-06-26 14:47:24 +02:00