updated build

Merge pull request #1607 from safinalexey/master
fix for angular apps, when you dont have proper route and clicking on…
2015-09-19 11:58:10 -07:00 · 2015-09-19 11:51:19 -07:00 · 2015-09-19 11:49:06 -07:00 · 2015-09-19 11:48:58 -07:00 · 2015-09-19 11:48:36 -07:00 · 2015-09-19 11:36:40 -07:00
16 changed files with 781 additions and 455 deletions
@@ -807,6 +807,9 @@
  outline: 2px solid black;
  outline-color: #cc0000;
 }
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
+  max-width: 300px;
+}
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
  padding: 10px;
@@ -807,6 +807,9 @@
  outline: 2px solid black;
  outline-color: #cc0000;
 }
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
+  max-width: 300px;
+}
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
  padding: 10px;
@@ -0,0 +1,53 @@
+'use strict';
+
+/* jshint quotmark: double */
+window.SwaggerTranslator.learn({
+    "Warning: Deprecated":"Uyarı: Deprecated",
+    "Implementation Notes":"Gerçekleştirim Notları",
+    "Response Class":"Dönen Sınıf",
+    "Status":"Statü",
+    "Parameters":"Parametreler",
+    "Parameter":"Parametre",
+    "Value":"Değer",
+    "Description":"Açıklama",
+    "Parameter Type":"Parametre Tipi",
+    "Data Type":"Veri Tipi",
+    "Response Messages":"Dönüş Mesajı",
+    "HTTP Status Code":"HTTP Statü Kodu",
+    "Reason":"Gerekçe",
+    "Response Model":"Dönüş Modeli",
+    "Request URL":"İstek URL",
+    "Response Body":"Dönüş İçeriği",
+    "Response Code":"Dönüş Kodu",
+    "Response Headers":"Dönüş Üst Bilgileri",
+    "Hide Response":"Dönüşü Gizle",
+    "Headers":"Üst Bilgiler",
+    "Try it out!":"Dene!",
+    "Show/Hide":"Göster/Gizle",
+    "List Operations":"Operasyonları Listele",
+    "Expand Operations":"Operasyonları Aç",
+    "Raw":"Ham",
+    "can't parse JSON.  Raw result":"JSON çözümlenemiyor.  Ham sonuç",
+    "Model Schema":"Model Şema",
+    "Model":"Model",
+    "apply":"uygula",
+    "Username":"Kullanıcı Adı",
+    "Password":"Parola",
+    "Terms of service":"Servis şartları",
+    "Created by":"Oluşturan",
+    "See more at":"Daha fazlası için",
+    "Contact the developer":"Geliştirici ile İletişime Geçin",
+    "api version":"api versiyon",
+    "Response Content Type":"Dönüş İçerik Tipi",
+    "fetching resource":"kaynak getiriliyor",
+    "fetching resource list":"kaynak listesi getiriliyor",
+    "Explore":"Keşfet",
+    "Show Swagger Petstore Example Apis":"Swagger Petstore Örnek Api'yi Gör",
+    "Can't read from server.  It may not have the appropriate access-control-origin settings.":"Sunucudan okuma yapılamıyor. Sunucu access-control-origin ayarlarınızı kontrol edin.",
+    "Please specify the protocol for":"Lütfen istenen adres için protokol belirtiniz",
+    "Can't read swagger JSON from":"Swagger JSON bu kaynaktan okunamıyor",
+    "Finished Loading Resource Information. Rendering Swagger UI":"Kaynak baglantısı tamamlandı. Swagger UI gösterime hazırlanıyor",
+    "Unable to read api":"api okunamadı",
+    "from path":"yoldan",
+    "server returned":"sunucuya dönüldü"
+});
@@ -0,0 +1,53 @@
+'use strict';
+
+/* jshint quotmark: double */
+window.SwaggerTranslator.learn({
+    "Warning: Deprecated":"警告：已过时",
+    "Implementation Notes":"实现备注",
+    "Response Class":"响应类",
+    "Status":"状态",
+    "Parameters":"参数",
+    "Parameter":"参数",
+    "Value":"值",
+    "Description":"描述",
+    "Parameter Type":"参数类型",
+    "Data Type":"数据类型",
+    "Response Messages":"响应消息",
+    "HTTP Status Code":"HTTP状态码",
+    "Reason":"原因",
+    "Response Model":"响应模型",
+    "Request URL":"请求URL",
+    "Response Body":"响应体",
+    "Response Code":"响应码",
+    "Response Headers":"响应头",
+    "Hide Response":"隐藏响应",
+    "Headers":"头",
+    "Try it out!":"试一下！",
+    "Show/Hide":"显示/隐藏",
+    "List Operations":"显示操作",
+    "Expand Operations":"展开操作",
+    "Raw":"原始",
+    "can't parse JSON.  Raw result":"无法解析JSON. 原始结果",
+    "Model Schema":"模型架构",
+    "Model":"模型",
+    "apply":"应用",
+    "Username":"用户名",
+    "Password":"密码",
+    "Terms of service":"服务条款",
+    "Created by":"创建者",
+    "See more at":"查看更多：",
+    "Contact the developer":"联系开发者",
+    "api version":"api版本",
+    "Response Content Type":"响应Content Type",
+    "fetching resource":"正在获取资源",
+    "fetching resource list":"正在获取资源列表",
+    "Explore":"浏览",
+    "Show Swagger Petstore Example Apis":"显示 Swagger Petstore 示例 Apis",
+    "Can't read from server.  It may not have the appropriate access-control-origin settings.":"无法从服务器读取。可能没有正确设置access-control-origin。",
+    "Please specify the protocol for":"请指定协议：",
+    "Can't read swagger JSON from":"无法读取swagger JSON于",
+    "Finished Loading Resource Information. Rendering Swagger UI":"已加载资源信息。正在渲染Swagger UI",
+    "Unable to read api":"无法读取api",
+    "from path":"从路径",
+    "server returned":"服务器返回"
+});
@@ -0,0 +1,53 @@
+'use strict';
+
+/* jshint quotmark: double */
+window.SwaggerTranslator.learn({
+    "Warning: Deprecated":"Uyarı: Deprecated",
+    "Implementation Notes":"Gerçekleştirim Notları",
+    "Response Class":"Dönen Sınıf",
+    "Status":"Statü",
+    "Parameters":"Parametreler",
+    "Parameter":"Parametre",
+    "Value":"Değer",
+    "Description":"Açıklama",
+    "Parameter Type":"Parametre Tipi",
+    "Data Type":"Veri Tipi",
+    "Response Messages":"Dönüş Mesajı",
+    "HTTP Status Code":"HTTP Statü Kodu",
+    "Reason":"Gerekçe",
+    "Response Model":"Dönüş Modeli",
+    "Request URL":"İstek URL",
+    "Response Body":"Dönüş İçeriği",
+    "Response Code":"Dönüş Kodu",
+    "Response Headers":"Dönüş Üst Bilgileri",
+    "Hide Response":"Dönüşü Gizle",
+    "Headers":"Üst Bilgiler",
+    "Try it out!":"Dene!",
+    "Show/Hide":"Göster/Gizle",
+    "List Operations":"Operasyonları Listele",
+    "Expand Operations":"Operasyonları Aç",
+    "Raw":"Ham",
+    "can't parse JSON.  Raw result":"JSON çözümlenemiyor.  Ham sonuç",
+    "Model Schema":"Model Şema",
+    "Model":"Model",
+    "apply":"uygula",
+    "Username":"Kullanıcı Adı",
+    "Password":"Parola",
+    "Terms of service":"Servis şartları",
+    "Created by":"Oluşturan",
+    "See more at":"Daha fazlası için",
+    "Contact the developer":"Geliştirici ile İletişime Geçin",
+    "api version":"api versiyon",
+    "Response Content Type":"Dönüş İçerik Tipi",
+    "fetching resource":"kaynak getiriliyor",
+    "fetching resource list":"kaynak listesi getiriliyor",
+    "Explore":"Keşfet",
+    "Show Swagger Petstore Example Apis":"Swagger Petstore Örnek Api'yi Gör",
+    "Can't read from server.  It may not have the appropriate access-control-origin settings.":"Sunucudan okuma yapılamıyor. Sunucu access-control-origin ayarlarınızı kontrol edin.",
+    "Please specify the protocol for":"Lütfen istenen adres için protokol belirtiniz",
+    "Can't read swagger JSON from":"Swagger JSON bu kaynaktan okunamıyor",
+    "Finished Loading Resource Information. Rendering Swagger UI":"Kaynak baglantısı tamamlandı. Swagger UI gösterime hazırlanıyor",
+    "Unable to read api":"api okunamadı",
+    "from path":"yoldan",
+    "server returned":"sunucuya dönüldü"
+});
@@ -0,0 +1,53 @@
+'use strict';
+
+/* jshint quotmark: double */
+window.SwaggerTranslator.learn({
+    "Warning: Deprecated":"警告：已过时",
+    "Implementation Notes":"实现备注",
+    "Response Class":"响应类",
+    "Status":"状态",
+    "Parameters":"参数",
+    "Parameter":"参数",
+    "Value":"值",
+    "Description":"描述",
+    "Parameter Type":"参数类型",
+    "Data Type":"数据类型",
+    "Response Messages":"响应消息",
+    "HTTP Status Code":"HTTP状态码",
+    "Reason":"原因",
+    "Response Model":"响应模型",
+    "Request URL":"请求URL",
+    "Response Body":"响应体",
+    "Response Code":"响应码",
+    "Response Headers":"响应头",
+    "Hide Response":"隐藏响应",
+    "Headers":"头",
+    "Try it out!":"试一下！",
+    "Show/Hide":"显示/隐藏",
+    "List Operations":"显示操作",
+    "Expand Operations":"展开操作",
+    "Raw":"原始",
+    "can't parse JSON.  Raw result":"无法解析JSON. 原始结果",
+    "Model Schema":"模型架构",
+    "Model":"模型",
+    "apply":"应用",
+    "Username":"用户名",
+    "Password":"密码",
+    "Terms of service":"服务条款",
+    "Created by":"创建者",
+    "See more at":"查看更多：",
+    "Contact the developer":"联系开发者",
+    "api version":"api版本",
+    "Response Content Type":"响应Content Type",
+    "fetching resource":"正在获取资源",
+    "fetching resource list":"正在获取资源列表",
+    "Explore":"浏览",
+    "Show Swagger Petstore Example Apis":"显示 Swagger Petstore 示例 Apis",
+    "Can't read from server.  It may not have the appropriate access-control-origin settings.":"无法从服务器读取。可能没有正确设置access-control-origin。",
+    "Please specify the protocol for":"请指定协议：",
+    "Can't read swagger JSON from":"无法读取swagger JSON于",
+    "Finished Loading Resource Information. Rendering Swagger UI":"已加载资源信息。正在渲染Swagger UI",
+    "Unable to read api":"无法读取api",
+    "from path":"从路径",
+    "server returned":"服务器返回"
+});
@@ -8,7 +8,7 @@
    }
  ],
  "description": "Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API",
