Commit Graph

927 Commits

Author SHA1 Message Date
Mohsen Azimi
311abe7fea Merge pull request #1071 from danrice01/patch-1
Fixing sorter typo
2015-03-26 13:53:13 -07:00
Mohsen Azimi
3de0b36a4e Fix JSHint issues 2015-03-26 13:09:08 -07:00
Mohsen Azimi
d451c2b539 Add link innerText 2015-03-26 13:08:23 -07:00
Mohsen Azimi
c157fe41c1 Add support for downloading via Blob 2015-03-26 13:06:33 -07:00
Mohsen Azimi
6b8f6e2827 Add file download to try operation 2015-03-26 11:41:06 -07:00
Mohsen Azimi
cc34e270b7 Merge pull request #1074 from mohsen1/xit
xit out tests that are failing due to SwaggerJS
2015-03-26 11:00:09 -07:00
Tony Tam
cc8f9efaa4 Update .travis.yml 2015-03-25 20:50:37 -07:00
Mohsen Azimi
b36c6e596e xit out tests that are failing due to SwaggerJS 2015-03-25 15:23:49 -07:00
Tony Tam
68e2543c68 Merge pull request #1067 from mohsen1/use-swagger-js-from-npm
Use SwaggerJS from npm
2015-03-25 15:13:39 -07:00
Mohsen Azimi
70114fe48a Use node_modules/.bin for binary executions in scripts of package.json 2015-03-25 12:50:23 -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
Mohsen Azimi
99eaf4eb23 Use SwaggerJS from npm
* Uses npm to download latest swagger-js (for now. When swagger-js is
   released we will replace git address with actual swagger-ui)

* Uses `postinstall` to generate `browser` folder of swagger-ui. This
 can go when swagger-ui is published.
