Commit graph

6580 commits

Author SHA1 Message Date
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
415375d034 Merge branch 'owned' into staging 2020-06-30 18:02:56 +02:00
yflory
23648cc62b New empty trash button 2020-06-30 17:55:36 +02: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
77177921c2 Fix context menu csp in pads 2020-06-26 14:46:20 +02:00
yflory
1dfe8325dc Remove some CSP related console errors 2020-06-26 14:21:23 +02:00
yflory
9d2b2ac13c Merge branch 'staging' into padcsp 2020-06-26 14:03:24 +02:00
yflory
e64d831c40 Remove requirements for unsafe-inline and unsafe-eval in pad 2020-06-26 14:02:24 +02:00
yflory
e34c78580f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-06-26 10:39:05 +02:00
yflory
c494d95b1a Push missing files for onlyoffice 2020-06-26 10:38:53 +02:00
yflory
86fef86a24 Fix onload CSP issue in pad 2020-06-26 10:37:14 +02:00
yflory
34b2987816 Fix type error with comments 2020-06-26 10:36:21 +02:00
ansuz
d5d30c2e09 guard against a few possible typeErrors 2020-06-25 14:38:21 -04:00
ansuz
6a8ab6bc55 remove the 'comment' option from CKEditor's contextmenu in when UI is locked 2020-06-25 14:34:29 -04:00
ansuz
4053c4c1a6 avoid displaying new comment while the document is not editable
closes #570
2020-06-25 13:50:10 -04:00
ansuz
fd80441151 rename the 'getUserHrefFromKeys' function
since it's no longer an 'href'
2020-06-25 13:15:57 -04:00
ansuz
d4b38ba71d start testing a new format for 'Public Signing Keys' 2020-06-24 13:50:21 -04:00
yflory
351b4cddf9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-06-24 15:37:34 +02:00
yflory
9c6c229727 Tell the user when a pad is expired and not deleted 2020-06-24 15:37:21 +02:00
yflory
b7794fa31d Add 'Delete from server' button in the access modal 2020-06-24 14:53:37 +02:00
yflory
ff6d28a1e9 lint compliance 2020-06-24 07:58:33 -04:00
yflory
7bbbbbad77 Fix 'change user password' overriding existing data 2020-06-24 07:58:33 -04:00
yflory
6176d73c86 Move print button to our toolbar 2020-06-24 07:58:33 -04:00
yflory
fe36d1ca12 Don't try to send a mailbox message as an anonymous user 2020-06-24 07:58:33 -04:00
yflory
b868acc641 Make search results sortable 2020-06-24 07:58:33 -04:00
yflory
c32f0d61ce Preserve 'select' dropdown annotations on click 2020-06-24 07:58:33 -04:00
yflory
95f4b2357d Don't redraw kanban when the tab is not focused 2020-06-24 07:58:33 -04:00
yflory
db6c454837 Fix merge issue 2020-06-24 11:45:34 +02:00
yflory
b4021bd2b0 Merge branch 'staging' into merge-owned 2020-06-24 11:41:19 +02:00