From d139e57ec1e2794decd145c9079394f348d4ebb1 Mon Sep 17 00:00:00 2001 From: Jake Marsh Date: Fri, 7 Oct 2016 14:38:50 -0700 Subject: [PATCH 1/2] bump all dependencies --- package.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index bab50515..95364089 100644 --- a/package.json +++ b/package.json @@ -32,55 +32,55 @@ "unit": "cross-env NODE_ENV=test ./node_modules/.bin/gulp unit" }, "dependencies": { - "cross-env": "^1.0.8" + "cross-env": "^3.1.1" }, "devDependencies": { "angular": "^1.5.0", "angular-mocks": "^1.3.15", - "angular-ui-router": "^0.2.13", + "angular-ui-router": "^0.3.1", "babel-core": "^6.3.26", - "babel-eslint": "^5.0.0", + "babel-eslint": "^7.0.0", "babel-preset-es2015": "^6.3.13", "babel-register": "^6.5.2", "babelify": "^7.2.0", "brfs": "^1.2.0", "browser-sync": "^2.7.6", "browserify": "^13.0.0", - "browserify-istanbul": "^1.0.0", + "browserify-istanbul": "^2.0.0", "browserify-ngannotate": "^2.0.0", - "bulk-require": "^0.2.1", + "bulk-require": "^1.0.0", "bulkify": "^1.1.1", "debowerify": "^1.3.1", "del": "^2.1.0", "envify": "^3.4.0", - "eslint": "2.2.0", + "eslint": "3.7.1", "express": "^4.13.3", "gulp": "^3.9.0", - "gulp-angular-templatecache": "^1.3.0", + "gulp-angular-templatecache": "^2.0.0", "gulp-autoprefixer": "^3.1.0", "gulp-changed": "^1.0.0", - "gulp-eslint": "^2.0.0", + "gulp-eslint": "^3.0.1", "gulp-gzip": "^1.2.0", "gulp-if": "^2.0.0", - "gulp-imagemin": "^2.4.0", + "gulp-imagemin": "^3.0.3", "gulp-notify": "^2.0.0", - "gulp-protractor": "^2.1.0", + "gulp-protractor": "^3.0.0", "gulp-rename": "^1.2.0", "gulp-sass": "^2.0.4", "gulp-sass-glob": "^1.0.6", "gulp-sourcemaps": "^1.6.0", "gulp-streamify": "^1.0.2", - "gulp-uglify": "^1.4.2", + "gulp-uglify": "^2.0.0", "gulp-util": "^3.0.1", - "imagemin-pngcrush": "^4.1.0", + "imagemin-pngcrush": "^5.0.0", "isparta": "^4.0.0", - "karma": "^0.13.21", + "karma": "^1.3.0", "karma-browserify": "^5.0.2", - "karma-chrome-launcher": "^0.2.1", + "karma-chrome-launcher": "^2.0.0", "karma-coverage": "douglasduteil/karma-coverage#next", - "karma-firefox-launcher": "^0.1.3", - "karma-jasmine": "^0.3.6", - "karma-sauce-launcher": "^0.3.0", + "karma-firefox-launcher": "^1.0.0", + "karma-jasmine": "^1.0.2", + "karma-sauce-launcher": "^1.0.0", "merge-stream": "^1.0.0", "pretty-hrtime": "^1.0.1", "run-sequence": "^1.1.5", From dac7b4ebcbd92b6837c9b3f5d2d6850b194f6564 Mon Sep 17 00:00:00 2001 From: Jake Marsh Date: Fri, 7 Oct 2016 14:39:10 -0700 Subject: [PATCH 2/2] fix html5mode --- app/js/on_config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/js/on_config.js b/app/js/on_config.js index e0a2242c..de10f197 100644 --- a/app/js/on_config.js +++ b/app/js/on_config.js @@ -5,7 +5,10 @@ function OnConfig($stateProvider, $locationProvider, $urlRouterProvider, $compil $compileProvider.debugInfoEnabled(false); } - $locationProvider.html5Mode(true); + $locationProvider.html5Mode({ + enabled: true, + requireBase: false + }); $stateProvider .state('Home', {