Commit Graph

836 Commits

Author SHA1 Message Date
Tony Tam
c9835d243e Merge pull request #1007 from swagger-api/encode-key
qOrphaner master
2015-03-06 15:32:56 -05:00
Tony Tam
06c64a01f2 Merge pull request #1008 from swagger-api/browser-support
Add browser support information
2015-03-06 14:57:27 -05:00
Mohsen Azimi
fa7452fd57 Add browser support information 2015-03-06 11:29:06 -08:00
LASSALLE Nicolas
19352cb3ff encodeURIComponent on api_key 2015-03-06 11:10:17 -08:00
Mohsen Azimi
3e9ef059ec Render externalDocs when it's available 2015-03-05 13:51:16 -08:00
Mohsen Azimi
eeb83a40bd Render response headers
Fixes #930
2015-03-05 10:50:38 -08:00
Mohsen Azimi
516b85ee65 Add generated print CSS file in src/main/html/css/ 2015-03-05 10:50:34 -08:00
Tony Tam
3f7714ec84 Merge pull request #998 from mohsen1/develop_2.0
Add bower.json
2015-03-04 14:05:56 -08:00
Mohsen Azimi
32e2eab2c9 Add bower.json
Fixes #955
2015-03-04 12:08:39 -08:00
Mohsen Azimi
b78aac66d6 Merge pull request #997 from mohsen1/wut
increase TravisCI timeout to 20s
2015-03-04 09:54:59 -08:00
Mohsen Azimi
b30c99dd63 increase TravisCI timeout to 20s 2015-03-04 09:48:22 -08:00
Tony Tam
a80570a4b7 Merge pull request #996 from mohsen1/travis-ci-timout
increase TravisCI timeout to 10s
2015-03-04 08:55:24 -08:00
Mohsen Azimi
2e9631495a increase TravisCI timeout to 10s 2015-03-04 08:53:50 -08:00
Tony Tam
d40172c1fb Merge pull request #973 from nunovieira/print.css_2.0
add print style sheet
2015-03-03 16:41:32 -08:00
Tony Tam
bcd09ed01e Merge pull request #986 from mohsen1/develop_2.0
Increase timeout for server launch in TravisCI
2015-03-02 11:21:48 -08:00
Tony Tam
87b5c0ce61 Merge pull request #984 from mohsen1/vincentjames501-master
Vincentjames501 master
2015-03-02 11:18:03 -08:00
Mohsen Azimi
9332911996 Increase timeout for server launch in TravisCI 2015-03-02 11:17:56 -08:00
Mohsen Azimi
66649dcb0d Merge branch 'master' of https://github.com/vincentjames501/swagger-ui into vincentjames501-master
Conflicts:
	src/main/coffeescript/view/OperationView.coffee
2015-03-02 10:35:58 -08:00
Tony Tam
d28321be30 Merge pull request #983 from mohsen1/CatLabInteractive-master
Cat lab interactive master
2015-03-02 10:25:49 -08:00
Tony Tam
b1f343ebb2 Merge pull request #976 from swagger-api/add-change-log
Add a link to releases for CHANGELOG
2015-03-02 10:21:46 -08:00
Mohsen Azimi
33d5331e60 Merge branch 'master' of https://github.com/CatLabInteractive/swagger-ui into CatLabInteractive-master
Conflicts:
	dist/lib/swagger-oauth.js
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	lib/swagger-oauth.js
2015-03-02 10:15:48 -08:00
Tony Tam
469121224b Merge pull request #978 from mohsen1/develop_2.0
Fix tests
2015-03-02 09:55:02 -08:00
Mohsen Azimi
59c6af5815 Refactor tests
Avoid too many repeatations
2015-02-28 12:53:02 -08:00
Mohsen Azimi
98eaa42820 update dependency and test in node 0.12 2015-02-28 09:00:14 -08:00
Mohsen Azimi
7188ca5fca Add a link to releases for CHANGELOG
Fixes #363
2015-02-27 16:30:24 -08:00
Nuno Vieira
f10c0ff405 add print style sheet 2015-02-27 18:18:14 +00:00
Mohsen Azimi
9b9802cd4c Merge branch 'kalinin-k-a-master' into develop_2.0
Conflicts:
	dist/lib/swagger-client.js
	lib/swagger-client.js
2015-02-27 09:44:54 -08:00
Tony Tam
a7e7d09e75 made space-delimited 2015-02-27 09:42:05 -08:00
Ivan Goncharov
cae9755076 Oauth 2.0: use space as delimiter for scopes. 2015-02-27 09:42:04 -08:00
Tony Tam
779db5da6a reverted files 2015-02-27 09:42:04 -08:00
Tony Tam
8f0d89c54a updated js lib 2015-02-27 09:42:04 -08:00
Mohsen Azimi
ef55b90541 user gulp-order to produce ordered template 2015-02-27 09:41:58 -08:00
Mohsen Azimi
13ac198da2 Add 'required' class to list parameter if it's required
Fixes #700
2015-02-27 09:41:53 -08:00
Mohsen Azimi
9c46e14379 When running gulp watch watch handlebars file changes too 2015-02-27 09:41:44 -08:00
Mohsen Azimi
8da938b9f8 Set marked options to render GFM correctly
Fixes #825
2015-02-27 09:41:44 -08:00
Mohsen Azimi
7622b38426 Add underscore source map file
Fixes #949
2015-02-27 09:41:37 -08:00
Tony Tam
d37befe1b0 updated client for remote ref support 2015-02-27 09:41:25 -08:00
Tony Tam
96672c4e45 updated version 2015-02-27 09:41:16 -08:00
Tony Tam
4c989141b5 rebuilt 2015-02-27 09:41:02 -08:00
Tony Tam
7caac4f4ae updated version, client 2015-02-27 09:40:45 -08:00
Tony Tam
ba0d213329 fix for #944, form data with 2.0 spec 2015-02-27 09:40:25 -08:00
Tony Tam
63f2f09cfd prepare for file upload in swagger-js 2015-02-27 09:40:08 -08:00
Tony Tam
c0abd35191 rebuilt 2015-02-27 09:40:08 -08:00
Tony Tam
15a22dd62b updated version 2015-02-27 09:39:53 -08:00
Tony Tam
d70af2f3a5 added tags to test 2015-02-27 09:39:20 -08:00
Tony Tam
bcfa028f53 updated client 2015-02-27 09:39:20 -08:00
Ron
d6598855b5 Update README.md 2015-02-27 09:38:39 -08:00
Tony Tam
2d4946c7bd rebuild 2015-02-27 09:38:39 -08:00
Tony Tam
e076929930 rebuilt 2015-02-27 09:37:38 -08:00
Tony Tam
9d0c6c50e7 updated from master 2015-02-27 09:37:25 -08:00