Commit Graph

6 Commits

Author SHA1 Message Date
Laurent Lepinay
92efe421d0 fixes 2015-07-07 14:55:04 +02:00
Laurent Lepinay
78c7dda0a9 fixed jshint issues 2015-04-20 10:32:33 +02:00
Laurent Lepinay
f3ee0a436c Merge remote-tracking branch 'upstream/develop_2.0' into JSONEditor
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
2015-04-20 10:16:54 +02:00
laurent lepinay
e7b7465335 Merge branch 'develop_2.0' into JSONEditor
Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/coffeescript/view/MainView.coffee
	src/main/coffeescript/view/OperationView.coffee
	src/main/coffeescript/view/ParameterView.coffee
	src/main/coffeescript/view/ResourceView.coffee
	src/main/coffeescript/view/SignatureView.coffee
	src/main/html/index.html
2015-03-24 07:06:07 -07:00
Mohsen Azimi
93c18d59b8 Make SwaggerUi UMD compatible 2015-03-23 14:28:14 -07:00
Tony Tam
038443fc22 merged from develop_2.0 2015-02-01 02:27:43 -08:00