From 71616ec53c709e798135b38bd5c6addd76284cc2 Mon Sep 17 00:00:00 2001 From: gustavo Date: Sun, 11 Oct 2015 20:39:30 +0200 Subject: [PATCH] showcase: update dependencies versions. Also marked devDependency for gulp-ngdocs since npm v3 and its new flat dependencies. --- angularjs/showcase/bower.json | 12 +++++++----- angularjs/showcase/karma.conf.js | 2 ++ angularjs/showcase/src/showcase/index.html | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/angularjs/showcase/bower.json b/angularjs/showcase/bower.json index ce4f21c..fab94eb 100644 --- a/angularjs/showcase/bower.json +++ b/angularjs/showcase/bower.json @@ -18,14 +18,16 @@ "dependencies": { "bootstrap": "~4.0.0-alpha", "font-awesome": "~4.4.0", - "oclazyload": "~1.0.5", - "angular-bootstrap": "~0.13.4", - "angular-translate": "~2.7.2", + "oclazyload": "~1.0.6", + "angular-animate": "~1.4.7", + "angular-bootstrap": "~0.14.0", + "angular-translate": "~2.8.1", "angular-ui-router": "~0.2.15", - "angular": "~1.4.5" + "angular": "~1.4.7" }, "devDependencies": { - "angular-mocks": "~1.4.5" + "angular-mocks": "~1.4.7", + "marked": "~0.3.4" }, "overrides": { "bootstrap": { diff --git a/angularjs/showcase/karma.conf.js b/angularjs/showcase/karma.conf.js index 7049cff..15ca427 100644 --- a/angularjs/showcase/karma.conf.js +++ b/angularjs/showcase/karma.conf.js @@ -26,10 +26,12 @@ module.exports = function(config) { 'bower_components/bootstrap/dist/js/bootstrap.js', 'bower_components/angular/angular.js', 'bower_components/oclazyload/dist/ocLazyLoad.js', + 'bower_components/angular-animate/angular-animate.js', 'bower_components/angular-bootstrap/ui-bootstrap-tpls.js', 'bower_components/angular-translate/angular-translate.js', 'bower_components/angular-ui-router/release/angular-ui-router.js', 'bower_components/angular-mocks/angular-mocks.js', + 'bower_components/marked/lib/marked.js', //endbower 'src/showcase/app/**/*.module.js', 'src/showcase/app/**/*.js', diff --git a/angularjs/showcase/src/showcase/index.html b/angularjs/showcase/src/showcase/index.html index ffd71b8..16f5f5e 100644 --- a/angularjs/showcase/src/showcase/index.html +++ b/angularjs/showcase/src/showcase/index.html @@ -41,6 +41,7 @@ + -- 2.1.4