Commit Graph

266 Commits (1d7683503f88ee08efe683545e4405ee725b78e7)

Author SHA1 Message Date
ansuz db4c3e7e2c Merge branch 'master' into staging 2017-09-20 12:07:01 +02:00
ansuz b5b84f540e fix preview mode class 2017-09-20 12:02:46 +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 483160a96a Fix tab notifications in code and slides 2017-09-18 14:31:58 +02:00
yflory 1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
yflory 0a656ca8d6 Fix the splitter in code and add it back 2017-09-18 12:09:18 +02:00
Caleb James DeLisle 5f0383ae99 update version of sframe-boot because it was changed 2017-09-14 10:52:25 +02:00
yflory 47cfa0cf45 Focus the editable content when opening a codemirror pad 2017-09-13 18:09:55 +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 671c893e8a Duplicating code like a moron, this should hopefully get fixed later. 2017-09-11 17:52:34 +02:00
yflory 9271b0c1a8 Try to fix half-codemirror bug 2017-09-11 14:42:43 +02:00
yflory 55fe882f64 Fix readonly mode in code 2017-09-11 12:23:04 +02:00
yflory bd422178c4 Hide the filepicker button in readonly mode 2017-09-11 11:59:09 +02:00
yflory f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +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
yflory 204e45dfae Enable templates in pad 2017-09-05 11:57:44 +02:00
yflory d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
yflory 0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
ansuz 595fa4c2e4 Merge branch 'soon' 2017-08-29 12:00:16 +02:00
ansuz a99eb9365e correctly set indentation preferences when changing languages 2017-08-24 17:31:04 +02:00
Caleb James DeLisle b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
yflory e7ef1e1c2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 12:35:13 +02:00
yflory 7c49ca6e3f Fix initial text size in code 2017-08-16 12:34:56 +02:00
ansuz 2a8abc2699 comment out splitter code 2017-08-16 12:15:08 +02:00
ansuz 66cacf08da allow users to write with tabs instead of spaces 2017-08-11 15:21:26 +02:00
Pierre Bondoerffer c8d7675ede
remove z-index on splitter in code 2017-08-11 12:56:42 +02:00
ansuz 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-10 18:06:58 +02:00
ansuz fbb880f277 implement customizable indentation widths 2017-08-10 18:06:47 +02:00
Pierre Bondoerffer 9dce40f3af
only add the splitter once 2017-08-10 14:34:48 +02:00
Pierre Bondoerffer 4026994310
make splitter work when scrolling 2017-08-10 14:25:31 +02:00
Pierre Bondoerffer d47e26efd5
add margin in code 2017-08-09 11:17:14 +02:00
Pierre Bondoerffer 85e383d5c5
add invisible splitter 2017-08-08 14:36:04 +02:00
Pierre Bondoerffer d15280c6ce
prevent pdfs from being huge 2017-08-08 11:52:16 +02:00
Pierre Bondoerffer c427f375dd
add bootstrap css to /code for image uploader 2017-08-08 11:48:17 +02:00
ansuz 66d81429bd integrate file embed into code editor 2017-08-03 11:47:54 +02:00
ansuz fe826133b3 make some markdown styles reusable 2017-08-02 11:03:06 +02:00
yflory c33d2a2db0 New tooltips 2017-07-19 17:14:10 +02:00
yflory 5d5f936682 Hide the upload table in code 2017-07-11 14:38:26 +02:00
yflory e732284845 Lint 2017-07-11 12:50:16 +02:00
yflory 8f5a244999 Replace mediatag markdown syntax by html. Enable file upload in /code. 2017-07-11 11:56:06 +02:00
ansuz 9f6ecea5d9 fix nacl reference error in media tag 2017-07-05 11:57:53 +02:00
ansuz ac8da0d52d load codemirror in the correct context. fix selection events 2017-07-04 12:37:24 +02:00
ansuz f09ae9b19c jshint compliance 2017-07-03 11:51:47 +02:00
yflory 5694505719 Fix syntax highlighting 2017-07-03 11:16:28 +02:00
yflory b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00
ansuz 7a5c5ce0a3 load scripts asynchronously 2017-06-29 12:17:08 +02:00
ansuz fca1ef4d36 hide unstyled content until the loading screen is displayed 2017-06-29 10:49:35 +02:00
ansuz 7de2683169 make all apps use clientside templates 2017-06-27 18:17:52 +02:00