projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 428c4bc ffa11e4)
Merge remote-tracking branch 'working/collab/gmcharlt/lp1708291-webstaff-serials... user/gmcharlt/tmp-serials-batch-patron-edit-merge
authorGalen Charlton <gmc@equinoxinitiative.org>
Thu, 24 Aug 2017 21:51:58 +0000 (17:51 -0400)
committerGalen Charlton <gmc@equinoxinitiative.org>
Thu, 24 Aug 2017 21:51:58 +0000 (17:51 -0400)
commitdbfb3c9968b96bea513e5398c88a90ac42cdbf2e
tree9aed6bac558c709b6d4a61be001aa30ab0147ae1tree
parent428c4bca83f2e5fd99f87471685d03d9c5f38b24commit | diff
parentffa11e4b4540224093bd27bde3fef3b574597964commit | diff
Merge remote-tracking branch 'working/collab/gmcharlt/lp1708291-webstaff-serials' into user/gmcharlt/tmp-serials-batch-patron-edit-merge

Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
Open-ILS/web/js/ui/default/staff/services/ui.js
Open-ILS/web/js/ui/default/staff/test/karma.conf.js
13 files changed:
Open-ILS/examples/fm_IDL.xml diff1 | diff2 | blob | history
Open-ILS/src/sql/Pg/070.schema.container.sql diff1 | diff2 | blob | history
Open-ILS/src/sql/Pg/950.data.seed-values.sql diff1 | diff2 | blob | history
Open-ILS/src/templates/staff/base_js.tt2 diff1 | diff2 | blob | history
Open-ILS/src/templates/staff/cat/catalog/index.tt2 diff1 | diff2 | blob | history
Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 diff1 | diff2 | blob | history
Open-ILS/src/templates/staff/navbar.tt2 diff1 | diff2 | blob | history
Open-ILS/src/templates/staff/share/t_autogrid.tt2 diff1 | diff2 | blob | history
Open-ILS/web/js/ui/default/staff/Gruntfile.js diff1 | diff2 | blob | history
Open-ILS/web/js/ui/default/staff/cat/catalog/app.js diff1 | diff2 | blob | history
Open-ILS/web/js/ui/default/staff/package.json diff1 | diff2 | blob | history
Open-ILS/web/js/ui/default/staff/services/ui.js diff1 | diff2 | blob | history
Open-ILS/web/js/ui/default/staff/test/karma.conf.js diff1 | diff2 | blob | history
Evergreen ILS