Skip to content

Commit d953b77

Browse files
author
Ron
authored
Merge branch 'master' into master
2 parents 4da430c + 9a442b1 commit d953b77

22 files changed

+225
-246
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)

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: 2 additions & 2 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": [
@@ -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/providers/markdown.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export default Markdown
3131
const sanitizeOptions = {
3232
allowedTags: sanitize.defaults.allowedTags.concat([ "h1", "h2", "img" ]),
3333
allowedAttributes: {
34+
...sanitize.defaults.allowedAttributes,
3435
"img": sanitize.defaults.allowedAttributes.img.concat(["title"])
3536
},
3637
textFilter: function(text) {

src/core/plugins/auth/selectors.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const shownDefinitions = createSelector(
1010

1111
export const definitionsToAuthorize = createSelector(
1212
state,
13-
() =>( { specSelectors } ) => {
13+
() => ( { specSelectors } ) => {
1414
let definitions = specSelectors.securityDefinitions()
1515
let list = List()
1616

@@ -27,7 +27,7 @@ export const definitionsToAuthorize = createSelector(
2727
)
2828

2929

30-
export const getDefinitionsByNames = ( state, securities ) =>( { specSelectors } ) => {
30+
export const getDefinitionsByNames = ( state, securities ) => ( { specSelectors } ) => {
3131
let securityDefinitions = specSelectors.securityDefinitions()
3232
let result = List()
3333

@@ -64,7 +64,7 @@ export const authorized = createSelector(
6464
)
6565

6666

67-
export const isAuthorized = ( state, securities ) =>( { authSelectors } ) => {
67+
export const isAuthorized = ( state, securities ) => ( { authSelectors } ) => {
6868
let authorized = authSelectors.authorized()
6969

7070
if(!List.isList(securities)) {

0 commit comments

Comments
 (0)