Skip to content

Commit 6d22e38

Browse files
shockeyshockey
authored
Merge branch 'master' into ft/oas3-authorization
2 parents c9674a1 + 353fd00 commit 6d22e38

30 files changed

+379
-255
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
**This is the new version of swagger-ui, 3.x. Want to learn more? Check out our [FAQ](http://swagger.io/new-ui-faq/).**
88

9-
**👉🏼 Want to score an easy open-source contribution?** Check out our [Good first contribution](https://github.com/swagger-api/swagger-ui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+first+contribution%22) label.
9+
**👉🏼 Want to score an easy open-source contribution?** Check out our [Good first issue](https://github.com/swagger-api/swagger-ui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+first+issue%22) label.
1010

1111
As a brand new version, written from the ground up, there are some known issues and unimplemented features. Check out the [Known Issues](#known-issues) section for more details.
1212

@@ -22,7 +22,7 @@ The OpenAPI Specification has undergone 5 revisions since initial creation in 20
2222

2323
Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
2424
------------------ | ------------ | -------------------------- | -----
25-
3.3.1 | 2017-10-02 | 2.0, 3.0 | [tag v3.3.1](https://github.com/swagger-api/swagger-ui/tree/v3.3.1)
25+
3.3.2 | 2017-10-13 | 2.0, 3.0 | [tag v3.3.2](https://github.com/swagger-api/swagger-ui/tree/v3.3.2)
2626
3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21)
2727
2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10)
2828
2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5)

‎dev-helpers/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<meta charset="UTF-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
67
<title>Swagger UI</title>
78
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
89
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" >

‎dist/swagger-ui-bundle.js‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/swagger-ui-bundle.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/swagger-ui.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/swagger-ui.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/swagger-ui.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎make-webpack-config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ module.exports = function(rules, options) {
137137
}
138138
},
139139

140-
devtool: specialOptions.sourcemaps ? "cheap-module-source-map" : null,
140+
devtool: specialOptions.sourcemaps ? "nosource-source-map" : null,
141141

142142
plugins,
143143

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "swagger-ui",
3-
"version": "3.3.1",
3+
"version": "3.3.2",
44
"main": "dist/swagger-ui.js",
55
"repository": "[email protected]:swagger-api/swagger-ui.git",
66
"contributors": [
@@ -32,7 +32,7 @@
3232
"test": "npm run lint-errors && npm run just-test-in-node",
3333
"test-in-node": "npm run lint-errors && npm run just-test-in-node",
3434
"just-test": "karma start --config karma.conf.js",
35-
"just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core test/components test/bugs test/swagger-ui-dist-package",
35+
"just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core test/components test/bugs test/swagger-ui-dist-package test/xss",
3636
"test-e2e": "sleep 3 && nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json",
3737
"e2e-initial-render": "nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json --group initial-render",
3838
"mock-api": "json-server --watch test/e2e/db.json --port 3204",
@@ -78,7 +78,7 @@
7878
"scroll-to-element": "^2.0.0",
7979
"serialize-error": "2.0.0",
8080
"shallowequal": "0.2.2",
81-
"swagger-client": "^3.2.0",
81+
"swagger-client": "^3.2.2",
8282
"url-parse": "^1.1.8",
8383
"whatwg-fetch": "0.11.1",
8484
"worker-loader": "^0.7.1",

‎src/core/components/parameter-row.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export default class ParameterRow extends Component {
115115
required={ required }
116116
description={param.get("description") ? `${param.get("name")} - ${param.get("description")}` : `${param.get("name")}`}
117117
onChange={ this.onChangeWrapper }
118-
schema={ param }/>
118+
schema={ isOAS3 && isOAS3() ? param.get("schema") : param }/>
119119
}
120120

121121

0 commit comments

Comments
 (0)