Commit Graph

1697 Commits

Author SHA1 Message Date
Bjoern Rochel
6a1707e3ba Prevent the OperationView to display an error in case the response contains a whitespace only body with content type application/json 2015-04-16 11:59:27 +02:00
Tony Tam
f9fdb05fbe Merge pull request #1170 from swagger-api/apikeyfix
Add API Key auth in onComplete callback of SwaggerUI#load call
2015-04-15 14:48:05 -07:00
Mohsen Azimi
b579783ba0 Add API Key auth in onComplete callback of SwaggerUI#load call 2015-04-15 14:46:32 -07:00
Tony Tam
3441403fda Merge branch 'develop_2.0' into fix-1109 2015-04-15 12:26:25 -07:00
Mohsen Azimi
e6664851b3 Support plain text in response
Fixes #1109
Fixes #1111
2015-04-15 12:05:48 -07:00
Tony Tam
6f8533bdc2 Merge branch 'develop_2.0' into fix-1132 2015-04-15 12:00:28 -07:00
Mohsen Azimi
53966f7aa8 Fix issue #1132 "JS error when testing uploadFile method (http://petstore.swagger.io/#!/pet/uploadFile)" 2015-04-14 14:01:38 -07:00
Mohsen Azimi
a7d708593c Fix issue #1160 "piKey is not set when Explore button is clicked " 2015-04-14 13:30:55 -07:00
shuisman
e127bf3577 Update default validator with correct protocol
Current code defaults to http protocol, but when package is installed in a https environment, the default validator should be securely available.
2015-04-07 18:37:02 +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
Waldek Kozba
ad56131a6d Corrected for Travis build. 2015-04-03 19:02:19 +00:00
Waldek Kozba
af39ae0603 Multiple values for array type parameters as separated lines in the textarea.
Improved required parameter handling for the array type.
Improved default value handling for the array type.
2015-04-03 14:31:23 +00:00
aurelian
c84202c1d7 Pass empty object to guard the case when options.swaggerOptions is undefined 2015-04-02 11:27:28 +02:00
aurelian
4764d33fe5 Pass swagger options to swagger-js Operation#execute method 2015-04-01 23:54:14 +02:00
Tony Tam
ac66a5009b replaced corrupt images 2015-03-30 07:28:39 -07:00
Tony Tam
b6bf8c2b47 prepare for release 2015-03-28 19:42:11 -07:00
laurent lepinay
155b450e01 Merge branch 'develop_2.0' into JSONEditor
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
2015-03-27 02:41:03 -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
Tony Tam
f9db0637b5 Merge pull request #1079 from mohsen1/develop_2.0
Add file download to try operation
2015-03-26 16:33:04 -07:00
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
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
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
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
Mohsen Azimi
f6754d2040 Fix typos in SwaggerUi.js
Fixes #1053
2015-03-20 18:22:24 -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
b66a8613ab fixed build error 2015-03-17 16:28:31 -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
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
Mohsen Azimi
52d9ce277c Remove CoffeeScript folder 2015-03-12 17:54:30 -07:00