Commit Graph

9 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
c710ad5be1 Fix V2 test 2015-03-12 17:16:15 -07:00
Mohsen Azimi
5c32313880 JSHintify test 2015-03-12 17:01:01 -07:00
laurent lepinay
bfca6020d2 e2e test for jsoneditor 2015-03-11 05:37:14 -07:00
Mohsen Azimi
b30c99dd63 increase TravisCI timeout to 20s 2015-03-04 09:48:22 -08:00
Mohsen Azimi
59c6af5815 Refactor tests
Avoid too many repeatations
2015-02-28 12:53:02 -08:00
Tony Tam
75bb7e2521 added tags to test 2015-02-19 22:00:17 -08:00
Tony Tam
2a7b829ee5 formatting 2015-01-30 22:57:57 -08:00
Tony Tam
89cb34ed1d moved tests, added 1.x, 2.0 2015-01-30 22:49:36 -08:00