Commit Graph

6 Commits

Author SHA1 Message Date
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
9ed1ad88ec Pass router to all views 2015-03-16 11:08:28 -07:00
Mohsen Azimi
07ac7fcf95 Fix all JSHint errors 2015-03-12 16:50:57 -07:00
Mohsen Azimi
dac83b71c8 Remove global views
Append all views to SwaggerUi.Views object
2015-03-12 16:42:23 -07:00
Mohsen Azimi
8440833f6c Remove [].forEach calls 2015-03-12 16:22:19 -07:00
Mohsen Azimi
215a8fa63e Move all files to javascript folder and remove coffeescript folder 2015-03-12 16:21:31 -07:00