Merge branch 'JSONEditor' into JSONEditorMaster

Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js src/main/less/screen.less
2015-09-10 10:53:15 +02:00
parent 736e7cd90e 3128da0446
commit ea2cefa46e
49 changed files with 2904 additions and 2546 deletions
--- a/dist/index.html
+++ b/dist/index.html
@@ -1,3 +1,4 @@
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -19,6 +20,7 @@
  <script src='lib/backbone-min.js' type='text/javascript'></script>
  <script src='swagger-ui.js' type='text/javascript'></script>
  <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
+  <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
  <script src='lib/marked.js' type='text/javascript'></script>
  <script src='lib/swagger-oauth.js' type='text/javascript'></script>

@@ -69,6 +71,7 @@
          log("Unable to Load SwaggerUI");
        },
        docExpansion: "none",
+        jsonEditor:true,
        apisSorter: "alpha",
        showRequestHeaders: false
      });