[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2f024d424fefe801aafaf9f9b2debab0c6b74483

[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, master has been updated
       via  2f024d424fefe801aafaf9f9b2debab0c6b74483 (commit)
       via  3e614940ad2fbdb6ec88e96b580ca7437e044410 (commit)
      from  160563b84d9d2847dc7f8fef40ea2aa8b31fb563 (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 2f024d424fefe801aafaf9f9b2debab0c6b74483
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu May 19 14:28:11 2016 -0400

    LP#1554714 Add explicit phantomjs-prebuilt dependency
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>

diff --git a/Open-ILS/web/js/ui/default/staff/package.json b/Open-ILS/web/js/ui/default/staff/package.json
index 1776c0e..f820d68 100644
--- a/Open-ILS/web/js/ui/default/staff/package.json
+++ b/Open-ILS/web/js/ui/default/staff/package.json
@@ -15,6 +15,7 @@
     "grunt-contrib-uglify": "^0.4.0",
     "grunt-exec": "^0.4.5",
     "grunt-karma": "^0.8.3",
+    "phantomjs-prebuilt": "^2.1.7",
     "karma": "^0.12.14",
     "karma-jasmine": "^0.1.5",
     "karma-phantomjs-launcher": "^1.0.0",

commit 3e614940ad2fbdb6ec88e96b580ca7437e044410
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu May 19 16:25:12 2016 -0400

    LP#1554714 Ang. 2.5 hotkeys plugin update
    
    As with other dependencies, the hotkeys package name changed since the
    last update.  It's now cfp-angular-hotkeys
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>

diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json
index a03180f..488407b 100644
--- a/Open-ILS/web/js/ui/default/staff/bower.json
+++ b/Open-ILS/web/js/ui/default/staff/bower.json
@@ -24,12 +24,12 @@
     "angular-route": "~1.5.0",
     "angular-mocks": "~1.5.0",
     "angular-bootstrap": "~1.2.4",
-    "angular-hotkeys": "~0.2.2",
     "angular-file-saver": "~1.1.0",
     "angular-location-update": "~0.0.2",
     "ngtoast": "~2.0.0",
     "angular-tree-control": "~0.2.23",
-    "angular-animate": "~1.5.3"
+    "angular-animate": "~1.5.3",
+    "angular-hotkeys": "cfp-angular-hotkeys#^1.7.0"
   },
   "resolutions": {
     "angular": "1.5.5"

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

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


hooks/post-receive
-- 
Evergreen ILS