Commit Graph

2987 Commits

Author SHA1 Message Date
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
shockey
febd5ff554 Merge pull request #3452 from shockey/v/3.0.21
v3.0.21 (hotfix release)
2017-07-24 13:48:23 -07:00
Kyle Shockey
b8348335a5 Rebuild dist 2017-07-24 13:39:57 -07:00
Kyle Shockey
691011c9cc README and package.json version bumps 2017-07-24 13:18:32 -07: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
e45edc56dc Merge pull request #3443 from shockey/v/3.0.20
v3.0.20
2017-07-21 21:52:35 -07:00
Kyle Shockey
2e773f0654 Rebuild dist 2017-07-21 21:47:32 -07:00
Kyle Shockey
f4f8ee5f57 Merge branch 'master' of github.com:swagger-api/swagger-ui into v/3.0.20 2017-07-21 21:45:50 -07:00
Kyle Shockey
4b404f63ec v3.0.20 2017-07-21 21:35:02 -07:00
shockey
71abda66ec Merge branch 'master' into bug/2903-wrong-font-for-error 2017-07-21 20:17:18 -07:00
shockey
b448c4881e Merge pull request #3442 from owenconti/bug/3435-image-png-responses
Add max-width
2017-07-21 20:01:52 -07:00
Owen Conti
ae901bc19d Merge branch 'master' into bug/3435-image-png-responses 2017-07-21 20:58:16 -06: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
shockey
ae2c4e813c Merge pull request #3441 from owenconti/bug/3435-image-png-responses
Fixes #3435 - Fix rendering of image/* content types
2017-07-21 19:53:19 -07:00
Owen Conti
84e6cec9c1 Merge branch 'master' into bug/3435-image-png-responses 2017-07-21 20:49:23 -06:00
shockey
3b880e900f Merge pull request #3425 from scottohara/remove-array-model-name
Remove fallback to name for array model title (Fixes #3424)
2017-07-21 19:35:26 -07:00
shockey
49a0cd5488 Merge branch 'master' into remove-array-model-name 2017-07-21 19:31:52 -07:00
shockey
89306801ef Merge pull request #3345 from owenconti/bug/3100-sub-objects-as-required
Fixes #3100 - Required sub objects
2017-07-21 19:25:38 -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
shockey
0c28a50f53 Merge pull request #3411 from owenconti/bug/3405-default-scheme-change
Fixes #3405 - Fixed selecting default scheme in schemes.jsx
2017-07-21 19:17:16 -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
94da83d4ba Merge pull request #3420 from AutoScout24/fix-orderedmap-length
Fix length issue in OrderedMaps
2017-07-21 19:12:23 -07:00
shockey
10f12c287e Merge branch 'master' into fix-orderedmap-length 2017-07-21 19:07:36 -07:00
shockey
d40351ce54 Merge branch 'master' into remove-array-model-name 2017-07-21 19:04:20 -07:00
shockey
99d368673b Merge pull request #3427 from owenconti/bug/3414-validate-params-reworked
validateParam() fixes
2017-07-21 18:42:13 -07:00
shockey
8704db7d0f Merge branch 'master' into bug/3414-validate-params-reworked 2017-07-21 18:35:02 -07:00
Owen Conti
d9c07a6c30 Merge branch 'master' into fix-orderedmap-length 2017-07-21 19:18:37 -06:00
Owen Conti
8bf9037bbc Merge pull request #3440 from owenconti/bug/3434-links-in-response-style
Fixes #3434 - Change link style color
2017-07-21 19:12:56 -06:00
Owen Conti
3f7145b8b1 Merge branch 'master' into bug/3434-links-in-response-style 2017-07-21 19:07:37 -06:00
shockey
2145ab1408 Merge pull request #3438 from swagger-api/ux-ui
Update topbar.jsx
2017-07-21 18:02:31 -07:00
shockey
e04b96fde4 Merge branch 'master' into ux-ui 2017-07-21 17:58:08 -07:00
Owen Conti
b9bb4c124e Fixes #3434 - Change link style color for .response-col_description__inner links 2017-07-21 18:46:50 -06:00
Owen Conti
9939c01f80 Merge pull request #3439 from owenconti/bug/3422-expand-collapse-arrows-on-models
Fixes #3422 - Expand/collapse arrows fix
2017-07-21 18:30:53 -06:00
Owen Conti
eb1f3b1fa6 Fixes #3422 - Fixed regression bug on models.jsx expand/collapse arrows due to bad merge 2017-07-21 17:23:28 -06:00
shockey
0010bf20a6 Update add-plugin.md 2017-07-21 16:04:58 -07:00
shockey
c82f85f123 Update topbar.jsx 2017-07-21 16:01:52 -07:00
Owen Conti
e60ae7bbbb Merge branch 'master' into bug/3414-validate-params-reworked 2017-07-20 21:40:43 -06:00
Owen Conti
666e22f989 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(). 2017-07-20 21:33:57 -06:00
Scott O'Hara
c4409c58d8 Remove fallback to name for array model title (Fixes #3424) 2017-07-21 11:42:06 +10:00
shockey
4353e321ad Merge pull request #3423 from swagger-api/dist-index-deep-linking
Enable deep linking in dist/index.html
2017-07-20 17:25:08 -07:00
shockey
1e5304790e Enable deep linking in dist/index.html 2017-07-20 17:20:01 -07:00
shockey
cb6b305fc9 Merge branch 'master' into xlink-deprecated 2017-07-20 17:00:25 -07:00