Commit Graph

341 Commits

Author SHA1 Message Date
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
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
yflory
c33d2a2db0 New tooltips 2017-07-19 17:14:10 +02:00
yflory
88813aee02 Show that only html can be imported in pads 2017-07-19 16:36:10 +02:00
ansuz
7be1e249e1 add fa-share-alt to pad initialText 2017-07-13 15:48:03 +02:00
yflory
fa2d857d70 Fix css issues with Safari 2017-07-03 16:11:41 +02:00
yflory
5a3e9c785c Fix ckeditor toolbar 2017-06-29 18:15:41 +02:00
yflory
ed0121d172 Lint errors 2017-06-29 18:05:34 +02:00
yflory
8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 2017-06-29 17:51:30 +02:00
ansuz
7a5c5ce0a3 load scripts asynchronously 2017-06-29 12:17:08 +02:00
ansuz
5e56ad912e remove the last bit of compiled css 2017-06-28 14:51:49 +02:00
ansuz
cfc5907237 remove unnecessary style rules 2017-06-28 10:41:08 +02:00
ansuz
7de2683169 make all apps use clientside templates 2017-06-27 18:17:52 +02:00
ansuz
e9bfaa9a60 compile less clientside. remove compiled css 2017-06-27 14:25:02 +02:00