Commit Graph

5 Commits

Author SHA1 Message Date
unknown
ea2cefa46e Merge branch 'JSONEditor' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/less/screen.less
2015-09-10 10:53:15 +02:00
Praseeth T
6d4bc72a64 Fix #1394: A bug in IE 10/11 causes the placeholder text to be copied to "value" 2015-06-21 11:37:29 +05:30
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
dac83b71c8 Remove global views
Append all views to SwaggerUi.Views object
2015-03-12 16:42:23 -07:00
Mohsen Azimi
215a8fa63e Move all files to javascript folder and remove coffeescript folder 2015-03-12 16:21:31 -07:00