Joe Cheng f2410abc48 Merge remote-tracking branch 'origin/image-attr' ...

Conflicts:
	inst/www/shared/shiny.js
	inst/www/shared/shiny.js.map
	inst/www/shared/shiny.min.js
	inst/www/shared/shiny.min.js.map

2016-01-08 10:55:21 -08:00

..

bootstrap

Upgrade bootstrap to 3.3.5

2015-11-04 22:56:31 -08:00

datatables

upgrade DataTables to 1.10.5

2015-03-05 21:38:45 -06:00

datepicker

Split up shiny.js

2015-03-30 16:17:04 -05:00

font-awesome

Upgrade Font Awesome to 4.5.0

2015-12-23 11:03:33 -08:00

highlight

use rstudio fork of highlight.js

2013-12-17 14:51:44 -08:00

ionrangeslider

Update to ion.rangeSlider 2.0.12

2015-07-20 14:09:26 -05:00

jqueryui

Add README file with info about jQuery UI

2016-01-05 11:03:34 -06:00

selectize

upgrade selectize.js from 0.11.2 to 0.12.1 to fix the ordering issue in #929

2015-09-09 13:29:37 -05:00

showdown

restore javascript markdown formatter

2013-12-16 13:15:11 -08:00

strftime

Add strftime Javascript library

2015-07-02 16:50:43 -05:00

jquery-AUTHORS.txt

Update to jQuery 1.11.3

2015-10-19 13:31:44 -05:00

jquery.js

Update to jQuery 1.11.3

2015-10-19 13:31:44 -05:00

jquery.min.js

Update to jQuery 1.11.3

2015-10-19 13:31:44 -05:00

jquery.min.map

Update to jQuery 1.11.3

2015-10-19 13:31:44 -05:00

json2-min.js

json2.js modified and uglified from https://github.com/yihui/JSON-js via http://lisperator.net/uglifyjs/

2014-07-10 17:56:23 -05:00

shiny-showcase.css

fix browser height detection and CSS on IE8

2014-02-20 09:16:18 -08:00

shiny-showcase.js

fix #500: check for null source ref highlight points

2014-07-09 09:26:39 -07:00

shiny.css

Allow brush resizing

2015-04-16 23:40:07 -05:00

shiny.js

Merge remote-tracking branch 'origin/image-attr'

2016-01-08 10:55:21 -08:00

shiny.js.map

Merge remote-tracking branch 'origin/image-attr'

2016-01-08 10:55:21 -08:00

shiny.min.js

Merge remote-tracking branch 'origin/image-attr'

2016-01-08 10:55:21 -08:00

shiny.min.js.map

Merge remote-tracking branch 'origin/image-attr'

2016-01-08 10:55:21 -08:00