2015-03-25 12:49:39 -07:00
Dan Rice
7979f75ff9 Fixing sorter typo
Original code didn't work because of a mix between the use of 'apisSorters' and 'apisSorter' references. Changed all 'apisSorters' refs to 'apisSorter'.
2015-03-25 14:53:40 +00:00
Tony Tam
a7093e68a5 Merge pull request #1066 from mohsen1/configurable-redirecturl
Add ability to override redirectUrl in swagger-oauth
2015-03-24 13:49:41 -07:00
Mohsen Azimi
6523318f88 Rename redirectUrl optoon to oauth2RedirectUrl 2015-03-24 13:33:40 -07:00
Mohsen Azimi
ede1faa0c8 Add ability to override redirectUrl in swagger-oauth
Fixes #457
2015-03-24 13:33:18 -07:00
Tony Tam
b78a8e5fdc Merge pull request #1064 from mohsen1/umd
Make SwaggerUi UMD compatible
2015-03-24 13:10:20 -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
b58eee10e7 Fix JSHint issues 2015-03-23 16:00:43 -07:00
Mohsen Azimi
93c18d59b8 Make SwaggerUi UMD compatible 2015-03-23 14:28:14 -07:00
Tony Tam
440b62a2b2 Merge pull request #1051 from julien-maurel/sorterOptions
Fix #1040 : add options to be able to sort APIs and operations
2015-03-23 09:49:56 -07:00
Tony Tam
18bd611a84 Merge pull request #1058 from mohsen1/typos
Fix typos in SwaggerUi.js
2015-03-23 09:49:40 -07:00
Mohsen Azimi
f6754d2040 Fix typos in SwaggerUi.js
Fixes #1053
2015-03-20 18:22:24 -07:00
Tony Tam
0a6f913b1a Merge pull request #1050 from liviosoares/develop_2.0
OperationView.js: fix rendering of Markdown (GFM) in description fields.
2015-03-20 14:22:39 -07:00
Livio Soares
aef4574958 operation.handlebars: Using a <div> around {{{description}}} is more robust to
potential HTML tags cannot be nested within the <p> context.
2015-03-20 16:37:54 -04:00
Julien Maurel
3377380c35 Fix #1040 : add options to be able to sort APIs and operations 2015-03-20 09:35:14 +01:00
Livio Soares
b181fa95a0 OperatioView.js: fix rendering of Markdown (GFM) in description fields.
This removes substitution of \r\n, \r, \n to <br>, since the subsequent set of
renderGFM() gets confused by them. Furthermore, the marked module already does a
decent job of substituting \n with proper HTML (<p>, if I'm not mistaken).
2015-03-18 23:38:28 -04:00
Tony Tam
38ac8428d1 rebuilt 2015-03-17 16:29:02 -07:00
Tony Tam
b66a8613ab fixed build error 2015-03-17 16:28:31 -07:00
Tony Tam
972188c97d Merge branch 'mohsen1-git-attrs' into develop_2.0 2015-03-17 16:16:37 -07:00
Tony Tam
5a890c9788 merged 2015-03-17 16:16:27 -07:00
Mohsen Azimi
afe232747b Normalize all the line endings 2015-03-17 14:34:22 -07:00
Mohsen Azimi
afa3a7bfe9 Add .gitattributes file 2015-03-17 14:33:43 -07:00
Tony Tam
5b177c9a58 Merge pull request #1042 from mohsen1/fix-994
Encode/decode tags before using it in the URL
2015-03-17 14:28:48 -07:00
Mohsen Azimi
9b409f75b8 Encode/decode tags before using it in the URL
Fixes #994

Conflicts:
	dist/swagger-ui.min.js
2015-03-17 14:14:28 -07:00
Tony Tam
f073f192a2 Merge pull request #1036 from mohsen1/remove-swaggerui-global-instance
Remove swaggerui global instance
2015-03-17 13:57:18 -07:00
Mohsen Azimi
f49c1689d2 Move backward compatibility to swaggerUi.js and warn users about API changes 2015-03-17 12:10:28 -07:00
Tony Tam
58982430c4 fix for #968, removed block 2015-03-16 21:21:35 -07:00
Mohsen Azimi
d61cf24ae0 Append swagger-auth global functions to window and don't break backward 2015-03-16 15:07:14 -07:00
Mohsen Azimi
8c6e3a6d95 Append Docs to window for now
also remove expection for global swaggerUi from JSHint
2015-03-16 13:58:05 -07:00
Mohsen Azimi
51bbbf03db Remove all references to swaggerUi global instance 2015-03-16 13:52:38 -07:00
Mohsen Azimi
79d9d1cf0d Update docs 2015-03-16 13:45:08 -07:00
Mohsen Azimi
66adb0d508 Remove global auth object references and fix header api key adding mechanism
Fixes #1033
2015-03-16 13:45:08 -07:00
Mohsen Azimi
9ed1ad88ec Pass router to all views 2015-03-16 11:08:28 -07:00
Tony Tam
194f2d5fb5 Merge pull request #1028 from mohsen1/wrap-in-iif
Wrap all SwaggerUI code in a iife
2015-03-12 18:35:46 -07:00
Tony Tam
7943876183 Merge pull request #1029 from mohsen1/remove-cs-folder
Remove CoffeeScript folder
2015-03-12 18:35:30 -07:00
Mohsen Azimi
52d9ce277c Remove CoffeeScript folder 2015-03-12 17:54:30 -07:00
Mohsen Azimi
4e22ff8b96 Wrap all SwaggerUI code in a iife
to avoid leaking globals other than SwaggerUi and swaggerUi

TODO: we should remove swaggerUi global dependency too
2015-03-12 17:51:44 -07:00
Tony Tam
465436a162 Merge pull request #1027 from mohsen1/cs-to-js
Goodbye CoffeeScript!
2015-03-12 17:33:02 -07:00
Mohsen Azimi
c710ad5be1 Fix V2 test 2015-03-12 17:16:15 -07:00