Commit Graph

3011 Commits

Author SHA1 Message Date
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
893d0b2cbf updating dist 2017-07-28 10:19:45 -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
412a9cd6e7 Rebuild dist (for Editor) 2017-07-27 16:39:22 -07:00
Kyle Shockey
ee37e308bf Remove config filtering 2017-07-27 16:34:16 -07:00
shockey
81bb7dafd2 Merge pull request #3478 from shockey/remove-configs-filtering
Remove config filtering
2017-07-27 16:24:48 -07:00
Kyle Shockey
6ecae65b5f Remove config filtering 2017-07-27 13:01:44 -07:00
shockey
403598ec78 Update CONTRIBUTING.md 2017-07-25 23:13: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
Kenny
0e552c2116 Write test for UI 2017-07-25 14:42:39 -07:00
shockey
624f491510 Update CONTRIBUTING.md 2017-07-24 23:39:20 -07:00
Kyle Shockey
962464980f Add information on version branches 2017-07-24 23:34:28 -07:00
Kyle Shockey
09d3f5ad6c Add Github link 2017-07-24 23:31:54 -07:00
Kyle Shockey
d95c6523ff Add CONTRIBUTING.md 2017-07-24 23:30:31 -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
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