Skip to content

Commit 6041c41

Browse files
authored
Merge branch 'master' into uri-encoded-scopes-fix
2 parents a5193a5 + 859edbf commit 6041c41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1081
-429
lines changed

.github/issue_template.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<!---
22
Thanks for filing an issue 😄 ! Before you submit, please read the following:
33
4+
If you're here to report a security issue, please STOP writing an issue and contact us
5+
at [email protected] instead!
6+
47
Search open/closed issues before submitting since someone might have asked the same thing before!
58
69
Issues on GitHub are only related to problems of Swagger-UI itself. We'll try to offer support

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ node_modules
22
.idea
33
.deps_check
44
.DS_Store
5+
.nyc_output
56
npm-debug.log*
67
.eslintcache
78
package-lock.json

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
language: node_js
22
node_js:
33
- '6.9'
4+
cache:
5+
directories:
6+
- node_modules
47
services:
58
- docker
69
branches:
710
only:
811
- master
912
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
13+
install: "npm i && npm update"
1014
before_deploy:
1115
- npm run build
1216
env:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ We love contributions from our community of users! This document explains our gu
44

55
#### Environment setup
66

7-
0. Install Node.js (4 or newer) and npm (3 or newer).
7+
0. Install Node.js (6 or newer) and npm (3 or newer).
88
1. Make a fork of Swagger-UI on GitHub, then clone your fork to your machine.
99
2. Run `npm install` in your Swagger-UI directory.
1010
3. Run `npm run dev`. `localhost:3200` should open automatically.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.4.1 | 2017-10-20 | 2.0, 3.0 | [tag v3.4.1](https://github.com/swagger-api/swagger-ui/tree/v3.4.1)
25+
3.4.4 | 2017-11-03 | 2.0, 3.0 | [tag v3.4.4](https://github.com/swagger-api/swagger-ui/tree/v3.4.4)
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: 65 additions & 33 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-standalone-preset.js

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

dist/swagger-ui-standalone-preset.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.

0 commit comments

Comments
 (0)