Tony Tam
4efefb156a
Update v2.js
2015-09-19 10:39:01 -07:00
Tony Tam
058f959669
extended timeouts
2015-09-19 09:51:23 -07:00
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
Miroslav Bajtoš
f6d7b6a73f
Fix timing issues in unit-tests
2015-08-06 17:22:52 +02:00
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
Ron
57327f5d1f
Updated ToS
2015-06-04 15:15:44 -04:00
Tony Tam
b1efe883db
merged logic from #1177
2015-05-08 12:45:00 -07: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
801acf07e3
Merge remote-tracking branch 'SwaggerOfficial/develop_2.0' into JSONEditor
...
Conflicts:
dist/swagger-ui.js
dist/swagger-ui.min.js
package.json
2015-04-07 05:20:02 -07:00
Tony Tam
b6bf8c2b47
prepare for release
2015-03-28 19:42:11 -07:00
Tony Tam
e214e7a0a2
updated links
2015-03-27 18:51:26 -07:00
laurent lepinay
326f542d04
Merge branch 'develop_2.0' into JSONEditor
...
Conflicts:
dist/index.html
dist/swagger-ui.js
dist/swagger-ui.min.js
2015-03-27 02:15:29 -07:00
Mohsen Azimi
b36c6e596e
xit out tests that are failing due to SwaggerJS
2015-03-25 15:23:49 -07:00
Mohsen Azimi
445e0353ca
Append .json to v1 spec files to enforce Content-Type when serving in test
2015-03-25 12:49:57 -07: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
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
Jeremy Whitlock
bdb181cb08
Update swagger-js with latest
...
* For the e2e tests to run, we had to enable CORS in http-server. The
release of http-server that supports CORS hasn't come out yet so we
have to use http-server@master until then. Here is the commit I speak
of: 30f4d1e008
2015-03-11 14:17:11 -06: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
2e9631495a
increase TravisCI timeout to 10s
2015-03-04 08:53:50 -08:00
Mohsen Azimi
9332911996
Increase timeout for server launch in TravisCI
2015-03-02 11:17:56 -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
2dad51f6b1
updated from master
2015-02-18 21:18:53 -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
