From 0bc382b78a83ce9b145a72e02f26a3741d6d4848 Mon Sep 17 00:00:00 2001
From: TANAKA Koichi <mugeso@mugeso.com>
Date: Tue, 18 Jul 2017 16:52:29 +0900
Subject: [PATCH 1/6] Fix oauth2 password flow

fix filed name for scope of grant request body.
---
 src/core/plugins/auth/actions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/plugins/auth/actions.js b/src/core/plugins/auth/actions.js
index 221d80a8..772e858c 100644
--- a/src/core/plugins/auth/actions.js
+++ b/src/core/plugins/auth/actions.js
@@ -73,7 +73,7 @@ export const authorizePassword = ( auth ) => ( { authActions } ) => {
   let { schema, name, username, password, passwordType, clientId, clientSecret } = auth
   let form = {
     grant_type: "password",
-    scopes: encodeURIComponent(auth.scopes.join(scopeSeparator))
+    scope: encodeURIComponent(auth.scopes.join(scopeSeparator))
   }
   let query = {}
   let headers = {}

From 1e5304790ede020e31fcedfdf34f165c715cf91a Mon Sep 17 00:00:00 2001
From: shockey <shockey@users.noreply.github.com>
Date: Thu, 20 Jul 2017 17:20:01 -0700
Subject: [PATCH 2/6] Enable deep linking in dist/index.html

---
 dist/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist/index.html b/dist/index.html
index f6aaf9e4..52590951 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -76,6 +76,7 @@ window.onload = function() {
   const ui = SwaggerUIBundle({
     url: "http://petstore.swagger.io/v2/swagger.json",
     dom_id: '#swagger-ui',
+    deepLinking: true,
     presets: [
       SwaggerUIBundle.presets.apis,
       SwaggerUIStandalonePreset

From c82f85f1234cf6fd0c08a161c056e865c9780e1c Mon Sep 17 00:00:00 2001
From: shockey <shockey@users.noreply.github.com>
Date: Fri, 21 Jul 2017 16:01:52 -0700
Subject: [PATCH 3/6] Update topbar.jsx

---
 src/plugins/topbar/topbar.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/topbar/topbar.jsx b/src/plugins/topbar/topbar.jsx
index fd3654bb..ec9db730 100644
--- a/src/plugins/topbar/topbar.jsx
+++ b/src/plugins/topbar/topbar.jsx
@@ -130,7 +130,7 @@ export default class Topbar extends React.Component {
         <div className="wrapper">
           <div className="topbar-wrapper">
             <Link href="#" title="Swagger UX">
-              <img height="30" width="30" src={ Logo } alt="Swagger UX"/>
+              <img height="30" width="30" src={ Logo } alt="Swagger UI"/>
               <span>swagger</span>
             </Link>
             <form className="download-url-wrapper" onSubmit={formOnSubmit}>

From 0010bf20a62f37d8284211471d37c3936df10606 Mon Sep 17 00:00:00 2001
From: shockey <shockey@users.noreply.github.com>
Date: Fri, 21 Jul 2017 16:04:58 -0700
Subject: [PATCH 4/6] Update add-plugin.md

---
 src/plugins/add-plugin.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/add-plugin.md b/src/plugins/add-plugin.md
index 7a77cb30..2e2d52e1 100644
--- a/src/plugins/add-plugin.md
+++ b/src/plugins/add-plugin.md
@@ -20,7 +20,7 @@ SwaggerUI({
 })
 ```
 
-Or if you're updating the core plugins.. you'll add it to [src/js/bootstrap-plugin](https://github.com/SmartBear/swagger-ux/blob/master/src/js/bootstrap-plugin.js)
+Or if you're updating the core plugins.. you'll add it to the base preset: [src/core/presets/base.js](https://github.com/swagger-api/swagger-ui/blob/master/src/core/presets/base.js)
 
 Each Plugin is a function that returns an object. That object will get merged with the `system` and later bound to the state.
 Here is an example of each `type`

From eb1f3b1fa613d68e18c965d1cb48d6f886d01f39 Mon Sep 17 00:00:00 2001
From: Owen Conti <owen@ohseemedia.com>
Date: Fri, 21 Jul 2017 17:23:28 -0600
Subject: [PATCH 5/6] Fixes #3422 - Fixed regression bug on models.jsx
 expand/collapse arrows due to bad merge

---
 src/core/components/models.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/components/models.jsx b/src/core/components/models.jsx
index c61ae0c9..86c3256d 100644
--- a/src/core/components/models.jsx
+++ b/src/core/components/models.jsx
@@ -24,8 +24,8 @@ export default class Models extends Component {
     return <section className={ showModels ? "models is-open" : "models"}>
       <h4 onClick={() => layoutActions.show("models", !showModels)}>
         <span>Models</span>
-        <svg width="20" height="20">
-          <use xlinkHref="#large-arrow" />
+        <svg className="arrow" width="20" height="20">
+          <use xlinkHref={showModels ? "#large-arrow-down" : "#large-arrow"} />
         </svg>
       </h4>
       <Collapse isOpened={showModels}>

From b9bb4c124ec76bc3e565344c8abb5ce26432e9f6 Mon Sep 17 00:00:00 2001
From: Owen Conti <owen@ohseemedia.com>
Date: Fri, 21 Jul 2017 18:46:50 -0600
Subject: [PATCH 6/6] Fixes #3434 - Change link style color for
 .response-col_description__inner links

---
 src/style/_layout.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/style/_layout.scss b/src/style/_layout.scss
index 90b9a088..43000ec6 100644
--- a/src/style/_layout.scss
+++ b/src/style/_layout.scss
@@ -508,6 +508,15 @@ body
         {
             margin: 0;
         }
+
+        a
+        {
+            @include text_code(#89bf04);
+            text-decoration: underline;
+            &:hover {
+                color: #81b10c;
+            }
+        }
     }
 }