Compare commits

...
21 Commits
Author SHA1 Message Date
Tony Tam 552865aa0d updated release 2016-10-14 09:54:55 -07:00
Tony Tam 73e2cd2179 updated translate 2016-10-14 09:52:14 -07:00
Tony Tam d1539a7c4f Merge pull request #2449 from anjia0532/master
Update zh_cn.js add 3 translate
2016-10-14 09:51:36 -07:00
Tony Tam 81bf447ef4 Merge pull request #2451 from swagger-api/issue-2439
added type check
2016-10-13 15:49:53 -07:00
Tony Tam 2ad57cab6b added type check 2016-10-13 15:44:06 -07:00
Tony Tam e506c5bdb8 updated swagger-client version 2016-10-12 23:05:14 -07:00
anjia0532 6a27140165 Update zh_cn.js add 3 translate
fetching resource list,Click to set as parameter value,Example Value
2016-10-12 09:43:51 +08:00
Tony Tam 2e3304c16f Merge pull request #2437 from hnakamur/update_japanese_messages
Update Japanese messages
2016-10-03 09:52:58 -07:00
Hiroaki Nakamura 66f3c369fa Update Japanese messages 2016-10-04 01:27:30 +09:00
Tony Tam 855b6c3170 merged 2016-09-29 16:32:45 -07:00
Tony Tam e098b3a522 Merge branch 'master' of github.com:swagger-api/swagger-ui 2016-09-29 16:32:25 -07:00
Tony Tam 7878cea369 updated swagger-js version 2016-09-29 16:32:18 -07:00
Tony Tam 08b283cb0c Merge pull request #2429 from chuck-g/patch-1
Fix font src attribute
2016-09-29 15:46:47 -07:00
Chuck Goss 87ef5c1f72 Fix font src attribute
The `format('truetype')` bit should not be preceded by a comma. It breaks in Chrome (at least).

