Commit Graph

112 Commits

Author SHA1 Message Date
Laurent Lepinay
2c431d7873 Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/javascript/view/OperationView.js
	src/main/less/screen.less
2015-12-16 10:25:38 +01:00
Tony Tam
daf150de34 fixes #1807 2015-12-09 20:14:41 -08:00
Tony Tam
bfa98a88ba removed unused var 2015-12-09 13:52:37 -08:00
Tony Tam
644da49077 added success response per #1476 2015-12-09 13:49:04 -08:00
Sean Kennedy
1ccab589f8 implement option to control whether models are displayed as valid JSON schema or the docs rendering (with descriptions) by default 2015-11-30 08:26:30 -05:00
Tony Tam
8276fbf073 fixes #1767 2015-11-27 17:28:46 -08:00
Laurent Lepinay
51b7b1db39 Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
2015-11-13 13:42:46 +01:00
Tony Tam
13314c1645 Merge pull request #1709 from cupgit/fix_double_curl
Only add 'curlCommand' if the 'curl' class is used on a div
2015-11-06 08:47:21 -08:00
Tony Tam
5aeb23d63e added map to address https://github.com/swagger-api/swagger-js/issues/619 2015-11-04 12:52:13 -08:00
Michel Cupurdija
24649aa848 Only add 'curlCommand' if the 'curl' class is used on a div 2015-10-27 16:52:34 +01:00
Laurent Lepinay
c269dbd9ed don't override title and type if they are already defined 2015-10-05 13:36:52 +02:00
Laurent Lepinay
50a9fc8d79 dont check the post body text area for as a required field when it's not visible (fro example when using the jsoneditor) 2015-09-24 11:43:26 +02:00
Laurent Lepinay
1367e8f6fa Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	test/e2e/v2.js
2015-09-21 14:48:29 +02:00
safin
16cfce4c20 fix for angular apps, when you dont have proper route and clicking on header leads to 'othewise' branch of router 2015-09-16 18:48:53 +03: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
Aaron Baker
ed41c336a3 Issue #1423: responses containing references to definitions were not being fully resolved when the spec was pulled in over AJAX but was working locally. OperationView.render()'s parsing of the responses was just checking if the ref _started_ with '#/definitions/', not whether it contained it, and when pulled in over AJAX the refs have the URL prepended to them 2015-08-05 12:48:34 +01:00
Tony Tam
29dc4b929d Merge pull request #1387 from brownstein/fix-oauth-toggle-on-operations
Fix incorrect display of oAuth toggle in non-oAuth operation views
2015-07-22 17:59:55 -07: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
Robert Brownstein
128fc5c112 Found a bug in OperationView.js which caused the oAuth toggle to be displayed for non-oAuth endpoints if oAuth was enabled at all, fixed it 2015-06-19 13:37:54 -04:00
Vladimir L
eaaf62a01e removed unnesessary logic, replaced by CSS style 2015-06-11 21:26:30 +02:00
Vladimir L
695dcc16b1 fixed issue with OAuth hint 2015-06-11 21:21:37 +02:00
Tony Tam
c7e07705f2 removed logging 2015-06-06 08:22:40 -07:00
Tony Tam
9ba75c02be fix for lint errors 2015-06-03 23:04:57 -07:00
Tony Tam
58dadc64f8 rebuilt 2015-06-03 22:45:26 -07:00
Tony Tam
62afd58210 merged 2015-06-03 22:36:46 -07:00
Tony Tam
fc6ad9977c merged 2015-06-03 22:16:43 -07:00
Shawn Gong
1ef90c4240 rewrote into source files, generate using gulp 2015-06-02 10:11:00 -04:00
Vitaliy Kanev
88838213c8 remove fileupload function 2015-05-16 15:47:45 +03:00
Vitaliy Kanev
9688af989e fixed: REFACTOR handleFileUpload 2015-05-16 15:42:50 +03:00
Nara Kasbergen
6ce834cfa9 fixes #693 2015-05-14 18:13:31 -04:00
Nara Kasbergen
59f53a96c1 fixes #958 2015-05-14 17:14:03 -04:00
Tony Tam
a02cea119d merged #1238 2015-05-08 13:28:12 -07:00
Tony Tam
17dca9e256 Merge pull request #1173 from BjRo/handle_whitespace_in_response
Prevent the OperationView to display an error in case the response contains a whitespace only body with content type application/json
2015-05-08 12:30:01 -07:00
Tony Tam
cdd80820cf fix for #1253 2015-05-08 12:23:18 -07:00
Tony Tam
9c58ed7018 Merge branch 'multi-value-params' of ssh://github.com/valdemon/swagger-ui into valdemon-multi-value-params 2015-05-08 12:10:01 -07:00
Tony Tam
1696a1ba34 added fix from outdated PR #1122 2015-05-08 12:06:56 -07:00
Tony Tam
ba855e3d04 Merge pull request #1112 from 3scale/op-execute
Pass swagger options to swagger-js Operation#execute method
2015-05-08 12:03:56 -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
Björn Rochel
569830b4ac Use jQuery for trimming 2015-04-16 20:37:19 +02:00
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
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
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
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
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
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