Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js src/main/javascript/view/OperationView.js src/main/less/screen.less
2015-12-16 10:25:38 +01:00
parent e051023288 63f6edeef0
commit 2c431d7873
32 changed files with 436 additions and 367 deletions
--- a/dist/index.html
+++ b/dist/index.html
@@ -53,7 +53,8 @@
              clientSecret: "your-client-secret-if-required",
              realm: "your-realms",
              appName: "your-app-name", 
-              scopeSeparator: ","
+              scopeSeparator: ",",
+              additionalQueryStringParams: {}
            });
          }

@@ -73,6 +74,7 @@
        docExpansion: "none",
        jsonEditor:true,
        apisSorter: "alpha",
+        defaultModelRendering: 'schema',
        showRequestHeaders: false
      });