Commit Graph

1348 Commits

Author SHA1 Message Date
Owen Conti
51016c33f4 Attach in value to parameters map so parameters with the same name from different in types do not override each other. 2017-08-02 22:37:31 -06:00
Owen Conti
fdb0d13089 Fixes #3511 - Update changeParameter calls to accept in value to identify parameters based on name plus in value 2017-08-02 22:07:48 -06:00
Kyle
103aaa54d5 Merge branch 'master' into bug/3505-schema-title-in-array-schemes 2017-08-02 20:55:24 -07:00
Kyle
faafe372bd Merge branch 'master' into master 2017-08-02 17:06:49 -07:00
Owen Conti
fb5443601e Fixes #3505 - Choose modelName before name in Model component 2017-08-02 17:39:56 -06:00
Kyle Shockey
4cd88d3360 Support oneOf + anyOf + not 2017-08-02 16:37:57 -07:00
Kyle
b8cf502cfc Merge branch 'master' into master 2017-08-02 15:58:34 -07:00
Kyle
c2a1fa9d8f Merge branch 'master' into bug/3500-missing-name-for-primitives 2017-08-01 19:59:28 -07:00
Owen Conti
d64dfc4252 Fixes #3500 - Fix missing names for primitive models 2017-08-01 20:46:41 -06:00
Kyle
7c8467652e Merge branch 'master' into ft/3397-tags-external-docs 2017-08-01 19:39:39 -07:00
Kyle Shockey
c29e05d726 Display tag externalDocs 2017-08-01 19:34:56 -07:00
Kyle
b329b03464 Merge branch 'master' into support-basic-auth-for-authorization-code-grant 2017-08-01 16:52:04 -07:00
oysteinsigholt
230f4a8467 add domNode parameter 2017-08-01 11:11:10 +02:00
Kyle Shockey
5d78454778 Fix Swagger2 Response Example value rendering 2017-07-31 15:29:36 -07:00
Owen Conti
ea75eddcfb Fixes #3480
Change margin-left to padding-left on '&:first-of-type' table cells. Adjust width of table cell to account for padding.
2017-07-30 16:22:49 -06:00
Kyle Shockey
b994ae7d09 Fix bad PropTypes reference 2017-07-28 22:11:55 -07:00
shockey
84f6653fcf Merge branch 'master' into ft/oas3 2017-07-28 19:58:38 -07:00
shockey
299b609369 Merge branch 'master' into bug/3414-redo 2017-07-28 19:51:03 -07:00
Kyle Shockey
b373182afe ESLint fixes 2017-07-28 19:47:46 -07:00
Kyle Shockey
f7018bc78f Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/oas3 2017-07-28 19:13:24 -07:00
Kyle Shockey
2173900c82 Remove console.log 2017-07-28 17:52:02 -07:00
Kyle Shockey
9c31b14731 Resolve model names in OAS3 (fixes #3457) 2017-07-28 12:12:12 -07:00
Aaron Loo
a04c6240fb Merge branch 'master' of https://github.com/swagger-api/swagger-ui 2017-07-28 10:20:15 -07:00
Aaron Loo
860d356178 remove CORS header in request 2017-07-28 10:15:05 -07:00
Kyle Shockey
e7e03f2e44 Generate XML examples for request bodies (fixes #3448) 2017-07-27 18:03:40 -07:00
Kyle Shockey
afcc35b47c Indicate required request bodies (fixes #3449) 2017-07-27 18:03:30 -07:00
Kyle Shockey
ee37e308bf Remove config filtering 2017-07-27 16:34:16 -07:00
Kyle Shockey
6ecae65b5f Remove config filtering 2017-07-27 13:01:44 -07:00
Kyle Shockey
8bbe706918 Disable Try-It-Out button in OAS3
CC: #3436
2017-07-25 21:55:32 -07:00
Kyle Shockey
c7020d9d37 Fix TryItOut button layout in Swagger2
CC: #3429
2017-07-25 21:36:21 -07:00
Kyle Shockey
f0038b0264 Array value for isShownKey (oops) 2017-07-25 20:17:51 -07:00
Kyle Shockey
298835a616 Assign unique isShownKey values to Callback operation displays
CC: #3462
2017-07-25 18:20:51 -07:00
Owen Conti
b3bccfb185 fixes after merge 2017-07-24 18:55:32 -06:00
Owen Conti
9281a3b37c Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3414-redo
# Conflicts:
#	src/core/json-schema-components.js
#	src/core/utils.js
#	src/style/_buttons.scss
#	src/style/_form.scss
#	src/style/_mixins.scss
#	test/core/utils.js
2017-07-24 18:53:45 -06:00
Owen Conti
f570ffcd82 Reimplemented changes from PR #3427. Added fix for validating request bodies. 2017-07-24 18:46:30 -06:00
Owen Conti
87e7142f1f Revert "Update parameter <select> elements to render 'invalid' classes. Add '.invalid' CSS for <select> elements. Rework validateParam() function. Added .btn-sm class for "Add item" and "Remove item" buttons in array parameters. Reduce border-width on <select> elements inside parameters. Update tests for utils.validateParam()."
This reverts commit 666e22f989.
2017-07-24 18:26:09 -06:00
Kyle Shockey
f0b4b6bac1 Add minimal backstop for #3414 2017-07-24 13:13:18 -07:00
Kyle Shockey
5c70134f53 Revert "Merge pull request #3427 from owenconti/bug/3414-validate-params-reworked"
Reopens #3414

This reverts commit 99d368673b, reversing
changes made to 8bf9037bbc.
2017-07-24 13:07:12 -07:00
shockey
71abda66ec Merge branch 'master' into bug/2903-wrong-font-for-error 2017-07-21 20:17:18 -07:00
Owen Conti
e24300c8de Merge branch 'bug/3435-image-png-responses' of github.com:owenconti/swagger-ui into bug/3435-image-png-responses 2017-07-21 20:56:33 -06:00
Owen Conti
454e9af16b Added max-width style to scale down large images 2017-07-21 20:56:00 -06:00
Owen Conti
84e6cec9c1 Merge branch 'master' into bug/3435-image-png-responses 2017-07-21 20:49:23 -06:00
shockey
49a0cd5488 Merge branch 'master' into remove-array-model-name 2017-07-21 19:31:52 -07:00
shockey
2caa915fb5 Merge branch 'master' into bug/3100-sub-objects-as-required 2017-07-21 19:21:58 -07:00
shockey
4f1772f654 Merge branch 'master' into bug/2903-wrong-font-for-error 2017-07-21 19:19:44 -07:00
shockey
df43e961f9 Merge branch 'master' into remove-array-model-name 2017-07-21 19:18:13 -07:00
Owen Conti
defc45f7a6 Fixes #3435 - Update image/ response types to create a proper blob url from the content returned. 2017-07-21 20:16:51 -06:00
shockey
e64e438948 Merge branch 'master' into bug/3405-default-scheme-change 2017-07-21 19:13:26 -07:00
Owen Conti
ca937f4bdd Add name fallback, fix name extraction from props 2017-07-21 20:13:12 -06:00
shockey
10f12c287e Merge branch 'master' into fix-orderedmap-length 2017-07-21 19:07:36 -07:00