Commit graph

603 commits

Author SHA1 Message Date
yflory
5630b78763 Add icon 2020-04-24 13:18:03 +02:00
yflory
cdd90cea82 Clean links plugin code for ckeditor 2020-04-24 13:17:56 +02:00
yflory
f3e921d7a5 Comment from context menu 2020-04-24 12:49:21 +02:00
yflory
685be534ec Clear ghost data on ready if you're alone 2020-04-24 11:37:38 +02:00
yflory
45d3c1304f Restore a comment with undo 2020-04-24 11:16:56 +02:00
yflory
8e4ede3bb8 Fix mediatags in comments 2020-04-24 10:50:39 +02:00
yflory
a8eeac6e5a Use tab to move between comments 2020-04-23 17:42:28 +02:00
yflory
3722725462 Fix race condition when adding a new comment 2020-04-23 17:22:36 +02:00
yflory
a71d75bad3 Better representation of active comments 2020-04-23 16:19:58 +02:00
yflory
448edbf972 lint compliance 2020-04-23 13:52:21 +02:00
yflory
c2f26775d8 Visual link between comments and commented content 2020-04-23 13:47:03 +02:00
yflory
34768261b0 Recover previous comment input on redraw 2020-04-23 10:56:03 +02:00
yflory
17d78a3831 Add support for comments with multiple users 2020-04-22 18:48:49 +02:00
yflory
97f41edd94 Fix comments replies 2020-04-22 16:46:36 +02:00
yflory
96948ed55b Fix comments section hidden when adding first comment 2020-04-22 16:35:28 +02:00
yflory
31081eac46 Add comments UI 2020-04-22 16:23:45 +02:00
yflory
9d03d0effb Update rich text app structure to add a comments container 2020-04-21 16:07:04 +02:00
yflory
fa1e15e7d8 Merge branch 'staging' into communities-comments 2020-04-21 14:59:25 +02:00
yflory
d8855ed5f7 Remove XXX 2020-04-20 18:32:13 +02:00
yflory
3be884d702 Comments prototype 2020-04-20 15:22:45 +02:00
yflory
e6af3476d9 Upgrade ckeditor to 4.14 2020-04-20 15:22:16 +02:00
yflory
3f2d21fd71 Merge branch 'staging' into communities-comments 2020-04-20 12:10:27 +02:00
yflory
41c0704ad8 Page mode by default in rich text 2020-04-20 11:56:12 +02:00
yflory
adae4b690b outer.css cache busting 2020-04-17 17:38:15 +02:00
yflory
7acbe4ba2c Comment plugin 2020-04-08 16:16:57 +02:00
yflory
b27eb956df Merge branch 'staging' into lightbox 2020-03-31 10:21:54 +02:00
yflory
8210ae3a09 Fix duplicate text bug #352 2020-03-30 16:41:47 +02:00
yflory
b4b1ad893f Disable cursor position in rich text (possible cause of duplicate text) 2020-03-30 12:20:24 +02:00
yflory
75e5d3cc42 Move the mediatag and avatar code outsite of common-ui-elements 2020-03-30 12:09:12 +02:00
yflory
10f97354fe Fix text duplication bug #352 2020-02-14 18:11:22 +01:00
yflory
2ee38ccc42 lint compliance 2020-02-05 13:33:32 +01:00
yflory
4680de12ee New UI for the corner popup 2020-02-03 15:14:56 +01:00
yflory
9ee9e46087 Receiving a burn after reading URL 2020-01-09 17:30:15 +01:00
yflory
65585f6ce8 lint compliance 2019-11-22 15:52:30 +01:00
yflory
a573255072 Word count integration 2019-11-22 15:50:32 +01:00
yflory
9f903b645a ckeditor wordcount 2019-11-22 12:20:07 +01:00
yflory
7bd4a4028b Fix fileHost again... 2019-08-27 15:31:22 +02:00
ClemDee
3e918ec1cf Fix issues of no file extension for pad export 2019-07-29 16:30:48 +02:00
yflory
8e7858e6ae New share modal in all the apps 2019-06-03 11:57:55 +02:00
yflory
27eb2a81d5 Add support for Mathjax in CkEditor 2019-04-02 14:19:41 +02:00
yflory
e993925d81 Better implementation of the IE fix 2019-01-22 13:36:21 +01:00
yflory
01f93f6f7b FIx unrecoverable errors when using IE11 2019-01-22 12:25:49 +01:00
ansuz
060e5a12a2 lint compliance 2019-01-09 16:16:44 +01:00
yflory
6af7d393fd Fix cache issue with ckeditor css 2019-01-08 17:47:22 +01:00
yflory
cef9733262 Enable spellcheck in pad 2018-12-21 18:16:29 +01:00
yflory
a11a883cff Cursor improvements in pad, code and slide 2018-12-17 11:44:08 +01:00
yflory
2031d535d7 Cursor in pads (again) 2018-12-14 16:40:15 +01:00
yflory
ee3102143f Remove debugging logs 2018-12-14 15:38:04 +01:00
yflory
2498f45eb3 Clickable links in pad 2018-12-13 13:22:19 +01:00
yflory
7bbf6951f2 Disable cursors in pad 2018-12-11 14:16:15 +01:00
yflory
186e4b14fe Add missing file 2018-12-10 11:58:34 +01:00
yflory
c6f63d4d54 Cursor position in pad 2018-12-10 11:57:39 +01:00
yflory
cc3e6f3924 Fix scrollbar position in ckeditor #296 2018-11-27 14:07:17 +01:00
yflory
dbad925e5e New cursor recovery system (beta) 2018-11-26 16:23:16 +01:00
yflory
13d6579861 Add typing test in the code app 2018-11-22 14:45:12 +01:00
yflory
015449832c Fix missing characters caused by concurrent editing 2018-11-22 14:44:46 +01:00
yflory
3d712d9008 Merge branch 'cursor' into staging 2018-11-19 15:22:35 +01:00
yflory
9d9845434e lint compliance 2018-11-16 11:28:05 +01:00
yflory
3b9e1ee10c Fix scrolling issue in pads when clicking on buttons 2018-11-15 18:24:01 +01:00
yflory
c64feae7bf Merge branch 'staging' into cursor 2018-11-12 11:51:17 +01:00
yflory
2a6945cbe5 Fix export in the pad app with Chrome 2018-11-12 10:54:21 +01:00
yflory
fe0d579d56 Cursor improvements in pad (Beta) 2018-11-08 12:06:46 +01:00
yflory
82c3c7f50b Improve the Typing Test in pad 2018-11-08 10:46:07 +01:00
yflory
1c5847dd01 Prevent Ctrl+S from saving useless content. Add support for custom shortcuts in CkEditor 2018-11-05 16:53:25 +01:00
yflory
9d6c9dcf5e Fix font issue with new paragraph in pads (#284) 2018-10-29 11:47:57 +01:00
yflory
2af2fccc11 Fix overflowing text in pad 2018-10-26 16:30:01 +02:00
yflory
35b0f878c7 Merge branch 'backupdrive' into staging 2018-10-22 15:14:08 +02:00
yflory
3e9e92dcac Implement full CryptDrive export 2018-10-18 18:50:38 +02:00
yflory
5a6c3597db Fix missing cursor in empty pads with Chrome and fix page mode 2018-10-17 15:02:02 +02:00
yflory
f538a05044 Fix an issue with empty mediatag widgets in pads 2018-10-17 14:33:16 +02:00
yflory
8b05b1acaf Fix scrolling issue in pad when the userlist or the messenger was too big 2018-09-11 18:16:36 +02:00
yflory
2f3576f90e Fix image preview not resized correctly in the mediatag dialog 2018-09-04 10:50:34 +02:00
yflory
ab07554d0b Fix initial size of the image preview in the mediatag dialog 2018-09-04 10:45:18 +02:00
yflory
ee1027ceb9 Ability to import mediatags to the drive 2018-08-31 15:41:08 +02:00
yflory
264f7dc6a1 Move base64 migration prompt to corner and only when the pad is stored 2018-08-30 11:21:33 +02:00
yflory
90c96bfb70 Prompt users to migrate base64 images to mediatags in the pad app 2018-08-29 18:20:34 +02:00
yflory
5cd3cdc208 Don't handle drop events in the blockbase64 plugin 2018-08-27 14:57:16 +02:00
yflory
3f89dd9908 Disable pasting base64 images in ckeditor 2018-08-27 11:59:18 +02:00
ansuz
2259d1b6ac Merge branch 'soon' into staging 2018-08-16 13:33:09 +02:00
ansuz
8a113d742e
Merge pull request #245 from xwiki-labs/issue-169-anchors-should-output-anchors
#169: First anchor test and restore of the CKEditor anchor function.
2018-08-14 17:32:16 +02:00
ansuz
fb9cf2c81e lint compliance 2018-08-14 17:11:08 +02:00
Paul Libbrecht
0dc1500784 This should solve issue #169: The test now completes with the insertion of a random anchor (menu-driven) and some text, the export is then checked to contain <a name="..." id="..."> as expected, then cleans up.
paul
2018-08-13 21:04:24 +02:00
Caleb James DeLisle
0d5ac05866 refactoring of the less infrastructure 2018-07-14 15:15:23 +02:00
Caleb James DeLisle
a6d3dbf94f Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS 2018-07-12 19:13:04 +02:00
yflory
bc57f8c274 Replace media-tag.js with the new one 2018-06-07 14:12:33 +02:00
yflory
c7e08fedfb Password-protected files 2018-05-25 18:00:10 +02:00
Paul Libbrecht
372f1dfeb4 First anchor test and restore of the CKEditor anchor function. 2018-05-11 09:06:22 +02:00
yflory
10ce95087a Merge branch 'password' into staging 2018-05-03 15:16:03 +02:00
ansuz
123612b893 Merge branch 'de-translation-pl' into staging 2018-05-02 11:09:22 +02:00
yflory
a66d33e5ca Improve export for pads with mediatags 2018-04-30 11:40:41 +02:00
yflory
b26ae67df5 Fix issues with channel ID when using a password 2018-04-26 15:10:31 +02:00
yflory
7384568f77 Lint compliance 2018-04-23 15:38:21 +02:00
yflory
9d30e48a44 Fix mediatag redrawn on content update 2018-04-23 15:35:55 +02:00
yflory
2d08924462 Fix CkEditor issues 2018-04-23 14:33:39 +02:00
yflory
cf549eeaef Clean the code 2018-04-20 17:57:48 +02:00
yflory
41afc28802 Fix conflicts, clean the code, add migration from old mediatags 2018-04-20 17:49:40 +02:00
yflory
6a4f25bc9f Test widget filters 2018-04-20 17:48:39 +02:00
yflory
fd89811479 Clean mediatag plugin 2018-04-19 18:29:10 +02:00
yflory
5eab39ad75 Tets mediatag plugin using widgets 2018-04-19 17:45:08 +02:00
Paul Libbrecht
5747e1a492 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad 2018-04-10 19:12:30 +02:00
yflory
4288f536f1 Use requireCSS to load FontAwesome 2018-03-21 18:31:53 +01:00
yflory
01dd6953b9 Fix the previous fix... 2018-03-20 15:13:00 +01:00
yflory
c3f7b74baf Fix CkEditor's toolbar initial state 2018-03-20 15:07:20 +01:00
yflory
442f15df98 Add help text in all the apps + french translation 2018-03-08 15:39:46 +01:00
yflory
7a70d69d8e Hide editor toolbars by default when using a small screen 2018-03-07 17:34:55 +01:00
yflory
b0dba481d8 Fix small UI issues and IE issues 2018-03-02 18:33:43 +01:00
yflory
ee3b926e84 Get rid of ckeditor's reset_all class... 2018-03-01 10:33:28 +01:00
yflory
2c90cb5907 Move help button in drawer and fix drawer style 2018-02-28 17:59:27 +01:00
yflory
d975bb9cc0 Fix focus after pad creation screen 2018-02-28 13:16:30 +01:00
yflory
60b2384885 Move initial state into a help block 2018-02-27 17:38:29 +01:00
yflory
80df45f257 Get text from ckeditor 2018-02-01 10:09:08 +01:00
yflory
fb192a2c45 Add a configurable background color in the file app in view mode 2018-01-31 14:42:34 +01:00
yflory
c460e2820e Fix a 1px offset for the userlist in Firefox/Windows 2018-01-11 16:09:29 +01:00
yflory
f329d65bc8 Ability to reduce the width of ckeditor 2017-12-22 18:01:15 +01:00
yflory
edc236e17b Disable edition in pad read-only mode 2017-12-20 12:15:43 +01:00
yflory
c269929319 Fix creation page not displayed in pad and slide 2017-12-11 17:17:06 +01:00
Caleb James DeLisle
617c4b6044 CSS refactorings and pad-is-not-pinned work 2017-12-07 19:00:13 +01:00
Caleb James DeLisle
c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
yflory
644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz
812df7de6f Merge branch 'merge-staging' into staging 2017-11-27 12:18:34 +01:00
yflory
b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
ansuz
2e00214783 drop unreachable code 2017-11-23 16:57:01 +01:00
ansuz
ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
yflory
cf26c4c286 Improve the toolbar UI for smaller screens 2017-11-17 18:21:45 +01:00
Caleb James DeLisle
7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window 2017-11-09 17:07:04 +01:00
Caleb James DeLisle
75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 2017-11-09 15:36:49 +01:00
ansuz
e07bb0f7b3 roll back to old transform function, except in pad 2017-11-06 17:18:10 +01:00
yflory
8de9a596f1 Fix cursor in thumbnails 2017-11-02 19:11:27 +01:00
Evilham
5dcfbd07ab Merge branch 'theming-improvement' into staging 2017-10-27 18:32:08 +02:00
Evilham
4933aafbc8 Added default values to avoid breaking existing themes. 2017-10-27 18:31:52 +02:00
Evilham
735f0a7e30 Merge branch 'theming-improvement' into staging 2017-10-26 20:44:56 +02:00
Evilham
83da9cf752 Moved colours to colortheme.less to enable theming 2017-10-26 20:29:14 +02:00
yflory
6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
yflory
c1d05a00ba Improve media-tag export in pad to work with existing CSP 2017-10-23 10:55:40 +02:00
yflory
6d080bcb45 Ability to export mediatag images in pad 2017-10-20 18:10:08 +02:00
Caleb James DeLisle
a6b34491fc freeze the editor when reconnecting 2017-10-13 13:40:51 +03:00
Caleb James DeLisle
c773b5d076 Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed 2017-10-12 15:42:09 +03:00
Caleb James DeLisle
36aee2d174 lets try normalizing the dom before applying a patch 2017-10-09 14:13:11 +03:00
Caleb James DeLisle
9509d538e0 Cursor not being updated at the right times before applying a patch. 2017-10-06 14:49:52 +03:00
Caleb James DeLisle
d6570ad9f2 Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click. 2017-10-03 17:57:57 +03:00
Caleb James DeLisle
7230c780a1 Get rid of last usages of cryptpad-common in pad/inner 2017-10-02 15:06:01 +03:00
Caleb James DeLisle
f95acda758 Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/ 2017-09-27 16:53:16 +02:00
Caleb James DeLisle
6dbc02e81a Merge branch 'staging' into framework 2017-09-27 12:01:18 +02:00
Caleb James DeLisle
1c791b5b51 Fix framework by removing some async and also fix media tags 2017-09-27 11:58:14 +02:00
yflory
b4de31c827 Merge branch 'newdrive' into staging 2017-09-27 10:28:16 +02:00
Caleb James DeLisle
342b6012f7 manual merge of staging into framework 2017-09-26 17:11:45 +02:00
yflory
69014e5fde Fix mediatags in pad not cached 2017-09-26 11:21:36 +02:00
Caleb James DeLisle
77fe6a9bba small bug fixes 2017-09-26 10:23:35 +02:00
Caleb James DeLisle
368a6b2406 manual merge, still wip 2017-09-25 17:35:25 +02:00
Caleb James DeLisle
0eb2165f31 Implement a new pad framework and make it work (seemingly) with /pad/ 2017-09-25 15:45:08 +02:00
yflory
456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
yflory
95542bcdaf Lint 2017-09-19 15:38:19 +02:00
yflory
8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
yflory
72f0952835 Make sure we can't open a pad using the wrong app 2017-09-19 11:31:45 +02:00
yflory
a78b597ebb lint errors 2017-09-18 15:51:47 +02:00
yflory
1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
yflory
018f71df04 Add drop handlers for mediatags in ckeditor 2017-09-18 10:59:40 +02:00
yflory
c00d295466 Add missing translations 2017-09-15 17:33:36 +02:00
yflory
974658453c Mediatag integration in pads 2017-09-15 13:21:37 +02:00
Caleb James DeLisle
5f0383ae99 update version of sframe-boot because it was changed 2017-09-14 10:52:25 +02:00
Caleb James DeLisle
710418f42f Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed 2017-09-13 16:04:01 +02:00
Caleb James DeLisle
789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 2017-09-13 14:47:50 +02:00
Caleb James DeLisle
041071e61c manual merge 2017-09-11 15:52:14 +02:00
Caleb James DeLisle
7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) 2017-09-11 15:46:21 +02:00
yflory
8ef27dca08 Lint 2017-09-11 12:25:23 +02:00
yflory
757d0a2800 Save the state of CKEditor's toolbar (visible or hidden) 2017-09-11 10:10:29 +02:00
Paul Libbrecht
1ae7076790 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad 2017-09-07 22:08:34 +02:00
yflory
0423a5f4e2 Clean secure iframe code 2017-09-06 18:26:10 +02:00
yflory
04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 2017-09-06 16:05:20 +02:00
ansuz
47ec959032 make sure contenteditable is not set in read only mode 2017-09-05 18:35:11 +02:00
ansuz
6a735b441f use paul's print styles 2017-09-05 18:16:06 +02:00
Paul Libbrecht
e7de9229a8 Do not print toolbar and collaboration (#178).
paul
2017-09-05 17:29:03 +02:00
yflory
204e45dfae Enable templates in pad 2017-09-05 11:57:44 +02:00
yflory
86e23ac19f Use less2 in secure iframes 2017-09-04 15:09:54 +02:00
yflory
0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
yflory
0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
ansuz
9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 11:31:59 +02:00
ansuz
be8ea4102e keep trying to parse the hash until it works 2017-08-30 11:26:51 +02:00
yflory
4db4f66786 Remove an unnecessary fix for Safari 2017-08-30 11:14:58 +02:00
yflory
a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
Caleb James DeLisle
1044531806 Fix Safari iframe size issue 2017-08-30 11:04:52 +02:00
yflory
51fa6287c1 Enable notifications in secure pads 2017-08-29 11:20:02 +02:00
ansuz
40f062abda restore app usage report in new pad 2017-08-29 10:50:02 +02:00
Caleb James DeLisle
fe03e6ae83 bad code, lint 2017-08-28 17:53:23 +02:00
Caleb James DeLisle
190dff1c9b Use the bounce app for opening a link with the right click 2017-08-28 17:50:55 +02:00
yflory
0b4e044540 Fix the plugin to open a link in a new tab in pad 2017-08-28 17:26:51 +02:00
yflory
88cb4fd83c Enable friend requests from secure pads 2017-08-28 16:21:05 +02:00
yflory
f89015d9ed Update the tab title to match the pad title in pad2 2017-08-28 14:49:33 +02:00
Caleb James DeLisle
056285a7b6 Move pad2 to pad and create bounce app 2017-08-28 12:25:05 +02:00
Caleb James DeLisle
b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
Caleb James DeLisle
3315449114 Lets try this... 2017-08-16 14:30:17 +02:00
Caleb James DeLisle
6b174934c8 Try waiting for iframe document.onload instead of looping and waiting for document.body to exist. 2017-08-16 12:40:15 +02:00
Caleb James DeLisle
725e19925c Yeah, that was silly... 2017-08-16 12:11:25 +02:00
Caleb James DeLisle
b0b1ed037c Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable. 2017-08-16 10:19:24 +02:00
Caleb James DeLisle
638a94785f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-14 16:24:17 +02:00
Caleb James DeLisle
7ca60e55a7 Lock the pad's inner-iframe down with CSP 2017-08-14 16:23:38 +02:00
ansuz
5e6e76dfc1 make regex case insensitive 2017-08-14 14:41:23 +02:00
Pierre Bondoerffer
2cc6c636db
Add some missing titles 2017-08-08 16:20:31 +02:00
ansuz
dc7db074e8 open pad links when clicking in readOnly mode 2017-08-03 11:04:38 +02:00
yflory
331b4dddea Clean debugging code 2017-07-19 17:50:08 +02:00