Merge pull request #2426 from swagger-api/release-prepare

update swagger-js version
merged with master
2016-09-26 12:25:42 -07:00 · 2016-09-26 12:17:13 -07:00 · 2016-09-26 12:15:15 -07:00 · 2016-09-26 12:14:52 -07:00 · 2016-09-26 12:14:21 -07:00 · 2016-09-21 18:09:15 +09:00
4 changed files with 9 additions and 14 deletions
@@ -20,10 +20,5 @@
            "name": "Mohsen Azimi",
            "email": "me@azimi.me"
        }
-    ],
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
-    }
+    ]
 }
@@ -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.5",
  "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.21"
  }
 }
Author	SHA1	Message	Date
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