-  "version": "2.1.2",
+  "version": "2.1.3",
  "homepage": "http://swagger.io",
  "license": "Apache-2.0",
  "main": "dist/swagger-ui.js",
@@ -50,6 +50,6 @@
    "less": "^2.4.0",
    "mocha": "^2.1.0",
    "selenium-webdriver": "^2.45.0",
-    "swagger-client": "2.1.3"
+    "swagger-client": "2.1.5"
  }
 }
@@ -807,6 +807,9 @@
  outline: 2px solid black;
  outline-color: #cc0000;
 }
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
+  max-width: 300px;
+}
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
  padding: 10px;
@@ -807,6 +807,9 @@
  outline: 2px solid black;
  outline-color: #cc0000;
 }
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
+  max-width: 300px;
+}
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
  padding: 10px;
@@ -674,6 +674,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
      $.bbq.pushState('#/', 2);
      Docs.collapseOperation(elem);
    } else {
+      event.preventDefault();
      Docs.expandOperation(elem);
    }
  },
@@ -744,6 +744,9 @@
                                        outline: 2px solid black;
                                        outline-color: #cc0000;
                                    }
+                                    select[name='parameterContentType'] {
+                                        max-width:300px;
+                                    }
                                }
                                div.response {
                                    div.block {
@@ -1104,4 +1107,4 @@
    }
 }

