From adf6e0ce65d35e280db85d868e9bca98f2e2d20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Gagnon-Voyer?= Date: Wed, 19 Nov 2014 17:17:55 -0500 Subject: [PATCH] update to angular-bootstrap 0.12.0 + fix breaking changes details on breaking changes: https://github.com/angular-ui/bootstrap/blob/eec68d81f4f72363d37493c495b 892347bdb9e1b/CHANGELOG.md Conflicts: bower.json --- bower.json | 3 ++- public/modules/core/views/header.client.view.html | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 3d7a7451dc..a49e03392d 100644 --- a/bower.json +++ b/bower.json @@ -9,7 +9,8 @@ "angular-animate": "~1.2", "angular-mocks": "~1.2", "angular-bootstrap": "~0.11.2", + "angular-bootstrap": "~0.12.0", "angular-ui-utils": "~0.1.1", "angular-ui-router": "~0.2.11" } -} \ No newline at end of file +} diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html index eb6ac6dfa4..541aa3a8d4 100644 --- a/public/modules/core/views/header.client.view.html +++ b/public/modules/core/views/header.client.view.html @@ -11,7 +11,7 @@