Commit Graph
768 Commits
Author SHA1 Message Date
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
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
Tony Tam c847551ac4 moved from render to init method 2015-02-27 09:36:29 -08:00
Tony Tam 352e04997e reduced timeout 2015-02-27 09:36:29 -08:00
Stefano Travelli bb1ebcef28 Fix OAuth2 login when no scope is defined 2015-02-27 09:36:29 -08:00
Константин Калинин 8a206e1e96 Appended the checks of existing of translated attributes 2015-02-27 14:06:30 +03:00
Tony Tam 322892edfc made space-delimited 2015-02-26 21:31:44 -08:00
Tony Tam 3abe601651 Merge branch 'APIs-guru-develop_2.0' into develop_2.0t push origin develop_2.0 2015-02-26 21:02:35 -08:00
Tony Tam 0faf307dfa Merge branch 'develop_2.0' of https://github.com/APIs-guru/swagger-ui into APIs-guru-develop_2.0 2015-02-26 21:02:10 -08:00
Tony Tam 41976fe654 rebuilt client 2015-02-26 21:01:25 -08:00
Ivan Goncharov 28e493c101 Oauth 2.0: use space as delimiter for scopes. 2015-02-27 05:15:33 +02:00
Tony Tam 82d83566bf reverted files 2015-02-26 06:19:09 -08:00
Константин Калинин 707e848a50 merg 2015-02-26 15:46:01 +03:00
Константин Калинин 6b78d3eb6c readme 2015-02-26 15:44:03 +03:00
Константин Калинин 5bc2a5d818 codestyle 2015-02-26 15:38:27 +03:00
Tony Tam b6c05bd35d merged 2015-02-25 22:14:43 -08:00
Tony Tam 7d3d100401 updated js lib 2015-02-25 22:14:14 -08:00
Tony Tam 3249125c21 Merge pull request #964 from mohsen1/diff-fix
Diff fix
2015-02-25 16:01:52 -08:00
Tony Tam 0a0e384b2b Merge pull request #960 from mohsen1/develop_2.0
Set marked options to render GFM correctly and fix #700
2015-02-25 16:01:18 -08:00
Mohsen Azimi 0cd13c76f5 user gulp-order to produce ordered template 2015-02-25 15:53:02 -08:00