-}
+}
@@ -28,8 +28,12 @@ module.exports.start = function (specsLocation, done) {

  setTimeout(function(){
    driver.get(url);
-    done();
+    setTimeout(function() {
+      done();
+    }, 2000);
+    console.log('waiting for UI to load');
  }, process.env.TRAVIS ? 20000 : 5000);
+  console.log('waiting for server to start');
 };

 module.exports.close = function() {
@@ -96,7 +96,8 @@ describe('swagger 1.x spec tests', function () {
    });
  });

-  after(function(){
+  after(function(done){
    servers.close();
+    done();
  });
 });
@@ -17,10 +17,10 @@ var elements = [
 ];

 describe('swagger 2.0 spec tests', function () {
-  this.timeout(10 * 1000);
+  this.timeout(40 * 1000);

  before(function (done) {
-    this.timeout(25 * 1000);
+    this.timeout(50 * 1000);
    servers.start('/v2/petstore.json', done);
  });

@@ -110,7 +110,8 @@ describe('swagger 2.0 spec tests', function () {
    });
  });

-  after(function() {
+  after(function(done) {
    servers.close();
+    done();
  });
 });
Author	SHA1	Message	Date
Tony Tam	8bc259558b	updated build	2015-09-19 11:58:10 -07:00
Tony Tam	9bf8129058	Merge pull request #1607 from safinalexey/master fix for angular apps, when you dont have proper route and clicking on…	2015-09-19 11:51:19 -07:00
Tony Tam	49afcc8b02	Merge branch 'ezburg-master'	2015-09-19 11:49:06 -07:00
Tony Tam	bee68dd7c5	Merge branch 'master' of https://github.com/ezburg/swagger-ui into ezburg-master	2015-09-19 11:48:58 -07:00
Tony Tam	1c6073ce2e	Merge pull request #1612 from swagger-api/client-update updated client version, rebuilt	2015-09-19 11:48:36 -07:00
Tony Tam	20b0dde184	updated timeouts	2015-09-19 11:36:40 -07:00
Tony Tam	f6f8e74586	Update v1.js	2015-09-19 10:39:16 -07:00
Tony Tam	4efefb156a	Update v2.js	2015-09-19 10:39:01 -07:00
Tony Tam	058f959669	extended timeouts	2015-09-19 09:51:23 -07:00
Tony Tam	22654e2180	unset sudo	2015-09-19 09:43:03 -07:00
Tony Tam	8930cbb6dc	updated client version, rebuilt	2015-09-19 09:08:58 -07:00
Hans Zhang	d14f153014	Create zh-cn.js	2015-09-19 17:03:10 +02:00
Hans Zhang	e60b195c46	Create zh-cn.js	2015-09-19 17:02:23 +02:00
Tony Tam	66b574c220	Merge pull request #1599 from toke/master Prevent screwed up layout on long Content-Types	2015-09-17 06:25:47 -07:00
Tony Tam	5f387dd2a5	Merge pull request #1604 from swagger-api/client-update updated client	2015-09-16 10:45:52 -07:00
safin	16cfce4c20	fix for angular apps, when you dont have proper route and clicking on header leads to 'othewise' branch of router	2015-09-16 18:48:53 +03:00
Tony Tam	1f74d9fac4	updated client	2015-09-15 23:38:46 -07:00
Thomas Kerpe	40c732c087	Prevent screwed up layout on long Content-Types Some Content-Types (especially Vendor specific Content-Types) can be rather long. This breaks the layout so prevent rendering too wide select boxes by default.	2015-09-15 17:00:42 +02:00
Thomas Kerpe	4e6669d63f	Merge branch 'master' of github.com:toke/swagger-ui	2015-09-15 16:22:11 +02:00
Thomas Kerpe	84337d5a0b	Prevent screwed up layout on long Content-Types Some Content-Types (especially Vendor specific Content-Types) can be rather long. This breaks the layout so prevent rendering too wide select boxes by default.	2015-09-15 16:19:18 +02:00
Tony Tam	736e7cd90e	Merge pull request #1560 from gorfik/1350 fix for issue 1350	2015-08-25 12:40:19 -07:00
Mariusz Lewicki	529705afce	fix for issue 1350	2015-08-25 21:25:32 +02:00
Tony Tam	93b7da1fa0	Merge pull request #1559 from muzir/patch-1 Create tr.js	2015-08-25 12:20:57 -07:00
erhun	e557210f1e	Create tr.js I added turkish language support for swagger index.html. I use this file in my project too. https://github.com/muzir/azorka.web/blob/master/src/main/webapp/resources/dist/lang/tr.js	2015-08-25 22:17:24 +03:00