Skip to content

Merged from develop_2.0 #1285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 14, 2015
Merged

Merged from develop_2.0 #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9923b3c
Use the correct new sorting parameter name
May 13, 2015
693b4d9
Merge pull request #1280 from nprdm/develop_2.0
fehguy May 13, 2015
41eb523
Fixes #1268
May 13, 2015
688244f
Merge pull request #1281 from nprdm/develop_2.0
fehguy May 13, 2015
c2dee78
Fixes #1233
May 13, 2015
831a7ae
Just realized this adds some extra horizontal padding which may not b…
May 13, 2015
eb70c73
Merge pull request #1282 from nprdm/develop_2.0
fehguy May 13, 2015
d5c79f8
added authorizations
fehguy May 14, 2015
b5039b2
rebuilt
fehguy May 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "swagger-ui",
"main": "dist/index.html",
"version": "2.1.4-M2",
"version": "2.1.5-M2",
"authors": [
"Mohsen Azimi <me@azimi.me>"
],
Expand Down
3 changes: 3 additions & 0 deletions dist/css/print.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,9 @@
.swagger-section .swagger-ui-wrap form.form_box p strong {
color: black;
}
.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
padding-bottom: 0;
}
.swagger-section .title {
font-style: bold;
}
Expand Down
3 changes: 3 additions & 0 deletions dist/css/screen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,9 @@
.swagger-section .swagger-ui-wrap form.form_box p strong {
color: black;
}
.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
padding-bottom: 0;
}
.swagger-section .title {
font-style: bold;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
log("Unable to Load SwaggerUI");
},
docExpansion: "none",
sorter : "alpha"
apisSorter: "alpha"
});

function addApiKeyAuthorization(){
Expand Down
Loading