Commit Graph

13 Commits

Author SHA1 Message Date
Laurent Lepinay
d968fda207 Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge
Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/html/index.html
	src/main/template/param.handlebars
	src/main/template/param_required.handlebars
2015-07-07 15:31:21 +02:00
Laurent Lepinay
c51f1ebb9b preparing for non required properties in jsoneditor 2015-07-02 17:59:13 +02:00
Nara Kasbergen
37d29df074 Add support for GFM syntax in model (schema) descriptions -- relies on one small change to swagger-client 2015-05-14 15:36:23 -04:00
Nara Kasbergen
831a7ae604 Just realized this adds some extra horizontal padding which may not be desirable, so this fixes that 2015-05-13 17:31:47 -04:00
Tony Tam
ccfc4aa4ba manually added #1086, #1089 2015-05-08 12:01:06 -07:00
laurent lepinay
447b905132 JSONEditor enable/disable flag 2015-03-12 07:12:07 -07:00
laurent lepinay
eb390ffca2 JSON Editor feature 2015-03-09 07:06:24 -07:00
Tony Tam
038443fc22 merged from develop_2.0 2015-02-01 02:27:43 -08:00
Bez Hermoso
f8991bc7f5 Moved reference to throbber.gif to CSS file. 2014-08-21 13:20:45 -07:00
Kyle J. Ginavan
34ab47e9e7 moved css scoping to less templates per owners request, converted highlight.default.css to less, and made reset css its only include as it is difficult to scope due to html and body tag css overrides 2014-04-11 09:59:19 -05:00
Tony Tam
da63a33845 merged from oauth2 branch 2014-03-19 21:50:31 -07:00
Tony Tam
a5556d7f01 added options styling, swagger-js update, per #420 2014-03-18 19:41:49 -07:00
Tony Tam
fcb82bdac4 merged https://github.com/wordnik/swagger-ui/pull/323 2013-10-06 15:47:13 -07:00