Commit graph

318 commits

Author SHA1 Message Date
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
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
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