See https://css-tricks.com/snippets/css/using-font-face/ for an example.
2016-09-28 15:21:46 -05:00
Tony Tam 36af368a8c Update README.md 2016-09-26 18:59:34 -07:00
Tony Tam e9ab52f7b5 Merge pull request #2426 from swagger-api/release-prepare
update swagger-js version
2016-09-26 12:25:42 -07:00
Tony Tam f5a0db2078 merged with master 2016-09-26 12:17:13 -07:00
Tony Tam b4acbbb57e rebuilt, updated versions 2016-09-26 12:15:15 -07:00
Tony Tam f92d6ddd55 Merge pull request #2416 from MugeSo/fix-build-on-windows
Fix handlerbars script in package.json
2016-09-26 12:14:52 -07:00
Tony Tam 7d37b75c32 updated swagger-client version 2016-09-26 12:14:21 -07:00
TANAKA Koichi 2cbe939412 Fix handlerbars script in package.json
npm "run scripts" resolves executable file path with PATH includes ./node_modules/.bin
fixes #2411
2016-09-21 18:09:15 +09:00
12 changed files with 311 additions and 223 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ The OpenAPI Specification has undergone 4 revisions since initial creation in 20
Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes | Status
------------------ | ------------ | -------------------------- | ----- | ------
2.2.4 | 2016-09-20 | 1.1, 1.2, 2.0 | [tag v.2.2.4](https://github.com/swagger-api/swagger-ui/tree/v2.2.4) |
2.2.6 | 2016-10-14 | 1.1, 1.2, 2.0 | [tag v.2.2.6](https://github.com/swagger-api/swagger-ui/tree/v2.2.6) |
2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v.2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5) |
2.0.24 | 2014-09-12 | 1.1, 1.2 | [tag v2.0.24](https://github.com/swagger-api/swagger-ui/tree/v2.0.24) |
1.0.13 | 2013-03-08 | 1.1, 1.2 | [tag v1.0.13](https://github.com/swagger-api/swagger-ui/tree/v1.0.13) |
+1 -6
View File
@@ -20,10 +20,5 @@
"name": "Mohsen Azimi",
"email": "me@azimi.me"
}
],
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
}
]
}
+2 -2
View File
@@ -3,12 +3,12 @@
font-family: 'Droid Sans';
font-style: normal;
font-weight: 400;
src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf'), format('truetype');
src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf') format('truetype');
}
/* Google Font's Droid Sans Bold */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 700;
src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf'), format('truetype');
src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf') format('truetype');
}
+6 -3
View File
@@ -26,22 +26,25 @@ window.SwaggerTranslator.learn({
"Show/Hide":"表示/非表示",
"List Operations":"操作一覧",
"Expand Operations":"操作の展開",
"Raw":"Raw",
"Raw":"未加工",
"can't parse JSON. Raw result":"JSONへ解釈できません. 未加工の結果",
"Example Value":"値の例",
"Model Schema":"モデルスキーマ",
"Model":"モデル",
"Click to set as parameter value":"パラメータ値と設定するにはクリック",
"apply":"実行",
"Username":"ユーザ名",
"Password":"パスワード",
"Terms of service":"サービス利用規約",
"Created by":"Created by",
"See more at":"See more at",
"See more at":"詳細を見る",
"Contact the developer":"開発者に連絡",
"api version":"APIバージョン",
"Response Content Type":"レスポンス コンテンツタイプ",
"Parameter content type:":"パラメータコンテンツタイプ:",
"fetching resource":"リソースの取得",
"fetching resource list":"リソース一覧の取得",
"Explore":"Explore",
"Explore":"調査",
"Show Swagger Petstore Example Apis":"SwaggerペットストアAPIの表示",
"Can't read from server. It may not have the appropriate access-control-origin settings.":"サーバから読み込めません. 適切なaccess-control-origin設定を持っていない可能性があります.",
"Please specify the protocol for":"プロトコルを指定してください",
+3
View File
@@ -28,6 +28,8 @@ window.SwaggerTranslator.learn({
"Expand Operations":"展开操作",
"Raw":"原始",
"can't parse JSON. Raw result":"无法解析JSON. 原始结果",
"Example Value":"示例",
"Click to set as parameter value":"点击设置参数",
"Model Schema":"模型架构",
"Model":"模型",
"apply":"应用",
@@ -39,6 +41,7 @@ window.SwaggerTranslator.learn({
"Contact the developer":"联系开发者",
"api version":"api版本",
"Response Content Type":"响应Content Type",
"Parameter content type:":"参数类型:",
"fetching resource":"正在获取资源",
"fetching resource list":"正在获取资源列表",
"Explore":"浏览",
+261 -187
View File
File diff suppressed because one or more lines are too long
+13 -13
View File
File diff suppressed because one or more lines are too long
+6 -3
View File
@@ -26,22 +26,25 @@ window.SwaggerTranslator.learn({
"Show/Hide":"表示/非表示",
"List Operations":"操作一覧",
"Expand Operations":"操作の展開",
"Raw":"Raw",
"Raw":"未加工",
"can't parse JSON. Raw result":"JSONへ解釈できません. 未加工の結果",
"Example Value":"値の例",
"Model Schema":"モデルスキーマ",
"Model":"モデル",
"Click to set as parameter value":"パラメータ値と設定するにはクリック",
"apply":"実行",
"Username":"ユーザ名",
"Password":"パスワード",
"Terms of service":"サービス利用規約",
"Created by":"Created by",
"See more at":"See more at",
"See more at":"詳細を見る",
"Contact the developer":"開発者に連絡",
"api version":"APIバージョン",
"Response Content Type":"レスポンス コンテンツタイプ",
"Parameter content type:":"パラメータコンテンツタイプ:",
"fetching resource":"リソースの取得",
"fetching resource list":"リソース一覧の取得",
"Explore":"Explore",
"Explore":"調査",
"Show Swagger Petstore Example Apis":"SwaggerペットストアAPIの表示",
"Can't read from server. It may not have the appropriate access-control-origin settings.":"サーバから読み込めません. 適切なaccess-control-origin設定を持っていない可能性があります.",
"Please specify the protocol for":"プロトコルを指定してください",
+3
View File
@@ -28,6 +28,8 @@ window.SwaggerTranslator.learn({
"Expand Operations":"展开操作",
"Raw":"原始",
"can't parse JSON. Raw result":"无法解析JSON. 原始结果",
"Example Value":"示例",
"Click to set as parameter value":"点击设置参数",
"Model Schema":"模型架构",
"Model":"模型",
"apply":"应用",
@@ -39,6 +41,7 @@ window.SwaggerTranslator.learn({
"Contact the developer":"联系开发者",
"api version":"api版本",
"Response Content Type":"响应Content Type",
"Parameter content type:":"参数类型:",
"fetching resource":"正在获取资源",
"fetching resource list":"正在获取资源列表",
"Explore":"浏览",
+3 -3
View File
@@ -8,13 +8,13 @@
}
],
"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.2.4",
"version": "2.2.6",
"homepage": "http://swagger.io",
"license": "Apache-2.0",
"main": "dist/swagger-ui.js",
"scripts": {
"build": "npm run handlebars && gulp",
"handlebars": "./node_modules/handlebars/bin/handlebars ./src/main/template -f ./src/main/template/templates.js && gulp handlebars",
"handlebars": "handlebars ./src/main/template -f ./src/main/template/templates.js && gulp handlebars",
"serve": "gulp serve",
"prejshint": "gulp",
"jshint": "jshint .",
@@ -60,6 +60,6 @@
"phantomjs": "1.9.19",
"selenium-webdriver": "^2.45.0",
"sinon-chai": "2.8.0",
"swagger-client": "2.1.20"
"swagger-client": "2.1.23"
}
}
+2 -2
View File
@@ -3,12 +3,12 @@
font-family: 'Droid Sans';
font-style: normal;
font-weight: 400;
src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf'), format('truetype');
src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf') format('truetype');
}
/* Google Font's Droid Sans Bold */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 700;
src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf'), format('truetype');
src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf') format('truetype');
}
+10 -3
View File
@@ -651,7 +651,6 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
// puts the response data in UI
showStatus: function(response) {
console.log(response.headers);
var url, content;
if (response.content === undefined) {
content = response.data;
@@ -695,9 +694,17 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
if ('Blob' in window) {
var type = contentType || 'text/html';
var a = document.createElement('a');
var href = window.URL.createObjectURL(content);
var href;
if({}.toString.apply(content) === '[object Blob]') {
href = window.URL.createObjectURL(content);
}
else {
var binaryData = [];
binaryData.push(content);
href = window.URL.createObjectURL(new Blob(binaryData, {type: type}));
}
var fileName = response.url.substr(response.url.lastIndexOf('/') + 1);
var download = [type, fileName, href].join(':');