[open-ils-commits] [GIT] Evergreen ILS branch rel_2_11 updated. 9fd3147414130272cefe8c171249f6c4acb36bc7

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_11 has been updated
       via  9fd3147414130272cefe8c171249f6c4acb36bc7 (commit)
      from  708fbbd9b00e950668aadcdffdd1d9abf7f1b03c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9fd3147414130272cefe8c171249f6c4acb36bc7
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Wed Mar 8 11:51:35 2017 -0500

    LP#1671165: Fix web client build error
    
    Bower install was grabbing a later version of angular-cookies than we wanted,
    resulting in errors when attempting to build the web client. Changing a
    caret to a tilde in the bower.json files keeps us to a 1.5.x version of
    angular-cookies, making web client builds happy.
    
    Many thanks to Ben Shum for finding the solution to this problem!
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <ben at evergreener.net>
    
    Conflicts:
    	Open-ILS/web/js/ui/default/staff/bower.json

diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json
index f332f3b..ff7e082 100644
--- a/Open-ILS/web/js/ui/default/staff/bower.json
+++ b/Open-ILS/web/js/ui/default/staff/bower.json
@@ -30,7 +30,7 @@
     "angular-tree-control": "~0.2.28",
     "angular-animate": "~1.5.3",
     "angular-hotkeys": "cfp-angular-hotkeys#^1.7.0",
-    "angular-cookies": "^1.5.8"
+    "angular-cookies": "~1.5.8"
   },
   "resolutions": {
     "angular": "~1.5.5"

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/ui/default/staff/bower.json |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS