[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_7_0_beta1 created. 2ac5c10d9935939e392cf4ecfc87ee5641a8ba88

Evergreen Git git at git.evergreen-ils.org
Thu Sep 11 01:50:35 EDT 2014


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, tags/rel_2_7_0_beta1 has been created
        at  2ac5c10d9935939e392cf4ecfc87ee5641a8ba88 (commit)

- Log -----------------------------------------------------------------
commit 2ac5c10d9935939e392cf4ecfc87ee5641a8ba88
Author: Ben Shum <bshum at biblio.org>
Date:   Thu Aug 14 17:49:10 2014 -0400

    Bumping version numbers, adding Upgrade Script and Changelog
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..c229363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,3654 @@
-Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs.
-Those seeking a change log are encouraged to run 'git log -v', or read
-it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log
+commit e79081507e1c934990f0103a3a34d450d317484a
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Aug 14 12:48:18 2014 -0400
+
+    Compile release notes for Evergreen 2.7.0
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+408	0	docs/RELEASE_NOTES_2_7.txt
+0	8	docs/RELEASE_NOTES_NEXT/Acquisitions/acq-fund-rendering.txt
+0	33	docs/RELEASE_NOTES_NEXT/Acquisitions/delayed-vs-canceled.txt
+0	7	docs/RELEASE_NOTES_NEXT/Administration/bigger_report_outputs.txt
+0	14	docs/RELEASE_NOTES_NEXT/Administration/report-edit.txt
+0	18	docs/RELEASE_NOTES_NEXT/Administration/report-hints.txt
+0	11	docs/RELEASE_NOTES_NEXT/Administration/secondary_permission_groups.txt
+0	10	docs/RELEASE_NOTES_NEXT/Cataloging/copy_edit_links.txt
+0	11	docs/RELEASE_NOTES_NEXT/Cataloging/display_imported_as_in_vandelay_queue.txt
+0	19	docs/RELEASE_NOTES_NEXT/Cataloging/marc_stream_importer.txt
+0	17	docs/RELEASE_NOTES_NEXT/Cataloging/merge-parts.txt
+0	18	docs/RELEASE_NOTES_NEXT/Cataloging/no-fixed-field-defaults-for-ingest.txt
+0	7	docs/RELEASE_NOTES_NEXT/Circulation/hold-targeting-precat.txt
+0	6	docs/RELEASE_NOTES_NEXT/Circulation/holds-shelf-expire-date.txt
+0	13	docs/RELEASE_NOTES_NEXT/Circulation/lost-and-paid-status.txt
+0	6	docs/RELEASE_NOTES_NEXT/OPAC/addedcontent_by_id.txt
+0	22	docs/RELEASE_NOTES_NEXT/OPAC/addedcontent_contentcafe.txt
+0	11	docs/RELEASE_NOTES_NEXT/OPAC/more_rda_264_support.txt
+0	51	docs/RELEASE_NOTES_NEXT/OPAC/sitemap_builder.txt
+ create mode 100644 docs/RELEASE_NOTES_2_7.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/acq-fund-rendering.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/delayed-vs-canceled.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/bigger_report_outputs.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/report-edit.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/report-hints.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/secondary_permission_groups.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/copy_edit_links.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/display_imported_as_in_vandelay_queue.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/marc_stream_importer.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/merge-parts.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/no-fixed-field-defaults-for-ingest.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/hold-targeting-precat.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/holds-shelf-expire-date.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/lost-and-paid-status.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/addedcontent_by_id.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/addedcontent_contentcafe.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/more_rda_264_support.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/sitemap_builder.txt
+
+commit e6c0559fbaf044d32e3aa9e32939c02cf2d674e6
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Aug 14 12:03:59 2014 -0400
+
+    Pre-2.7 Release notes cleanup
+    
+    1) Fixing up formatting issues with the asciidoc
+    2) Remove extra words "New feature" from certain notes
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	docs/RELEASE_NOTES_NEXT/Acquisitions/acq-fund-rendering.txt
+8	5	docs/RELEASE_NOTES_NEXT/Acquisitions/delayed-vs-canceled.txt
+2	2	docs/RELEASE_NOTES_NEXT/Administration/report-edit.txt
+2	2	docs/RELEASE_NOTES_NEXT/Administration/report-hints.txt
+2	2	docs/RELEASE_NOTES_NEXT/Cataloging/copy_edit_links.txt
+1	2	docs/RELEASE_NOTES_NEXT/Cataloging/display_imported_as_in_vandelay_queue.txt
+2	2	docs/RELEASE_NOTES_NEXT/Cataloging/merge-parts.txt
+3	5	docs/RELEASE_NOTES_NEXT/Cataloging/no-fixed-field-defaults-for-ingest.txt
+1	1	docs/RELEASE_NOTES_NEXT/Circulation/hold-targeting-precat.txt
+
+commit 2b4c4fe9f3623ae6b84c785abf15c3f8fa15e5da
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Aug 14 12:36:16 2014 -0400
+
+    Fixes for create_release_notes.sh
+    
+    1) Teach it to ignore the sample RELEASE_NOTES_NEXT.txt file
+    2) Add a proper section for "New Features" heading, instead of
+       defaulting everything under the "Upgrade notes" heading.
+    
+    Note: Will still require manually moving any upgrade notes to the
+          right place post-compile.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+4	1	docs/RELEASE_NOTES_NEXT/create_release_notes.sh
+
+commit 40f1fb2cea5a54da20497f1c89bee21a753de127
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Aug 11 11:04:43 2014 -0400
+
+    LP#1329503 text input repairs
+    
+    * Correctly propagate values for text widget "in list" values when editing
+      reports
+    * After entering a value for "in list" text widgets, clear the text
+      input so the user can enter subsequent values w/o manually clearing.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+19	3	Open-ILS/web/reports/oils_rpt_widget.js
+
+commit 5eb13d5e7db75ed010a33ffce6342643f3c32c4a
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Fri Aug 8 13:57:09 2014 -0400
+
+    LP#1329503 report edit scheduling repairs
+    
+    * ensure default values for scheduling and recurrence are applied with each
+      edited report, including today's date in the scheduler.
+    * If the most recent report run run_time is in the past, deafult to "run
+      now"
+    * fix bug with propagating months recurrence
+    * If recurrence interval is in days and divisible by 7, present as weeks
+    * make date regexes easier on the eyes
+    * fix bug with rendering sets of org units
+    * fixed bug with modifying report to be "run now" from scheduled.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+47	19	Open-ILS/web/reports/oils_rpt_report_editor.js
+3	2	Open-ILS/web/reports/oils_rpt_widget.js
+
+commit f54db601a5a89ac99e7d64e27e34c5863e60a167
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Mon Aug 11 13:27:18 2014 -0400
+
+    LP1355319: Add missing Parse::RecDescent perl dependency.
+    
+    Add the appropriate deb or rpm entry to the various Makefiles.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/src/extras/install/Makefile.debian-jessie
+1	0	Open-ILS/src/extras/install/Makefile.debian-squeeze
+1	0	Open-ILS/src/extras/install/Makefile.debian-wheezy
+1	0	Open-ILS/src/extras/install/Makefile.fedora
+1	0	Open-ILS/src/extras/install/Makefile.ubuntu-precise
+1	0	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+
+commit 12e4ca0cf13a1566fd8ef63cf122997002f1bab4
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Fri Aug 8 17:16:39 2014 -0400
+
+    Release note repairs and additions
+    
+    A handful of repairs and additions to the 2.7 release notes, including:
+      * moved copy_edit_links to cataloging
+      * making no-fixed-field-defaults-for-ingest an upgrade note
+      * adding release note entries for hold targeting of precats and improved
+    acq fund rendering.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+8	0	docs/RELEASE_NOTES_NEXT/Acquisitions/acq-fund-rendering.txt
+10	0	docs/RELEASE_NOTES_NEXT/Cataloging/copy_edit_links.txt
+3	0	docs/RELEASE_NOTES_NEXT/Cataloging/no-fixed-field-defaults-for-ingest.txt
+7	0	docs/RELEASE_NOTES_NEXT/Circulation/hold-targeting-precat.txt
+0	10	docs/RELEASE_NOTES_NEXT/OPAC/copy_edit_links.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/acq-fund-rendering.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/copy_edit_links.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/hold-targeting-precat.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/copy_edit_links.txt
+
+commit 6e6b48318c3bf61b48a0aa6215d4157b29b581c3
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Fri Aug 8 10:41:23 2014 -0400
+
+    Secondary permission groups release note
+    
+    Release notes entry for secondary permission groups as well as some fixes
+    to the docs to get the images to display.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+11	0	docs/RELEASE_NOTES_NEXT/Administration/secondary_permission_groups.txt
+25	9	docs/admin_initial_setup/describing_your_people.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/secondary_permission_groups.txt
+
+commit 998660710a5fd9c7e9b5e6e7fdda3a15005d3983
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Thu Aug 7 23:19:07 2014 -0400
+
+    LP#1292705 Fix broken is*() methods in fm_IDL2js.xsl
+    
+    A thinko meant that we were no longer incrementing the field variable,
+    leading to breakage in interfaces that used isnew() and the like.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+4	1	Open-ILS/xsl/fm_IDL2js.xsl
+
+commit b3f203b6f920d35c0b5e14ef4f2cda840e8a4f55
+Author: Jennifer Pringle <jpringle at sitka.bclibraries.ca>
+Date:   Wed Mar 19 13:29:38 2014 -0700
+
+    Secondary Permissions Documentation and Screenshots.
+    
+    Signed-off-by: Jennifer Pringle <jpringle at sitka.bclibraries.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+42	0	docs/admin_initial_setup/describing_your_people.txt
+-	-	docs/media/sup-permissions-1.png
+-	-	docs/media/sup-permissions-2.png
+-	-	docs/media/sup-permissions-3.png
+-	-	docs/media/sup-permissions-4.png
+-	-	docs/media/sup-permissions-5.png
+ create mode 100644 docs/media/sup-permissions-1.png
+ create mode 100644 docs/media/sup-permissions-2.png
+ create mode 100644 docs/media/sup-permissions-3.png
+ create mode 100644 docs/media/sup-permissions-4.png
+ create mode 100644 docs/media/sup-permissions-5.png
+
+commit ef04f72cf613b0c31cc6a42bd46e609f1a0d5323
+Author: James Fournie <jfournie at sitka.bclibraries.ca>
+Date:   Wed Jan 4 11:55:19 2012 -0800
+
+    Add multiple permission groups editor to user registration form
+    
+    This makes use of permission.usr_grp_perm_map which grants secondary
+    permission groups.  It does not affect the 'profile' ie: circulation policy.
+    
+    Signed-off-by: James Fournie <jfournie at sitka.bclibraries.ca>
+    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
+37	0	Open-ILS/src/templates/actor/user/register.tt2
+8	1	Open-ILS/src/templates/actor/user/register_table.tt2
+9	1	Open-ILS/web/js/dojo/openils/actor/nls/register.js
+122	0	Open-ILS/web/js/ui/default/actor/user/register.js
+
+commit 164c7e7bc4e542af9ada4ea2716cbce784820e6d
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date:   Mon Jul 14 12:13:06 2014 -0400
+
+    Update ContentCafe Added Content Module
+    
+    Now with keyhash support, but losing "No Image" image support.
+    
+    Also added a "fetch all" function for possible "cache everything" calls.
+    
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+5	4	Open-ILS/examples/opensrf.xml.example
+14	0	Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
+242	129	Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent/ContentCafe.pm
+22	0	docs/RELEASE_NOTES_NEXT/OPAC/addedcontent_contentcafe.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/addedcontent_contentcafe.txt
+
+commit de728768aec76dc1daeb6ee6d28d2eecb8c18fd1
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Aug 7 20:39:47 2014 -0400
+
+    LP#1329503 avoid run now + later combined schedule
+    
+    When editing a report, ensure only one of "now" vs. "schedule for later"
+    options is selected by default.  Similarly, if the schedule option is
+    activated by default, ensure the date fields are enabled.
+    
+    If the run time of the most recent report is in the past, default to the
+    current date for the schedule instead of the no longer valid date.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+5	1	Open-ILS/web/reports/oils_rpt_report_editor.js
+
+commit 2f2859c083d25c3384931267ed756722c2a639fc
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Aug 7 13:16:36 2014 -0400
+
+    LP#1329503 propagate 'in list' values for editing
+    
+    For example, ensure a previously selected list of copy locations are
+    propagated into the selected values list during report editing.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/web/reports/oils_rpt_param_editor.js
+1	1	Open-ILS/web/reports/oils_rpt_report_editor.js
+36	7	Open-ILS/web/reports/oils_rpt_widget.js
+
+commit 8ad52e513ae5c823a913bfed88bf4820cc89cb7a
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Aug 6 10:41:25 2014 -0400
+
+    LP#1329503 report editing additional repairs
+    
+    * correctly propagate values for the "between" widget
+    * propagate pivot data and label when present
+    * propagate report run time
+    * improvements to report email propagation
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+27	2	Open-ILS/web/reports/oils_rpt_report_editor.js
+3	0	Open-ILS/web/reports/oils_rpt_widget.js
+
+commit 29a422f39c0d84e71731e69c1344a27bf633a189
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Jul 10 14:42:31 2014 -0400
+
+    LP#1329503 report editing misc. repairs
+    
+    * Fixed some faultly widget rendering on report edit
+    
+    * Avoid showing "save as new" for new reports.
+    
+    * Repair fault report edit Exit/Cancel buttons
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+13	3	Open-ILS/web/reports/oils_rpt_report_editor.js
+26	10	Open-ILS/web/reports/oils_rpt_widget.js
+
+commit d75db546fe741dd9bc9369ff067d63a0e9a1b143
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Fri Jun 20 14:20:48 2014 -0400
+
+    LP#1329503 View/Edit Report Release Notes
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+14	0	docs/RELEASE_NOTES_NEXT/Administration/report-edit.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/report-edit.txt
+
+commit c4d99f320b3ba342f0d949bb4be08e2f962acd64
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Jun 18 10:08:14 2014 -0400
+
+    LP#1329503 View Edit Reports
+    
+    Alongside each report in the Reports folder view there are two new
+    links, one for viewing (read-only) and one for editing.  After changing
+    a report, the user has the option to save the modified report or create
+    a new report with the new values, in effect cloning the original report.
+    
+    When saving a changed report, if a pending report run exists, the user
+    will be warned of this and asked if they would prefer to modify the
+    scheduled report or to instead save the changed values as a new report,
+    leaving the original report intact.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/web/js/dojo/openils/reports/nls/reports.js
+19	1	Open-ILS/web/opac/common/js/fm_table_conf.js
+2	2	Open-ILS/web/opac/common/js/utils.js
+7	0	Open-ILS/web/opac/locale/en-US/reports.dtd
+9	0	Open-ILS/web/reports/oils_rpt.css
+27	1	Open-ILS/web/reports/oils_rpt_editor.xhtml
+37	0	Open-ILS/web/reports/oils_rpt_folder_window.js
+4	0	Open-ILS/web/reports/oils_rpt_folder_window.xhtml
+8	2	Open-ILS/web/reports/oils_rpt_folders.js
+7	4	Open-ILS/web/reports/oils_rpt_param_editor.js
+236	19	Open-ILS/web/reports/oils_rpt_report_editor.js
+0	1	Open-ILS/web/reports/oils_rpt_utils.js
+69	6	Open-ILS/web/reports/oils_rpt_widget.js
+
+commit f8296e924a84555e5beba6bcab1eeabb92ddad8c
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Jun 19 15:45:25 2014 -0400
+
+    LP#1329503 Reporter report.fleshed.retrieve API
+    
+    API for fetching fleshed reports, including the most recent
+    reporter.schedule.  Useful for modifying existing reports.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+37	0	Open-ILS/src/perlmods/lib/OpenILS/Application/Reporter.pm
+
+commit 28a7e0ac39451bf6b7e0590c370cd97005ef8c93
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Aug 6 13:55:13 2014 -0400
+
+    LP#1332138 hide doc URL in report editor when no URL present
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	2	Open-ILS/web/reports/oils_rpt_report_editor.js
+
+commit 5aa10f8e54e146702eb52a9e1d175d3378d3ae68
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Fri Jun 20 16:29:01 2014 -0400
+
+    LP#1332138 Report Doc/Hints Release Notes
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+18	0	docs/RELEASE_NOTES_NEXT/Administration/report-hints.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/report-hints.txt
+
+commit 42ca875599077b745c4caa7542f3eaea722b1640
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Jun 18 17:59:49 2014 -0400
+
+    LP#1332138 Report template / field docs repairs
+    
+    * Various sanity checks and misc. repairs
+    * Add missing strings
+    * oils_rpt_editor.xhtml XML repair; XMLENT is strict
+    * links to external resources open XUL tabs (to avoid HTTP dialogs)
+    * avoid displaying bare HTML in labels
+    * show hints for display fields
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+5	4	Open-ILS/web/opac/common/js/fm_table.js
+9	5	Open-ILS/web/opac/common/js/fm_table_conf.js
+1	0	Open-ILS/web/opac/locale/en-US/reports.dtd
+6	0	Open-ILS/web/reports/oils_rpt.css
+2	1	Open-ILS/web/reports/oils_rpt.js
+1	0	Open-ILS/web/reports/oils_rpt.xhtml
+4	1	Open-ILS/web/reports/oils_rpt_editor.xhtml
+13	2	Open-ILS/web/reports/oils_rpt_param_editor.js
+14	1	Open-ILS/web/reports/oils_rpt_report_editor.js
+1	5	Open-ILS/web/reports/oils_rpt_utils.js
+17	4	Open-ILS/web/reports/xul/template-config.js
+1	1	Open-ILS/web/reports/xul/template_builder.xul
+
+commit c8bd690a3bc7b83f8824980e6495e5f2db6b82cf
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Mon May 12 14:13:25 2014 -0400
+
+    LP#1332138 Report template / field documentation
+    
+    * Report templates support a new External URL field, which may
+      contain a link to template-specific, local documentation.
+    
+     ** When set, a link to the external documentation will be
+        displayed in a new column in the template list and within
+        the report editor.
+    
+     ** URL's are set in the 'Documentation URL' entry.
+    
+    * Template display fields and filters support a new Field Hint
+      value.  When set, hints are displayed in the report editor.
+    
+     ** Values are set via the 'Change Field Hint' option along
+        the bottom of the template editor.
+    
+    ------ from commits ----
+    
+    * Initial template-level support for inline template and field documentation
+    * Use external documenation url in clark output
+    * Show the docs link and strings in the report editor
+    * Set the href of a link, instead of the text content of a span
+    * Attempt to pop up a new window (may require more pushups in the XUL staff client)
+    * Add calculated column support, use it for external docs url
+    * Realign field names
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+25	3	Open-ILS/src/reporter/clark-kent.pl
+3	0	Open-ILS/src/reporter/report-fail
+3	0	Open-ILS/src/reporter/report-success
+1	0	Open-ILS/web/js/dojo/openils/reports/nls/reports.js
+13	3	Open-ILS/web/opac/common/js/fm_table.js
+14	0	Open-ILS/web/opac/common/js/fm_table_conf.js
+3	0	Open-ILS/web/opac/locale/en-US/reports.dtd
+3	0	Open-ILS/web/reports/oils_rpt_editor.xhtml
+2	2	Open-ILS/web/reports/oils_rpt_param_editor.js
+6	0	Open-ILS/web/reports/oils_rpt_report_editor.js
+6	1	Open-ILS/web/reports/oils_rpt_utils.js
+50	13	Open-ILS/web/reports/xul/template-config.js
+11	0	Open-ILS/web/reports/xul/template_builder.xul
+
+commit 5c555bf213616f10f775eb51d8ed818c3feede5f
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Aug 4 09:25:58 2014 -0400
+
+    LP#1346421 TPAC copy view/edit links release notes
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+10	0	docs/RELEASE_NOTES_NEXT/OPAC/copy_edit_links.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/copy_edit_links.txt
+
+commit a6f55eb502a7a1fb358fe6f5e95872ab36b5a6c7
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Jul 21 14:44:34 2014 -0400
+
+    LP#1346421 TPAC copy view / edit links
+    
+    Adds "view" and "edit" links next to each copy in the TPAC copy grid
+    when in embedded mode.  The "edit" link only appears when the user has
+    permission to edit the specified copy.
+    
+    Via the XUL volume_item_creator, the ui.unified_volume_copy_editor org
+    unit setting is inspected to determine which UI to load.  Also, the data
+    needed to load the subsequent UI is fetched within the
+    volume_item_creator, so the catalog doesn't have to.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	1	Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
+14	4	Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+22	1	Open-ILS/xul/staff_client/chrome/content/main/menu.js
+
+commit 414e2457c2fd2623eb00d768de58ba72b1474025
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Jul 21 14:42:32 2014 -0400
+
+    LP#1346421 TPAC permission check function.
+    
+    Support permission checks against the authenticated TPAC user.
+    
+    [% IF ctx.has_perm('UPDATE_COPY', copy.circ_lib) %] ... [% END %]
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+22	0	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
+
+commit d83387fa1a6acd2a08ccc66e164736fcfea8d266
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Wed Aug 6 14:50:59 2014 -0400
+
+    LP#1304462: Release notes about expanded RDA tag 264 support
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+11	0	docs/RELEASE_NOTES_NEXT/OPAC/more_rda_264_support.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/more_rda_264_support.txt
+
+commit 771cf4c260551665d009ef5b8557b98e4201060c
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Apr 10 23:54:31 2014 -0400
+
+    LP#1304462: Use other 264 types in search results if publisher is not available
+    
+    In the event that the publisher information is not part of the record, use
+    other types of 264 tags for producer, distributor, or manufacturer.
+    
+    Also employ the copyright if there is no available publication date.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+24	0	Open-ILS/src/templates/opac/parts/result/table.tt2
+
+commit 76bd5e3d022402d92bd0d96a8bf423d58eb32a72
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Apr 10 23:36:37 2014 -0400
+
+    LP#1304462: Stop using combined pubinfo for search results
+    
+    Remove one of the two places we define the pubinfo variable in misc_util.tt2
+    and then change the way search results pull in publisher data.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+0	3	Open-ILS/src/templates/opac/parts/misc_util.tt2
+2	2	Open-ILS/src/templates/opac/parts/result/table.tt2
+
+commit fc4619d7c2c05f1e80eabf1a7866024e7baf0af2
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Fri Aug 1 00:46:45 2014 -0400
+
+    LP#1304462: Add schema.org copyrightYear, manufacturer for RDA 264 fields
+    
+    It looks like the best we can do is to define a "manufacturer" property (and
+    corresponding Organization entity) when 264 ind2="3"; and we can provide a
+    copyrightYear when we have 264 ind2="4".
+    
+    Even then, MARC / RDA cataloging practices end up giving us copyright notices
+    like '@2012' instead of actual dates, so we have to regex the year out of the
+    notice to satisfy the Integer range for copyrightYear. Theoretically we'll be
+    in trouble if the copyright notice includes some other 4-digit number (for
+    example, a multipart work catalogued in a single record that has a date range),
+    but what are you gonna do? It's MARC / RDA.
+    
+    Same for manufacturer name, which seems likely (if the LoC examples that Yamil
+    provided are any guide) to include statements like "Manufactured by Foobar"
+    instead of cleanly structured data. The RDA fields were added to MARC21 in
+    2011, you would have thought that the benefits of providing clean data would
+    have been obvious by then. Grumble grumble grumble. Yes, this is meant to be
+    a transcription field, and theoretically one could use a 7xx to record the
+    publisher/distributor/manufacturer/producer in a more cleanly stated factual
+    way that would lend itself to actual linked data (hey, maybe even providing a
+    link to an external resource that could act as an identifier), but NOBODY DOES
+    THAT.
+    
+    So we do the best we can and soldier on.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+7	0	Open-ILS/src/templates/opac/parts/misc_util.tt2
+9	4	Open-ILS/src/templates/opac/parts/record/summary.tt2
+
+commit 9d2b2319f545f2041448a97e9be284522fb00abe
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Wed Mar 12 14:12:34 2014 -0400
+
+    LP#1304462: Add additional RDA information to TTOPAC record summary.
+    
+    This pulls information from the 264 tag where the indicator 2 has
+    the following values and displays the information below the Publisher
+    info:
+    
+    0 - Producer (a,b,c)
+    2 - Distributor (a, b, c)
+    3 - Manufacturer (a, b, c)
+    4 - Copyright (c)
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+64	0	Open-ILS/src/templates/opac/parts/misc_util.tt2
+48	0	Open-ILS/src/templates/opac/parts/record/summary.tt2
+
+commit ff85f2e9c354de2a296442e115d44a4dc718453d
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Tue Apr 15 13:55:15 2014 -0400
+
+    LP# 1308768 Make RDA bibs loadable for testing purposes
+    
+    Squash the RDA records into XML loading format via the magic
+    of 'yaz-marcdump -i marc -o marcxml' and some judicious regular
+    expressions.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+28	0	Open-ILS/tests/datasets/sql/assets_rda.sql
+14	0	Open-ILS/tests/datasets/sql/bibs_rda.sql
+6	0	Open-ILS/tests/datasets/sql/load_all.sql
+ create mode 100644 Open-ILS/tests/datasets/sql/assets_rda.sql
+ create mode 100644 Open-ILS/tests/datasets/sql/bibs_rda.sql
+
+commit 28b1ec0c49e3436a98a9891cd62cf00b0ca1edae
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Thu Jul 31 17:48:54 2014 -0400
+
+    LP# 1308768 Second set of test RDA records from LC - 6 total
+    
+    Here is another  batch of test records from LC from this site:
+    
+    http://catalog2.loc.gov/vwebv/searchKeyword
+    http://catalog.loc.gov/vwebv/searchKeyword
+    
+    Here are links to the MARCXML versions of the files. Search for files with
+    
+    XML records with 264 and ind2 set to _1 and _4
+    http://lccn.loc.gov/2014340080/marcxml - DVD - Jorge Mautner
+    http://lccn.loc.gov/2013335283/marcxml - CD - Claudia
+    http://lccn.loc.gov/2013493195/marcxml - SCORE - Wiegenlied
+    
+    XML with 264 and ind2 set to _1 and _2
+    http://lccn.loc.gov/2013565186/marcxml - SCORE - Arias for bass
+    http://lccn.loc.gov/2013565190/marcxml - SCORE-CD - Arias for soprano
+    
+    XML with 264 and ind2 set to _1 _2 and _4
+    http://lccn.loc.gov/2013568403/marcxml - SCORE - Intermediate_studies
+    
+    Ind2 values key:
+    0 - Production
+    1 - Publication
+    2 - Distribution
+    3 - Manufacture
+    4 - Copyright notice date
+    
+    I added both MARCXML and UTF8 MARC files for each record.
+    
+    RDA_record_DVD_Jorge_Mautner
+    RDA_record_CD_Claudia
+    RDA_record_SCORE_Wiegenlied
+    RDA_record_SCORE_Arias_for_bass
+    RDA_record_SCORE-CD_Arias_for_soprano
+    RDA_record_SCORE_Intermediate_studies
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_CD_Claudia.mrc
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_DVD_Jorge_Mautner.mrc
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_SCORE-CD_Arias_for_soprano.mrc
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_SCORE_Arias_for_bass.mrc
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_SCORE_Intermediate_studies.mrc
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_SCORE_Wiegenlied.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_CD_Claudia.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_DVD_Jorge_Mautner.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_SCORE-CD_Arias_for_soprano.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_SCORE_Arias_for_bass.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_SCORE_Intermediate_studies.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_SCORE_Wiegenlied.mrc
+
+commit 66b2a90f44a627d1eb9283db9c87ba49c175018f
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Wed Apr 16 17:42:47 2014 -0400
+
+    LP# 1308768 Add 4 sample RDA records from LoC
+    
+    At the suggestion of Dan Scott, I went to this LoC site:
+    
+    http://catalog.loc.gov/cgi-bin/Pwebrecon.cgi?DB=local&PAGE=First
+    
+    I used their "expert search"
+    
+    with a query of "040e rda"
+    
+    then used various "search limits" of "type"
+    
+    Here are the 4 record filenames, plus the available LoC permalinks to them:
+    
+    RDA_record_MAP_2012_Enchanted_Circle.mrc
+    http://lccn.loc.gov/2013585177
+    
+    RDA_record_DVD-BLUE-RAY-MOVIE_Pineapple_express.mrc
+    http://lccn.loc.gov/2010600022
+    
+    RDA_record_PHOTO_Srid_pa_ho.mrc
+    http://lccn.loc.gov/2011432135
+    
+    RDA_record_SERIAL_IEEE_International_conference.mrc
+    
+    I originally found more than 4 RDA records, but it was pointed out that they were
+    using older/outdated versions of RDA. For example, the records used the 260
+    tag instead of using the 264 tag.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_DVD-BLUE-RAY-MOVIE_Pineapple_express.mrc
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_MAP_2012_Enchanted_Circle.mrc
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_PHOTO_Srid_pa_ho.mrc
+1	0	Open-ILS/tests/datasets/RDA/RDA_record_SERIAL_IEEE_International_conference.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_DVD-BLUE-RAY-MOVIE_Pineapple_express.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_MAP_2012_Enchanted_Circle.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_PHOTO_Srid_pa_ho.mrc
+ create mode 100644 Open-ILS/tests/datasets/RDA/RDA_record_SERIAL_IEEE_International_conference.mrc
+
+commit 4f1074aec9e57b0df2cfd6b371e2517929cda090
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Fri Mar 14 16:42:11 2014 -0400
+
+    LP#1292705 trim unneeded fields from IDL2js
+    
+    Avoid sending fields in the web-published IDL (IDL2js) that have no
+    value, as the keys in the JSON take up a lot of space.  Also avoid
+    repeating fields (selector) and default values (e.g. label defaults
+    to name) where the client can reasonably apply the defaults locally.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	1	Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
+9	1	Open-ILS/web/js/dojo/fieldmapper/IDL.js
+7	9	Open-ILS/xsl/fm_IDL2js.xsl
+
+commit 5f0433a9c68164377c262f65ed67a7a538b28585
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date:   Wed Jul 23 12:29:44 2014 -0400
+
+    LP#1347793: TPAC added content by ID release notes
+    
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+6	0	docs/RELEASE_NOTES_NEXT/OPAC/addedcontent_by_id.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/addedcontent_by_id.txt
+
+commit 331983c7ff9bbec8571676a18373e9efa2aca59e
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date:   Tue Jul 22 11:15:11 2014 -0400
+
+    LP#1347793: Teach TPac to load AC by Bib ID
+    
+    So that we may get more than just jackets
+    
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+21	61	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+36	34	Open-ILS/src/templates/opac/parts/acjs.tt2
+
+commit 916c0950fbe0d3edd831ded46217589c27856451
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date:   Thu Oct 31 10:02:44 2013 -0400
+
+    LP#1246745: Remove OK message from SIP2 messages
+    
+    Because having clients constantly say there is a message of "OK" gets annoying
+    very quickly, especially if it is displayed in a popup message instead of via
+    a "messages" button.
+    
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+
+commit 71241c749e2cabc1d620783a7921133fef1ac162
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Jul 31 16:50:17 2014 -0400
+
+    LP#1351317 ACQ fund selector filters cont.
+    
+    To improve load times, limit the funds we attempt to retrieve for
+    various fund selectors to those the user has permission to use.
+    
+    Interfaces affected include the following:
+    
+    * Purchase order copy grid
+    * Purchase order "New Charge" interface
+    * Invoice "Add charge..." interface
+    * Distribution formula configuration interface.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+22	12	Open-ILS/web/js/ui/default/acq/common/li_table.js
+16	0	Open-ILS/web/js/ui/default/acq/invoice/view.js
+7	0	Open-ILS/web/js/ui/default/acq/po/item_table.js
+14	1	Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js
+
+commit 07e00d082410670d33606720b7f077cd8fa31257
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Thu Aug 7 17:40:41 2014 -0400
+
+    Docs: various AsciiDoc formatting fixes for docs
+    
+    Fixed the 'bad first character' error, the bad apostrophe error. Removed various UTF-8 chars.
+    Fixed some numbered list formatting, to take out redundant manual numerals…
+    
+    for example:
+    
+    . 1 item
+    . 2 item
+    . 3 item
+    
+    became:
+    
+    . item
+    . item
+    . item
+    
+    also added "=" to wrap around breaks in numbered lists
+    
+    for example:
+    
+    . Right-click on the value control for the fixed field that needs to be edited.
+    
+     image::media/ffrc1.jpg[]
+    
+     . Select the appropriate value for the fixed field from the menu options.
+    
+     became:
+    
+      . Right-click on the value control for the fixed field that needs to be edited.
+    
+      +
+      image::media/ffrc1.jpg[]
+      +
+      . Select the appropriate value for the fixed field from the menu options.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+18	18	docs/admin/MARC_RAD_MVF_CRA.txt
+16	13	docs/cataloging/MARC_Fixed_Field.txt
+27	25	docs/cataloging/physical_char_wizard.txt
+1	1	docs/opac/tpac_meta_record_holds.txt
+10	10	docs/serials/D-subscription-ASCV.txt
+
+commit 50c39d81e9f9404b2d9835c1c24e3f6ea22556f9
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Aug 7 17:37:13 2014 -0400
+
+    LP#1351355: Add release note on change to XLSX format for Excel report output
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+7	0	docs/RELEASE_NOTES_NEXT/Administration/bigger_report_outputs.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/bigger_report_outputs.txt
+
+commit af29ca42e869a66d214261c194e25848b8d585b1
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Aug 7 17:31:41 2014 -0400
+
+    LP#1351355: Use libexcel-writer-xlsx-perl package for Ubuntu Trusty
+    
+    Since Ubuntu 14.04 Trusty has a more recent packaged version of
+    libexcel-writer-xlsx-perl, use that instead of installing from CPAN
+    for Excel::Writer::XLSX.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+
+commit e19d29a330c2231dd3d10ab3652f55bef4a0aaea
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Fri Aug 1 11:26:38 2014 -0400
+
+    LP#1351355: Switch to XLSX format for Excel report output
+    
+    We've always used Spreadsheet::WriteExcel::Big to generate Excel output
+    from reports. That module has a limitation of 64k rows, imposed by the
+    binary Excel format. Recently, the Excel::Writer::XLSX module has become
+    feature-complete enough that we can use that instead, and the XML format
+    files that it writes are now supported by the majority of installed
+    versions of Excel (and OpenOffice) -- the format arrived with Excel 2007,
+    released in 2006 (8 years ago). So, let's switch to that!
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/extras/install/Makefile.debian-squeeze
+1	1	Open-ILS/src/extras/install/Makefile.debian-wheezy
+1	1	Open-ILS/src/extras/install/Makefile.fedora
+1	1	Open-ILS/src/extras/install/Makefile.ubuntu-precise
+1	1	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+4	4	Open-ILS/src/reporter/clark-kent.pl
+1	1	Open-ILS/src/support-scripts/settings-tester.pl
+
+commit 949660309b5e2496a126ab8464df30656ebb7dfe
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Aug 7 17:10:39 2014 -0400
+
+    LP#1270289 - stamping upgrade scripts for acq cancel display
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+65	0	Open-ILS/src/sql/Pg/upgrade/0888.schema.acq-cancel-display.sql
+510	0	Open-ILS/src/sql/Pg/upgrade/0889.data.acq-cancel-display.sql
+0	63	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-cancel-display.sql
+0	508	Open-ILS/src/sql/Pg/upgrade/XXXY.data.acq-cancel-display.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0888.schema.acq-cancel-display.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0889.data.acq-cancel-display.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-cancel-display.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXY.data.acq-cancel-display.sql
+
+commit 2e7dd0ec6c93aa30942ba783fee832227f701e76
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Jul 31 15:17:58 2014 -0400
+
+    LP#1270289 remove redundant lineitem cancel display
+    
+    Remove the cancel reason label displayed in the lineitem list pages
+    since the cancel reason is now displayed as the lineitem status for
+    cancelled lineitems.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+0	1	Open-ILS/src/templates/acq/common/li_table.tt2
+0	5	Open-ILS/web/js/ui/default/acq/common/li_table.js
+
+commit df206eda646b0bcf1952ab86be9ffbcb3760ef8d
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Jul 31 15:15:27 2014 -0400
+
+    LP#1270289 support canceling delayed copies
+    
+    In the PO copy grid, allow cancelled-as-delayed copies to be canceled
+    again, so that true cancelation can be achieved as needed.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/templates/acq/common/li_table.tt2
+7	0	Open-ILS/web/js/ui/default/acq/common/li_table.js
+
+commit 6861a3156e8bb9d962f2fd5b0b66285477a85e62
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Jul 31 14:45:24 2014 -0400
+
+    LP#1270289 sort ACQ cancel reason selectors
+    
+    Sort lineitem and copy cancel reasons selectors by label.  In addition
+    to being generally useful, this helps to quick differentiate between
+    delayed and canceled items in the list.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+4	2	Open-ILS/web/js/ui/default/acq/common/li_table.js
+2	1	Open-ILS/web/js/ui/default/acq/po/view_po.js
+
+commit e9199f24537a348934aaa1f15960e45cbd1e3269
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Jun 3 11:32:27 2014 -0400
+
+    LP#1270289 Release notes
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+30	0	docs/RELEASE_NOTES_NEXT/Acquisitions/delayed-vs-canceled.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/delayed-vs-canceled.txt
+
+commit 1485d56bafa63b42536be1789c3f46b9a345e125
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Jun 3 10:55:12 2014 -0400
+
+    LP#1270289 Show delay/cancel reason print PO / worksheets
+    
+    Display the cancel reason label in the print PO and lineitem worksheets.
+    
+    Note: this only applies to templates which have not been locally
+    modified.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+10	0	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+450	5	Open-ILS/src/sql/Pg/upgrade/XXXY.data.acq-cancel-display.sql
+
+commit 2db9d878b2e3eb1fa63a4ec4b7a0ca09d33ad2ad
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Jun 3 10:18:43 2014 -0400
+
+    LP#1270289 Support canceling already-canceled lineitems
+    
+    If a lineitem is canceled and the cancel_reason has keep_debits == true
+    (i.e. the lineitem is "delayed"), allow the lineitem to be canceled
+    again, up until the point the lineitem cancel_reason has keep_debits ==
+    false, at which point, no more cancelations are allowed.
+    
+    Similarly, when a copy is canceled with a keep_debits==true reason,
+    allow the copy to be canceled when its parent lineitem is canceled,
+    following the rules above.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+15	6	Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm
+13	4	Open-ILS/web/js/ui/default/acq/common/li_table.js
+
+commit fd5c1c72290429f7a16f5b10c1417b87c2dc9449
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Jun 3 09:38:46 2014 -0400
+
+    LP#1270289 Show cancel reason labels for lineitems/copies
+    
+    In the standard lineitem list page, display lineitem states as
+    translatable strings instead of displaying the raw lineitem state code.
+    Additionally, when the state is 'cancelled', display the cancel_reason
+    label instead of "cancelled" to help differentiate between canceled and
+    delayed items.
+    
+    Similarly, display the cancel reason label for canceled copies in the
+    copy edit grid.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+10	1	Open-ILS/src/templates/acq/common/li_table.tt2
+34	30	Open-ILS/web/js/ui/default/acq/common/li_table.js
+
+commit 93be423815b0ee8c4aa0946c38bb877ffbfd5195
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Jun 2 17:22:11 2014 -0400
+
+    LP#1270289 improve stock acq cancel reason labels
+    
+    Add "Delayed:" and "Canceled:" prefixes to stock labels based on their
+    keep_debits flag to better differentiate between delayed and canceled
+    items in the UI.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+14	14	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+63	0	Open-ILS/src/sql/Pg/upgrade/XXXY.data.acq-cancel-display.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXY.data.acq-cancel-display.sql
+
+commit eb51b8892784096e70dcd05c8bfd3c70934ad1da
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Jun 2 17:01:29 2014 -0400
+
+    LP#1270289 Show delay count in ACQ lineitem summary
+    
+    This affects the canned lineitem summary displayed in the lineitem
+    copies page and the invoice UI.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	1	Open-ILS/web/js/dojo/openils/acq/Lineitem.js
+1	1	Open-ILS/web/js/dojo/openils/acq/nls/acq.js
+
+commit a89c60a84e095c5ea03c564c6dd47293d98b044f
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Jun 2 16:54:01 2014 -0400
+
+    LP#1270289 Split canceled into delayed vs canceled
+    
+    The acq.lineitem_summary DB view (and related
+    acq::lineitem_summary_invoiceable IDL view) now differentitate between
+    canceled items and delayed items by inspecting the keep_debits flag on
+    the cancel reason.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	0	Open-ILS/examples/fm_IDL.xml
+8	1	Open-ILS/src/sql/Pg/200.schema.acq.sql
+63	0	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-cancel-display.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-cancel-display.sql
+
+commit 578c08032789befa6c09840a5f484c8094c7400e
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Thu Aug 7 13:40:03 2014 -0400
+
+    OpenSRF Services Update
+    
+    Updating list of Evergreen-specific OpenSRF services as of 2.6. Many
+    thanks to Galen Charlton for providing me with an updated list.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+19	8	docs/development/intro_opensrf.txt
+
+commit 31dfcab688a759655fe9c0bd3d1d1b4b3c8e3e60
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Thu Aug 7 13:36:20 2014 -0400
+
+    Docs: Improved AsciiDoc formating for tpac_meta_record_holds.txt
+    
+    Replaced curly apostrophe with a straight one. Removed manual numbered list.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+6	6	docs/opac/tpac_meta_record_holds.txt
+
+commit 3798b73a1625f4ea61dd3b206ff479cf39140317
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed Oct 9 11:36:52 2013 -0400
+
+    LP#1339190: Have Evergreen save authtoken state to support IO::Multiplex mode
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+14	3	Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
+
+commit 3ffe1142136ef6906b3a3bd968ec2b16b798ab42
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed Sep 11 16:02:24 2013 -0400
+
+    LP#1339190: support disconnection for SIP multiplex purposes
+    
+    This patch adds a disconnect method to close the OpenSRF
+    connect; this method is invoked only when the Net::Server::Multiplex
+    personality is in use.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+4	0	Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
+
+commit dc70c30e85ef5c4184be26966b2f8e7a77d94ea1
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Apr 10 13:20:17 2014 -0400
+
+    LP#1306019 move Business::Stripe to the 'force' list
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/extras/install/Makefile.debian-jessie
+
+commit 4af0f8365f2db5cb7345a4ee72b5893e7c3c3883
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Apr 10 11:39:06 2014 -0400
+
+    LP#1306019 Debian Jessie makefile.install target
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+    
+    Conflicts:
+    	Open-ILS/src/extras/Makefile.install
+    	docs/installation/server_installation.txt
+
+8	2	Open-ILS/src/extras/Makefile.install
+103	0	Open-ILS/src/extras/install/Makefile.debian-jessie
+2	2	docs/installation/server_installation.txt
+ create mode 100644 Open-ILS/src/extras/install/Makefile.debian-jessie
+
+commit cdda11af2f411a1fad7e2d571b94af80523fa2ba
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Wed Jul 9 16:34:26 2014 -0400
+
+    LP#1302207 - Attempt to validate ISBNs in AddedContent.pm.
+    
+    When getting ISBNs from the database, they often contain extra stuff
+    after the ISBN that sometimes causes problems for Business::ISBN.
+    
+    This commit attempts to resolve some of that by looking only for the
+    part of the ISBN data that resembles an ISBN and using just that part.
+    If the ISBN data doesn't look like an ISBN, then it is discarded.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+13	4	Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
+
+commit 76bb7b2329faf41e861e91a16ca69f1122d9a7d3
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date:   Fri Apr 11 16:05:07 2014 -0400
+
+    LP#1302207 - Order AddedContent identifiers
+    
+    When multiple exist coming out in a consistent order is preferred.
+    
+    In this case, use ID order.
+    
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+4	1	Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
+
+commit b69c63b9ce59a22d74d103686d57af3530436417
+Author: Erica Rohlfs <erohlfs at esilibrary.com>
+Date:   Wed Aug 6 16:08:24 2014 -0400
+
+    Docs: How to create routing list and shows address on routing list
+    
+    Signed-off-by: Erica Rohlfs <erohlfs at esilibrary.com>
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+-	-	docs/media/Added_User_to_Routing_Slip.JPG
+-	-	docs/media/Address_on_Routing_Slip.JPG
+25	0	docs/serials/D-subscription-ASCV.txt
+ create mode 100644 docs/media/Added_User_to_Routing_Slip.JPG
+ create mode 100644 docs/media/Address_on_Routing_Slip.JPG
+
+commit c901231a20260a82ab2387392bf00f8dec9a3609
+Author: Erica Rohlfs <erohlfs at esilibrary.com>
+Date:   Wed Aug 6 16:01:00 2014 -0400
+
+    Docs: How to use MARC Fixed Field Editor
+    
+    Signed-off-by: Erica Rohlfs <erohlfs at esilibrary.com>
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+40	0	docs/cataloging/MARC_Fixed_Field.txt
+-	-	docs/media/ffrc1.JPG
+-	-	docs/media/ffrc2.JPG
+-	-	docs/media/ffrc3.JPG
+2	0	docs/root.txt
+ create mode 100644 docs/cataloging/MARC_Fixed_Field.txt
+ create mode 100644 docs/media/ffrc1.JPG
+ create mode 100644 docs/media/ffrc2.JPG
+ create mode 100644 docs/media/ffrc3.JPG
+
+commit ae82e4d6419585efedbf5c5eb4eb92cb2b682e99
+Author: Erica Rohlfs <erohlfs at esilibrary.com>
+Date:   Wed Aug 6 15:56:06 2014 -0400
+
+    Docs: How to perform metarecord search and hold
+    
+    Signed-off-by: Erica Rohlfs <erohlfs at esilibrary.com>
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+-	-	docs/media/advholdoption_6.JPG
+-	-	docs/media/advsrchpg_1.JPG
+-	-	docs/media/mrholdgf_9.JPG
+-	-	docs/media/placehold_5.JPG
+-	-	docs/media/recorddetailpg_8.JPG
+-	-	docs/media/srchresultpg2_3.JPG
+-	-	docs/media/srchresultpg3_4.JPG
+-	-	docs/media/srchresultpg4_7.JPG
+-	-	docs/media/srchresultpg_2.JPG
+68	0	docs/opac/tpac_meta_record_holds.txt
+2	0	docs/root.txt
+ create mode 100644 docs/media/advholdoption_6.JPG
+ create mode 100644 docs/media/advsrchpg_1.JPG
+ create mode 100644 docs/media/mrholdgf_9.JPG
+ create mode 100644 docs/media/placehold_5.JPG
+ create mode 100644 docs/media/recorddetailpg_8.JPG
+ create mode 100644 docs/media/srchresultpg2_3.JPG
+ create mode 100644 docs/media/srchresultpg3_4.JPG
+ create mode 100644 docs/media/srchresultpg4_7.JPG
+ create mode 100644 docs/media/srchresultpg_2.JPG
+ create mode 100644 docs/opac/tpac_meta_record_holds.txt
+
+commit 1f8b86dfc70b69c12f2facc02b650bb014e3ce85
+Author: Erica Rohlfs <erohlfs at esilibrary.com>
+Date:   Wed Aug 6 15:22:32 2014 -0400
+
+    Docs: MARC Record Attribute Definitions, Multi Valued Fields, Composite Record Attributes
+    
+    Defines RADS, MVF, and CRA and explains how to modify
+    
+    Signed-off-by: Erica Rohlfs <erohlfs at esilibrary.com>
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+80	0	docs/admin/MARC_RAD_MVF_CRA.txt
+-	-	docs/media/caed_6.JPG
+-	-	docs/media/cvmpage_4.JPG
+-	-	docs/media/editrad_2.JPG
+-	-	docs/media/modifycde_7.JPG
+-	-	docs/media/radcatrue_5.JPG
+-	-	docs/media/radcvmcacolumns_3.JPG
+-	-	docs/media/radmvcolumn_1.JPG
+2	0	docs/root.txt
+ create mode 100644 docs/admin/MARC_RAD_MVF_CRA.txt
+ create mode 100644 docs/media/caed_6.JPG
+ create mode 100644 docs/media/cvmpage_4.JPG
+ create mode 100644 docs/media/editrad_2.JPG
+ create mode 100644 docs/media/modifycde_7.JPG
+ create mode 100644 docs/media/radcatrue_5.JPG
+ create mode 100644 docs/media/radcvmcacolumns_3.JPG
+ create mode 100644 docs/media/radmvcolumn_1.JPG
+
+commit aa3bed55568243127e2e54ff7b25f8226d6897bb
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Mar 17 09:19:18 2014 -0400
+
+    LP#1279998 marc stream importer release notes
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+19	0	docs/RELEASE_NOTES_NEXT/Cataloging/marc_stream_importer.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/marc_stream_importer.txt
+
+commit d0399c9af3612e8fbe761cc3e2ab118c8aa43ffb
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Fri Feb 14 12:40:00 2014 -0500
+
+    LP#1279998 marc_stream_importer option no-match import; delete repairs
+    
+    * Adds another command line option for --import-no-match, so that
+      importing non-matching records is now optional.
+    
+    * Improve vandelay response reporting to ensure that all imported
+      records get cleaned up.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3	1	Open-ILS/src/support-scripts/marc_stream_importer.pl
+
+commit 1e3e3e79ab7b5dcf62562b68f6ae398e37d96c88
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Feb 12 10:18:39 2014 -0500
+
+    LP#1279998 marc_stream_importer support alternate match strategies
+    
+    Adds support for sending auto-overlay-1match and auto-overlay-best-match
+    in addition to auto-overlay-exact to Vandelay when performing the
+    import.  If no strategy is chosen, the script still defaults to
+    auto-overlay-exact.
+    
+    These changes are managed with 3 new command line options:
+    
+    --auto-overlay-exact
+    --auto-overlay-1match
+    --auto-overlay-best-match
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+12	5	Open-ILS/src/support-scripts/marc_stream_importer.pl
+
+commit b0691c4d4c3754b2960b5f328d3b7b2ff6a63adf
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Wed Aug 6 08:47:40 2014 -0400
+
+    Docs: Fix patron registration screenshot
+    
+    The previously committed screenshot contains site-specific information
+    which is not broadly beneficial. This commit replaces it with a more
+    generic screenshot.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+-	-	docs/media/circulation_patron_records-4.png
+
+commit 101d6528b622eff30d7fcf78b6ea0becf38b3d45
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed May 14 14:43:56 2014 -0400
+
+    LP#1319519 Add to PO limits to new/pending PO's
+    
+    Limit the auto-select output of the PO name text box when adding
+    records/lineitems to existing PO's to PO's with the "new" or "pending"
+    statuses.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3	1	Open-ILS/src/templates/acq/common/add_to_po.tt2
+
+commit 7e5604cf09b5d7178edbc926b90a4d7641adc499
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Wed Aug 6 10:42:27 2014 -0400
+
+    Docs: How to use the MARC 007 Physical Characteristics Wizard
+    
+    Signed-off-by: Erica Rohlfs <erohlfs at esilibrary.com>
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+84	0	docs/cataloging/physical_char_wizard.txt
+-	-	docs/media/pcw1.JPG
+-	-	docs/media/pcw10.JPG
+-	-	docs/media/pcw11.JPG
+-	-	docs/media/pcw2.JPG
+-	-	docs/media/pcw3.JPG
+-	-	docs/media/pcw4.JPG
+-	-	docs/media/pcw5.jpg
+-	-	docs/media/pcw6.JPG
+-	-	docs/media/pcw7.JPG
+-	-	docs/media/pcw8.JPG
+-	-	docs/media/pcw9.JPG
+2	0	docs/root.txt
+ create mode 100644 docs/cataloging/physical_char_wizard.txt
+ create mode 100644 docs/media/pcw1.JPG
+ create mode 100644 docs/media/pcw10.JPG
+ create mode 100644 docs/media/pcw11.JPG
+ create mode 100644 docs/media/pcw2.JPG
+ create mode 100644 docs/media/pcw3.JPG
+ create mode 100644 docs/media/pcw4.JPG
+ create mode 100644 docs/media/pcw5.jpg
+ create mode 100644 docs/media/pcw6.JPG
+ create mode 100644 docs/media/pcw7.JPG
+ create mode 100644 docs/media/pcw8.JPG
+ create mode 100644 docs/media/pcw9.JPG
+
+commit b0c429965f1aa0de189b36139f2e12cde22f9c87
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Wed Aug 6 09:18:37 2014 -0400
+
+    Fix 030.schema.metabib.sql breakage.
+    
+    The fix for LP 1322285 introduced a change to 030.schema.metabib.sql
+    that was not only not needed, but breaks building a fresh schema.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+
+1	1	Open-ILS/src/sql/Pg/030.schema.metabib.sql
+
+commit 9bb060092ea3b358366e229a6cbd102af09ac8b5
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Tue Aug 5 11:23:20 2014 -0400
+
+    Docs: Update commands for authority importing script
+    
+    The tools used for importing authority records from the command line have
+    been modified since the original docs were written. Testing revealed these
+    changes, which are reflected in this commit.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+11	6	docs/development/support_scripts.txt
+
+commit a4d4a9eba08f73296d17dcd62ecc1800c6c532fa
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Tue Aug 5 09:29:40 2014 -0400
+
+    Docs 2.6: Update screens for register/edit patron
+    
+    Update screenshots and wording to reflect new "Update Expire Date" button.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+12	3	docs/circulation/circulation_patron_records.txt
+-	-	docs/media/circulation_patron_records-4.png
+-	-	docs/media/circulation_patron_records-9.png
+
+commit cac3518b10413e45082b0567d0a77e150057d68f
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Mon Aug 4 13:05:10 2014 -0400
+
+    Stamping upgrade script for LP 1322285.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+120	0	Open-ILS/src/sql/Pg/upgrade/0887.function.no-ff-defaults.sql
+0	118	Open-ILS/src/sql/Pg/upgrade/XXXX.function.no-ff-defaults.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0887.function.no-ff-defaults.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.no-ff-defaults.sql
+
+commit 85fd2f5230377e5bee7796887c30602f4d554e03
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Mon Aug 4 12:57:52 2014 -0400
+
+    Add release notes for the no fixed field default upgrade.
+    
+    A reingest is recommened after running the database script.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+17	0	docs/RELEASE_NOTES_NEXT/Cataloging/no-fixed-field-defaults-for-ingest.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/no-fixed-field-defaults-for-ingest.txt
+
+commit e2870476e7363d0773df7f36205506084c9bf013
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Fri Jun 20 09:29:56 2014 -0400
+
+    LP#1322285: Exclude default values for fixed fields when ingesting
+    
+    Default values for fixed fields that can exist in either 008 or 006
+    will cause search to be over-broad.  So, we avoid including those now.
+    
+    I also took the time to move the baseline schema around a bit in order
+    to keep related code in more appropriate files and avoid continuously
+    redefining functions.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+80	29	Open-ILS/src/sql/Pg/012.schema.vandelay.sql
+4	139	Open-ILS/src/sql/Pg/030.schema.metabib.sql
+118	0	Open-ILS/src/sql/Pg/upgrade/XXXX.function.no-ff-defaults.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.no-ff-defaults.sql
+
+commit 7917dc6585983ac62927642fc5c9d045fcd34c9d
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Oct 8 15:58:56 2013 -0400
+
+    LP#1348731: have SIP gateway use a login nonce
+    
+    Since multiple SIP clients may use the same credentials, avoid the
+    same-username race condition to authentication by applying a login nonce
+    value.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+3	1	Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
+
+commit 1143fc881dd4f4cefeb643c6cc80f046739c1346
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Oct 8 15:52:12 2013 -0400
+
+    LP#1348731: Optional Auth login nonce to differentiate same-username logins
+    
+    If multiple login attempts are made using the same username within a
+    very short period of time, a race condition exists where, upon
+    completion of the first login, the auth init cache data for any pending
+    logins are removed, since there can only be one instance of cached init
+    data per username.
+    
+    This adds support for allowing the caller to pass in a random string
+    which is added to the cache key as a way to differentiate between logins
+    using the same username.
+    
+    The seed is passed into auth init as an optional secondary parameter
+    and passed again (via the "nonce" argument) to auth complete to ensure
+    consistent cache keys across both interactions.
+    
+    Example:
+    
+    my $nonce = rand($$);
+    
+    my $seed = request(
+        'open-ils.auth',
+        'open-ils.auth.authenticate.init', $username, $nonce );
+    
+    my $response = request(
+        'open-ils.auth',
+        'open-ils.auth.authenticate.complete',
+        {
+            username => $username,
+            password => md5_hex($seed . md5_hex($password)),
+            type     => 'opac',
+            nonce    => $nonce
+        }
+    );
+    
+    The race condition has been observed with the SIP2 gateway when
+    multiple devices have been configured to use the same account.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+18	7	Open-ILS/src/c-apps/oils_auth.c
+
+commit e46f3323b4acb152d666b92c0ba5f4442b9ac2c0
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Jul 29 15:11:44 2014 -0400
+
+    LP#1308239 precat holds fulfillment logic repair
+    
+    In cases where there is no hold on a precat copy, avoid trying to find
+    "related" holds, in part because it's unnecessary, but also because the
+    implementation assumes a fleshed $self->volume object, which is not
+    present during precat checkout.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+3	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit 8f4d3efb029f109d3dc7dc69cf458c2834c725d6
+Author: Dan Pearl <dpearl at cwmars.org>
+Date:   Mon Nov 4 14:18:20 2013 -0500
+
+    LP#1099979 Provide facility to merge parts in the Monograph Parts display
+    
+    A new facility is provided to make it relatively simple to merge parts that should be named the same, but are
+    not.  The user will check-off the parts that need to be merged, and click on the new Merge Selected Parts
+    control, at which point the "winner" will be selected from a pop-up.
+    
+    Signed-off-by: Dan Pearl <dpearl at cwmars.org>
+    Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+20	14	Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
+1	0	Open-ILS/web/css/skin/default.css
+12	0	Open-ILS/web/css/skin/default/biblio.css
+142	0	Open-ILS/web/js/dojo/openils/biblio/monographPartMerge.js
+5	0	Open-ILS/web/js/dojo/openils/biblio/nls/biblio_messages.js
+17	0	docs/RELEASE_NOTES_NEXT/Cataloging/merge-parts.txt
+ create mode 100644 Open-ILS/web/css/skin/default/biblio.css
+ create mode 100755 Open-ILS/web/js/dojo/openils/biblio/monographPartMerge.js
+ create mode 100755 Open-ILS/web/js/dojo/openils/biblio/nls/biblio_messages.js
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/merge-parts.txt
+
+commit 946ded4283a2b3e77ae1369447cfebab750e200a
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Tue Jul 8 11:11:54 2014 -0400
+
+    LP#1339118: Ignore permission checks for "jump" context
+    
+    We don't worry about checking permissions on foreign objects when we're
+    simply using them to get a context OU for the local object permission
+    testing.  The "jump" field just gives us more layers of indirection, and
+    shouldn't cause a perm check, just like normal foreign context OUs.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	0	Open-ILS/src/c-apps/oils_sql.c
+
+commit ff25ed5095f9c7ba2f3df7e6f20ec78e45110bb3
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Mon Jul 21 09:39:41 2014 -0400
+
+    LP#1334693 make_release optional -j <osrf_js_path>
+    
+    make_release supports a "-j" option for passing in the OpenSRF JS path:
+    
+    make_release [options] -j /openils/lib/javascript
+    
+    This is useful when running make_release, specifically the staff client
+    building portion, on a machine where the OpenSRF libs are available
+    (say, from a git checkout) but osrf_config is not available because
+    OpenSRF is not actually installed.
+    
+    The script will attempt to find osrf_config and the JS path
+    automatically, so under normal circumstances, -j is not required.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+16	2	build/tools/make_release
+
+commit a5d2ba3273d03300e7d9137a1a0317fef730839d
+Author: Dan Pearl <dpearl at cwmars.org>
+Date:   Wed Nov 20 12:17:51 2013 -0500
+
+    LP#827442 Z39.50 will split the total cap between locations when multiple locations selected
+    
+    This code does a bit of oversampling, and buffers the results so that a
+    full batch of results are returned.
+    
+    In addition, the values in the hover text under "Displaying xxx of yyy records"
+    has been repaired, as it was easily confused.
+    
+    Signed-off-by: Dan Pearl <dpearl at cwmars.org>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+85	15	Open-ILS/xul/staff_client/server/cat/z3950.js
+
+commit e56eb48861a5666080ca5cdd2e72203e9620572e
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Mon Jul 14 14:57:38 2014 -0400
+
+    LP#1341703 Thinko in Batch Edit (hidden by older OpenSRFs)
+    
+    There's a bug on line 272 of O::A::Cat.pm where we called a non-existent
+    method named respond_complete on the invocant object. Instead, we need to
+    call that on the client object (spelled $conn in this method). Batch bib
+    edit won't work on new OpenSRF's until this is fixed.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
+
+commit e61a8085f9edabd97600b072c1a3ea41cd14265b
+Author: Ben Shum <bshum at biblio.org>
+Date:   Mon Jul 14 11:44:07 2014 -0400
+
+    LP#1341013: Load apache mod CGI
+    
+    As of Apache 2.4, mod CGI needs to be enabled directly and is not built
+    with apache.  So let's add it to the Makefile for Ubuntu Trusty 14.04.
+    
+    Also, add handling for disabling unwanted apache conf like serve-cgi-bin,
+    which can break offline cgi-bin script alias.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+2	0	Open-ILS/src/extras/install/Makefile.debian
+4	0	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+
+commit 0bee17b1ffd741bfcfced9ae7eb2d8d9cf59044f
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Fri Jul 11 10:57:59 2014 -0400
+
+    LP#1341013: Remove NameVirtualHost from eg.conf.in for Apache 2.4.
+    
+    NameVirtualHost does nothing in Apache 2.4 and will be removed in
+    the next release.  We might as well get rid of it now and silence
+    a warning when starting Apache.
+    
+    Signed-off-by: Jason Stephenson <jason at sigio.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+0	3	Open-ILS/examples/apache_24/eg.conf.in
+
+commit 1eaa465e86c4bb79de41550d36a2f5fd7d813f68
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Mon Jul 14 17:21:48 2014 -0400
+
+    Forward-port 2.6.2 upgrade script
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+380	0	Open-ILS/src/sql/Pg/version-upgrade/2.6.1-2.6.2-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.6.1-2.6.2-upgrade-db.sql
+
+commit c31c66e13b5c485d03fc767adad3eefef8ef72b6
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Mon Jul 14 17:18:20 2014 -0400
+
+    Forward-port 2.5.6 upgrade script
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+355	0	Open-ILS/src/sql/Pg/version-upgrade/2.5.5-2.5.6-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.5.5-2.5.6-upgrade-db.sql
+
+commit f8ee08157885b55e90bcc8800322e2e3792984e8
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Mon Jul 14 16:54:24 2014 -0400
+
+    Fix 950.data.seed-values.sql.
+    
+    Code from the lost and paid copy status was missing an argument
+    on the insert.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+1	1	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+
+commit eed53164c530fa380ac313dec24ca84a25a6699d
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Thu Jun 5 22:19:32 2014 -0400
+
+    Release notes entry for lost and paid status
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+13	0	docs/RELEASE_NOTES_NEXT/Circulation/lost-and-paid-status.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/lost-and-paid-status.txt
+
+commit 6cce3cd5e59eb2a247302467500c4b190a442586
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Mon Jul 14 08:37:30 2014 -0400
+
+    LP#1198475: Wrapping upgrade script for lost and paid copy status.
+    
+    Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+22	0	Open-ILS/src/sql/Pg/upgrade/0886.data.lost-and-paid-status.sql
+0	17	Open-ILS/src/sql/Pg/upgrade/XXXX.data.lost-and-paid-status.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0886.data.lost-and-paid-status.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.lost-and-paid-status.sql
+
+commit 64d321c68b2dde3b4e83fdca36c8ccf7acec8aba
+Author: Jason Stephenson <jason at sigio.com>
+Date:   Thu Jun 5 20:49:41 2014 -0400
+
+    LP1198475: Add a new, optional, Lost and Paid copy status.
+    
+    Add the Lost and Paid status to config.copy_status.
+    
+    Add org_unit_settig to control if the copy status is used.
+    
+    Add checks to O::A::Circ::Money::make_payments to check for LOST
+    status and org_unit setting and change the copy status to
+    Lost and Paid as appropriate.
+    
+    Also add checks for Lost and Paid copy status wherever LOST copy
+    status is used.
+    
+    Add the COPY_STATUS_LOST_AND_PAID event.
+    
+    Add the event to ils_events.xml with id 7026.
+    
+    Check for the event in circ/util.js in the staff client.
+    
+    Add pgTAP tests for the existence of the Lost and Paid copy status
+    and the new org_unit setting to control if it isused.
+    
+    Signed-off-by: Jason Stephenson <jason at sigio.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
+
+3	0	Open-ILS/src/extras/ils_events.xml
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
+4	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+37	2	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm
+2	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
+1	0	Open-ILS/src/perlmods/lib/OpenILS/Const.pm
+1	1	Open-ILS/src/perlmods/lib/OpenILS/SIP/Item.pm
+12	0	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+36	0	Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg
+17	0	Open-ILS/src/sql/Pg/upgrade/XXXX.data.lost-and-paid-status.sql
+2	0	Open-ILS/xul/staff_client/server/circ/util.js
+ create mode 100644 Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.lost-and-paid-status.sql
+
+commit 76686de7a0acd689466122a209b38d6db27e86fa
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Jul 10 16:37:00 2014 -0400
+
+    LP#1234845: Stamping upgrade script for improved evergreen.ranked_volumes()
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+100	0	Open-ILS/src/sql/Pg/upgrade/0885.function.ranked_volumes.sql
+0	98	Open-ILS/src/sql/Pg/upgrade/XXXX.function.ranked_volumes.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0885.function.ranked_volumes.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.ranked_volumes.sql
+
+commit 6f32e8f9b60bbdf8dab21bbb0c07b04f62828c83
+Author: hubert depesz lubaczewski <depesz at depesz.com>
+Date:   Thu Oct 3 14:26:33 2013 -0400
+
+    LP#1234845: Performance improvement to evergreen.ranked_volumes() database function.
+    
+    For the client I analyzed logs from production Pg instance for ~ 10
+    days.
+    
+    During this time, the single most time consuming query (summarized time
+    for all instances of the query, with different parameters) was:
+    
+    SELECT * FROM unapi.bre ( ... ) AS "unapi.bre";
+    
+    I profiled this function, and found that in my test case most of the
+    time (2.04s out of 2.06s, so ~ 99%) was spent in call to
+    unapi.holdings_xml() function.
+    
+    When I profiled this function, I found that most of the time (sorry,
+    don't have the number now with me) was spent in call to
+    evergreen.ranked_volumes() function.
+    
+    At this moment in my research something changed on the server I was
+    testing on, and all subsequent times were ~ 4-5 times lower, but the
+    ratios were more or less the same.
+    
+    Anyway - call to evergreen.ranked_volumes() showed repeatable time (with
+    full caches/buffers) of ~ 380ms.
+    
+    I modified the function by:
+    1. inlining actor.org_unit_descendants(?, ?)
+    2. inlining evergreen.rank_ou(?, ?, ?)
+    3. extracting depth calculation to separate call
+    4. switched to plpgsql (which gives me ability to use variables)
+    5. removed evergreen.rank_ou() and evergreen.rank_cp_status() from
+       select clause - these are still in WINDOW definition, but they
+       weren't used in the SELECT, so it's better to remove from there.
+    6. in passing renamed arguments to avoid name clash (argument depth vs.
+       field depth)
+    7. in passing changed usage of $* to access parameters to using named
+       parameters, for readability.
+    
+    New function did the same work in ~ 18ms.
+    
+    EDIT: Convert to SQL, keeping all of the improvements from depesz
+    EDIT2: Added Signed-off-by line for depesz, see http://markmail.org/message/rv4vaarwixeswqgu
+    
+    Signed-off-by: Hubert depesz Lubaczewski <depesz at depesz.com>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+59	13	Open-ILS/src/sql/Pg/990.schema.unapi.sql
+98	0	Open-ILS/src/sql/Pg/upgrade/XXXX.function.ranked_volumes.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.ranked_volumes.sql
+
+commit f2bcfbf40b272c125f326bf18b5f458536f2730d
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Thu Jul 10 16:10:36 2014 -0400
+
+    Force the installation of Business::Stripe on Ubuntu Trusty.
+    
+    Apparently the required force was missed in the Makefile.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+1	1	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+
+commit 2986646c02712197449e9c15474088f57b138753
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Fri May 9 14:32:14 2014 -0400
+
+    LP#1254918 limit ACQ batch update fund retrieval by perms
+    
+    In the ACQ batch update bar along the top of the PO page, limit the
+    number of funds which require permission checks on the server by
+    limiting the fund search to those at org units where the requesting user
+    has the CREATE_PURCHSE_ORDER or MANAGE_FUND permissions.
+    
+    In other words, if a user only has create-po perms at Branch 1, we can
+    specifically request funds at that branch (or below) for display so that
+    the server (PCRUD) does not have to inspect unrelated funds for
+    permissibility.  This speeds up fund retrieval.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+40	19	Open-ILS/web/js/ui/default/acq/common/li_table.js
+
+commit f9f4d186243f8cb8be0958e2e658771e3d821478
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Fri May 2 17:00:43 2014 -0400
+
+    LP#1254918: Allow skiping of user-object perms
+    
+    Previous to this commit, permissions in Evergreen check a cominbation
+    of:
+     * user-object permissions (does the user have a direct permission
+       mapping to the object in question)
+     * user-context permissions (does the user have the permission at the
+       object's context location, whose field is defined in the IDL)
+     * user-global permission (lacking a context location, does the user
+       have the permission globally (at the top of the org tree) and therefore
+       can apply the action to all objects of this typ)
+    
+    In practice, there are almost no user-object permissions.  When retrieving
+    just on object from the database, the cost of this check is negligable to
+    the point that we can completely ignore it.  However, when retrieving a
+    large set of objects, such as the list of all funds in a large, consortial
+    environment, the cost to check the user-object permission adds up to a
+    noticable amount of time.
+    
+    To address this, we add a new construct to the IDL instructing the PCRUD
+    infrastructure to skip user-object permission checking in those cases where
+    the design and use of the system makes user-specific object permissions
+    needless or superfluous.  This is embodied in a new XML attribute on the
+    <pcrud> element: ignore_object_perms.  When set to "true", pcrud will skip
+    all user-object permission checks, resulting in faster time-to-first-result.
+    
+    Additionally, we add a new "owning_user" attribute on the <action> element
+    of the <pcrud> section. This new attribute specifies the field containing
+    the actor.usr.id of the user that "owns" the object.  This allows PCRUD to
+    test ownership of an object directly, and if the requesting user and owning
+    user are the same, the action is allowed.
+    
+    Finaly, when "global_required" is "true" for the permission check, and there
+    is no "owning_user" attribute defined for the class in the IDL, we skip the
+    above-mentioned user-object permission check.  When "global_required" is
+    "false" or there is an "owning_user" attribute, we check for user permissions.
+    
+    In all cases, the "ignore_object_perms" attribute is honored, and in its
+    presence we skip non-owner user-object permissions.
+    
+    The net result is an immediate increase in speed for retrieval of objects
+    in the presence of the "global_required" attribute, and a mechanism to
+    increase the speed of specific cases of context-aware retrival by the use
+    of "ignore_object_perms".
+    
+    We use this new mechanism to speed the retrieval of fund objects in the
+    ACQ interfaces that draw available-fund dropdowns.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/examples/fm_IDL.xml
+5	0	Open-ILS/examples/permacrud.xsd
+8	0	Open-ILS/src/c-apps/oils_idl-core.c
+174	13	Open-ILS/src/c-apps/oils_sql.c
+
+commit 879b94c4998ca41585fd7dd72eb6decc325d8526
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Jun 26 10:35:38 2014 -0400
+
+    LP#1334693 ./configure avoid osrf_config without core
+    
+    Avoid the check for and use of osrf_config during Evergreen ./configure
+    when run with --disable-core.  This allows the staff client to be built
+    and, in general, for make_release to be run on a machine that does not
+    have opensrf installed (or has multiple versions).
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+20	20	configure.ac
+
+commit e4ff6afb7be2176d71241baa98500d28f226d210
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Thu Jul 3 16:20:08 2014 -0400
+
+    LP# 1337550 remove schema.org itemOffered, add price property
+    
+    We use the "offers" property to link the Product to the Offer, so there
+    is no reason to use a reciprocal "itemOffered" property to link back to
+    the Product from the Offer. The circular reference confuses some tools
+    (http://rdfa.info/play) and may complicate general processing, so let's
+    simply remove it.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+
+commit 3acadb64e75f1fe82f528869482da6ea4e871f3e
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Thu Jul 3 15:53:25 2014 -0400
+
+    LP# 1337550 Remove AggregateOffer schema.org instance
+    
+    As our record details page lists each copy as a separate Offer (well, in
+    many cases anyway, unless paging gets invoked), the AggregateOffer
+    entity is not really necessary--and using it on the same page as
+    separate Offer entities is not recommended by at least one search engine
+    (per Google https://support.google.com/webmasters/answer/146750?hl=en
+    says a given page should include "_one_ of the following: Offer or
+    Offer-aggregate").
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	8	Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
+
+commit f956df518e07abed2f153e3c33621000401a6ac5
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Mon Jul 7 09:58:01 2014 -0400
+
+    LP# 1330784: Release notes for sitemap builder
+    
+    More like documentation than release notes, but more is probably better
+    than less.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+51	0	docs/RELEASE_NOTES_NEXT/OPAC/sitemap_builder.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/sitemap_builder.txt
+
+commit 8af7e4263cd2e97e0c54dde61e78c473bcb8b64e
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Thu Jun 19 15:52:42 2014 -0400
+
+    LP#1330784 Add a sitemap generator for Evergreen
+    
+    Following the requirements at sitemaps.org, generate a
+    set of sitemaps that reflect the bib record's last edit
+    date, with 50,000 records per sitemap file.
+    
+    Users can run this script targeting different libraries
+    and generating different output filenames using the
+    documented options in the script.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/src/Makefile.am
+232	0	Open-ILS/src/support-scripts/sitemap_generator
+ create mode 100755 Open-ILS/src/support-scripts/sitemap_generator
+
+commit fb0366d23241dca92b6346d06b09679317a2a0d7
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Apr 15 16:30:19 2014 -0400
+
+    LP#1308239 support holds fulfillment on precat copies
+    
+    During checkout, allow holds on precat copies to get fulfilled.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	2	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit a1c8c3a7ade8b5f0c93af9832683bb151d3ce77f
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Tue Jun 25 09:32:48 2013 -0400
+
+    LP#1308239 Support pre-cat copy hold targeting
+    
+    Remove an unused line of code in the hold targeter which was preventing
+    targeting of pre-cat copies.
+    
+    In OpenILS::Utils::PermitHold::permit_copy_hold, neither in-db nor
+    script based hold viability checks inspect the value of the
+    "title_descriptor" field in the provided params.  Remove this field and
+    pre-cats just work.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+0	2	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+
+commit 30912a6eb2c87099bae01e13cd85c5381b7b8852
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Fri May 30 15:45:18 2014 -0400
+
+    Release notes entry for holds shelf expire change
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+6	0	docs/RELEASE_NOTES_NEXT/Circulation/holds-shelf-expire-date.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/holds-shelf-expire-date.txt
+
+commit b1e53c10ec4c98579bb7b5fd2f1686adbf6e043b
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Fri Apr 11 14:09:35 2014 -0400
+
+    LP#1306753: Only look at holds that expire before 'today'
+    
+    We should not count today when generating the hold expiration list.
+    So, we'll look for holds that expire before 'today' instead of those
+    that expire before 'now'.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+
+commit 686764a43543e1a725050d23f5cbec013d21a693
+Author: Victoria Lewis <vcamklewis at gmail.com>
+Date:   Wed May 7 13:10:19 2014 -0700
+
+    LP#1316814: Change potentially incorrect information display in hold_status.tt2
+    
+    Removed word "circulating" from patron hold status message regarding the number of copies of the material.
+    Some copies may be ON ORDER and therefore not circulating.
+    
+    Signed-off-by: Victoria Lewis <vcamklewis at gmail.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/templates/opac/parts/hold_status.tt2
+
+commit ba629d5b4567436fe1b5db37b29c631ee217959e
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Tue Jul 8 14:21:58 2014 -0400
+
+    Documentation: added release notes for LP#1327284 Display "Imported As" column
+    
+    LP#1327284 Display "Imported As" in Vandelay queue
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+12	0	docs/RELEASE_NOTES_NEXT/Cataloging/display_imported_as_in_vandelay_queue.txt
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/display_imported_as_in_vandelay_queue.txt
+
+commit aa5671b9d3cd8bab0c2a6ead3385fcfe74d86b0f
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Fri Jun 6 12:35:59 2014 -0400
+
+    LP#1327284 Display Imported As column in vandelay queue
+    
+    For Bib and Authority records which have been imported / merged /
+    overlayed, etc. into the system via Vandelay, show the record ID of the
+    catalog bib/auth record to which the record was imported.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	0	Open-ILS/src/templates/vandelay/inc/queue.tt2
+
+commit 4836d0b5f28316cf1802e437588103334523dfaa
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Jul 10 14:51:57 2014 -0400
+
+    LP#1210161: Stamping upgrade script to rename bookbag to list
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+73	0	Open-ILS/src/sql/Pg/upgrade/0884.data.rename_bookbag_to_mylist.sql
+0	73	Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0884.data.rename_bookbag_to_mylist.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql
+
+commit 7c0562b55b42af3bd7ccad8e4f87f338a2dfe511
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Wed Feb 12 10:34:51 2014 -0500
+
+    LP#1210161: Upgrade script to rename bookbag to list
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+73	0	Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql
+
+commit 3f2be6c36f423a521000f6018dd82ec975800fbe
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Wed Nov 27 15:39:11 2013 -0500
+
+    LP#1210161: Finish renaming bookbag to list
+    
+    The JSPAC bookbag feature was renamed to "Lists" in TPAC, but several
+    references still exist to "bookbag", "book bag", "Book Bag", etc. in the
+    public and staff interfaces. This commit attempts to provide simple and
+    clear replacements for the old term. In some cases "list" seems best,
+    but where the context is uncertain "book list" is used to err on the
+    side of clarity. Some of these changes may be in old code that is no
+    longer used.
+    
+    This commit also includes two minor wording changes - one to fix grammar,
+    and the second to update instructions for sharing a list.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+10	10	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+4	4	Open-ILS/src/templates/opac/myopac/lists.tt2
+1	1	Open-ILS/src/templates/opac/parts/anon_list.tt2
+1	1	Open-ILS/src/templates/opac/parts/record/body.tt2
+
+commit fcfff08a541b4ed2ed244ea4cb10d53f42128a3b
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Jul 10 14:25:18 2014 -0400
+
+    LP#1315531 Remove remaining references to Lucid from README and Makefile
+    
+    There were still a few references to Ubuntu Lucid in README and makefile
+    comments area.  Also, the Makefile itself for Lucid was still there.
+    
+    Remove these last traces forever!
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3	3	Open-ILS/src/extras/Makefile.install
+0	127	Open-ILS/src/extras/install/Makefile.ubuntu-lucid
+4	17	docs/installation/server_installation.txt
+ delete mode 100644 Open-ILS/src/extras/install/Makefile.ubuntu-lucid
+
+commit 609d9e1a5d8909f36b8230fd770a846e12c361e3
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Jul 10 13:51:50 2014 -0400
+
+    LP#1315531 Fix README asciidoc syntax
+    
+    Noticed when generating the asciidoc output to HTML there was an error in the
+    README file. This adds the proper syntax around the text blocks.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	1	docs/installation/server_installation.txt
+
+commit c49517c581cfc79b6ba0a041cef699452e365847
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Wed Jun 18 16:10:18 2014 -0400
+
+    LP#1315531 Quick clarification about which Ubuntu we mean.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+9	1	docs/installation/server_installation.txt
+
+commit 2f07808e15e59ed7509bf9432cbd8460e8482313
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Tue Jun 3 14:13:47 2014 -0400
+
+    LP#1315531 Correcting typo: "eg_host.conf" -> "eg_vhost.conf".
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	docs/installation/server_installation.txt
+
+commit 3db76b0a36733615dff24ddf9d29d312abadc512
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Sat May 31 16:25:29 2014 -0400
+
+    LP#1315531 Adding further changes to the server install docs for Ubuntu 14.04:
+    
+    - adding apache configuration instructions that adjust for the new
+    mpm_prefork module in Apache 2.4 on 14.04
+    - adding new standalone database dependency installation instructions
+    that rely on OS packages rather than CPAN where possible
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+47	21	docs/installation/server_installation.txt
+
+commit 20b4d685441d3f9ef5ef1cf9b6c0413f283e5dd9
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Thu May 29 22:17:10 2014 -0400
+
+    LP#1315531 Ben Shum pointed out an error, which I have now corrected.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	configure.ac
+
+commit 18b093b528373aff949f05ac1f8ff2188f5e948e
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Thu May 29 15:49:38 2014 -0400
+
+    LP#1315531 Change default location of libdbi libraries.
+    
+    In libdbi 0.8.4, the default installed location has changed to
+    /usr/lib/x86_64-linux-gnu/dbd/.  On the advice of Thomas Berezansky,
+    I made the new location the default and ensured that the previous
+    locations are in the fallback.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	configure.ac
+
+commit 6d84a55fca904e51a311e47f3375228f91cdd17f
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Thu Apr 3 14:22:33 2014 -0400
+
+    LP#1315531 Missed libtest-output-perl in the deb list.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+
+commit 7855a9e05f3b9127cc3d055572e8535b147147a6
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Thu Apr 3 14:11:11 2014 -0400
+
+    LP#1315531 Adding Business::Stripe; Moving CPAN stuff to debs where I can
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3	2	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+
+commit 585a721bce1fbb1bf6aa2d9da49a93172d29b34b
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Thu Apr 3 12:54:45 2014 -0400
+
+    LP#1315531 Continuing to add trusty support and remove lucid.
+    
+    Adding PostgreSQL 9.3 as the default database for 14.04.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+4	4	Open-ILS/src/extras/Makefile.install
+7	7	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+
+commit ae32938d760d8862a7cd838d5cd2caf8343db586
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Fri Feb 7 06:14:52 2014 -0500
+
+    LP#1315531 adding trusty Makefile.install, removing lucid support
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+104	0	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+ create mode 100644 Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+
+commit 28a5085fd645c9470b852c9700661dbe4cbddf18
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Wed Jul 9 15:40:00 2014 -0400
+
+    Documentation: Upgrade instructions examples
+    
+    This commit adds a note (with examples) about upgrading the database schema
+    across major versions. It also reformats a long line into multiple lines,
+    changes a NOTE to a TIP, makes a small correction, and replaces a repetitive
+    command with a short explanation.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+37	5	docs/installation/server_upgrade.txt
+
+commit e6af46466a831264dc5cab4c33ffae139a7eea73
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date:   Wed Jul 2 14:57:16 2014 -0400
+
+    Documentation: Update upgrade instruction for 2.6.1
+    
+    - Update location references for 2.6.1.
+    - Update database updates to include 2.6.1 update.
+    - Add a note regarding reingesting bib records after updates.
+    
+    Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+19	15	docs/installation/server_upgrade.txt
+
+commit 5f7531906794c9c3c2a92bfdaac4087f48b48ed5
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Wed Jul 9 17:23:49 2014 -0400
+
+    Documentation: updated some SIP content
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+17	15	docs/admin/sip_server.txt
+
+commit df806b4cf737e129e35a4f0da698d1de25eb4a84
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Tue Jul 8 21:13:07 2014 -0400
+
+    Documentation: added AsciiDoc version of old SIP docs from EG 1.6/2.0 docs
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+643	0	docs/admin/sip_server.txt
+2	0	docs/root.txt
+ create mode 100644 docs/admin/sip_server.txt
+
+commit 694d4fab48e38e661ee13828bb5da80c01acdeec
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Wed Jul 9 09:07:32 2014 -0700
+
+    LP#1339767: follow-up: Thumbs.db, not Thumbs.DB
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	.gitignore
+
+commit 1487181a6e608f30e0329879db0f60e407d5355a
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Wed Jul 9 08:47:09 2014 -0700
+
+    LP#1339767: add Thumbs.DB to .gitignore
+    
+    Removes a minor annoyance for documenters who use recent
+    versions of Windows
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	.gitignore
+
+commit ae0a65285425615d004131b5dc52cab1cdd395a9
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date:   Thu Jul 3 11:18:15 2014 -0400
+
+    Documentation: Add the authentication proxy chapter
+    
+    - Some content taken from the 2.2 release notes.
+    - Added a few steps on how to set up authentication proxy in Evergreen.
+    
+    Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+51	0	docs/admin/authentication_proxy.txt
+2	0	docs/root.txt
+ create mode 100644 docs/admin/authentication_proxy.txt
+
+commit 046ad752a5672e08d99dcffe6cdc3b15b330ccc5
+Author: Erica Rohlfs <erohlfs at esilibrary.com>
+Date:   Fri May 30 15:12:29 2014 -0400
+
+    Docs: Minor wording change
+    
+    Signed-off-by: Erica Rohlfs <erohlfs at esilibrary.com>
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+1	1	docs/serials/G-Special_issue.txt
+
+commit cbf755bd65317f6a0f84fa13a5404eb02d0c9a6d
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Fri Jun 6 11:59:58 2014 -0400
+
+    LP#968514: Revive bib/auth importing docs from 2.1, add intro
+    
+    This commit revives the following sections from the 2.1 version of the docs
+    and updates them for 2.6:
+    
+      - marc_export: Exporting Bibliographic Records into MARC files
+        - includes new options for 2.6
+      - Importing Authority Records from Command Line
+      - Importing Authority Records from the Staff Client
+    
+    The first two are included in a new section called "Support Scripts"
+    within the "Developer Resources" section, with a new intro and summary
+    of other commonly used scripts provided with Evergreen. The third section
+    is moved inside the Cataloging chapter "Batch Importing MARC Records",
+    with slight modifications to the intro to that chapter.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+43	3	docs/cataloging/batch_importing_MARC.txt
+173	0	docs/development/support_scripts.txt
+2	0	docs/root.txt
+ create mode 100644 docs/development/support_scripts.txt
+
+commit cfa4a63cbea6f801f5f09b91df745f55d839c164
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Tue Jul 1 14:58:33 2014 -0400
+
+    Documentation: added "search URL" text inside of "using OPAC" section
+    
+    Replaces temporary text that was accidentally added to the "using OPAC" section.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+41	1	docs/opac/using_the_public_access_catalog.txt
+
+commit 534e1fc65b3674ff9e591530d1336900497e191b
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Mon Jun 30 17:55:46 2014 -0400
+
+    Documentation: Added 'Using the OPAC' documentation & OPAC WCAG support mention
+    
+    Older DocBook content that covered how to do searches on the OPAC was updated
+    to use Asciidoc. Also a simple mention of the 2.6 OPAC WCAG support was added.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+-	-	docs/media/catalogue-10.png
+-	-	docs/media/catalogue-3.png
+-	-	docs/media/catalogue-5.png
+-	-	docs/media/catalogue-6.png
+-	-	docs/media/catalogue-7.png
+-	-	docs/media/catalogue-8.png
+-	-	docs/media/catalogue-9.png
+499	0	docs/opac/using_the_public_access_catalog.txt
+3	1	docs/root.txt
+ create mode 100644 docs/opac/using_the_public_access_catalog.txt
+
+commit d5eb3a361262df5388269da0038126f770d848e9
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Fri Jun 27 15:31:56 2014 -0400
+
+    Documentation for Located URI Visibility
+    
+    Documentation for the new visibility options available for Located URI's
+    in 2.6.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+158	0	docs/cataloging/cataloging_electronic_resources.txt
+2	0	docs/root.txt
+ create mode 100644 docs/cataloging/cataloging_electronic_resources.txt
+
+commit 00aa87427839b9aea42af6f0689e71bf7ed2af96
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Thu Jun 26 17:46:30 2014 -0400
+
+    Fix syntax in filter_group_selector.tt2
+    
+    Attempt to fix build breakage introduced by 7e4e9d669
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1	2	Open-ILS/src/templates/opac/parts/filter_group_selector.tt2
+
+commit 3e5d2695616622033778b21adddbb3b2566015ae
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Wed Jun 4 13:09:48 2014 -0400
+
+    LP#1326149 Use a TPAC-settable TIME_FORMAT for local time formats
+    
+    We had tried to use the format.time library setting, but that is meant
+    for Dojo which uses the Unicode formats, that are incompatible with
+    the POSIX strftime() formats required by Template::Plugin::Date.
+    
+    At the same time, we need to expose the raw machine-readable time
+    for schema.org consumers, so express that in a @content attribute.
+    
+    And we might as well use a more meaningful <time> element instead of
+    the meaningless <span>, just for good measure.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+12	0	Open-ILS/src/templates/opac/parts/config.tt2
+62	26	Open-ILS/src/templates/opac/parts/library/hours.tt2
+
+commit 51314746409abd87706206969aff829ab9817fb4
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Apr 10 17:11:21 2014 -0400
+
+    LP#1301599 improved TPAC jacket alt text
+    
+    Change "Image of Item" to "Book Cover" as it's slightly more
+    descriptive/specific.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/templates/opac/parts/result/table.tt2
+
+commit 189be482c036b9be5983b8f38ef4c2d3fec26f69
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Fri May 30 12:55:47 2014 -0400
+
+    LP#1301599 Remove duplicate title attributes
+    
+    Thanks to Ben Shum for spotting these!
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+0	1	Open-ILS/src/templates/opac/myopac/holds.tt2
+1	2	Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
+
+commit d8d6a5249b9d65ee4e9800ded9e27d9221f52507
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Apr 10 16:59:14 2014 -0400
+
+    LP#1301599 Additional TPAC facets structure markup
+    
+    Labeling facets with <h4> tags provides additional page structure for
+    screen readers in the TPAC results pages.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+7	0	Open-ILS/src/templates/opac/css/style.css.tt2
+1	1	Open-ILS/src/templates/opac/parts/result/facets.tt2
+
+commit 7f7ed3c9f027ae2fe52f767270f9f1aa2aedff1f
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Apr 10 16:49:36 2014 -0400
+
+    LP#1301599 TPAC replace aria-label with title
+    
+    As appropriate, replace aria-label attributes with traditional HTML
+    title attributes.
+    
+    For ref, from the LP entry:
+    
+    http://www.w3.org/TR/2013/WD-aria-in-html-20131003/#first-rule-of-aria-use
+    
+    "If you can use a native HTML element [HTML5] or attribute with the
+    semantics and behaviour you require already built in, instead of
+    re-purposing an element and adding an ARIA role, state or property to
+    make it accessible, then do so."
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/templates/opac/myopac/holds.tt2
+1	1	Open-ILS/src/templates/opac/parts/advanced/search.tt2
+1	1	Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
+0	1	Open-ILS/src/templates/opac/parts/myopac/base.tt2
+1	1	Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
+1	2	Open-ILS/src/templates/opac/parts/org_selector.tt2
+1	1	Open-ILS/src/templates/opac/parts/qtype_selector.tt2
+
+commit e26df3d7a87f34b04364a331867c881bc7c8d95b
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Apr 3 14:53:36 2014 -0400
+
+    LP#1301599 TPAC add missing metabib filter label
+    
+    In the quick search bar along the top.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3	2	Open-ILS/src/templates/opac/results.tt2
+
+commit 05c4eacf1e68f0220fbf230f2be7881b9a94aa81
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Apr 3 13:31:29 2014 -0400
+
+    LP#1301599 TPAC advanced search from labels
+    
+    Instead of using titles / aria-labels directly on advanced search
+    selectors, provide selector IDs so the existing text labels can be
+    turned into <labels> and linked (by id) to their form control.
+    
+    This means we only need one label per form control, which improves
+    usability from an accessibility perspective.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+11	9	Open-ILS/src/templates/opac/parts/advanced/search.tt2
+14	11	Open-ILS/src/templates/opac/parts/config.tt2
+2	1	Open-ILS/src/templates/opac/parts/org_selector.tt2
+
+commit 7e4e9d669a144e20177cfac0f9485413efab8ad6
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Apr 2 16:46:25 2014 -0400
+
+    LP#1301599 TPAC advanced search additional labels
+    
+    Provides a number of labels, primarily for select widgets, in the TPAC
+    advanced search form for improved accessibility.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+6	3	Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
+11	4	Open-ILS/src/templates/opac/parts/advanced/search.tt2
+1	1	Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
+1	0	Open-ILS/src/templates/opac/parts/filter_group_selector.tt2
+3	1	Open-ILS/src/templates/opac/parts/filtersort.tt2
+
+commit 0d9f8ce27f09d9926204f6e0ce70b014cbb5fc5a
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Apr 2 16:43:49 2014 -0400
+
+    LP#1301599 TPAC result table accessibility improvements
+    
+    * Give the main result table a screenreader-only header to describe the
+      table columns.
+    * Set the role=presentation in one of the sub-tables used only for
+      layout.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+8	0	Open-ILS/src/templates/opac/parts/result/table.tt2
+
+commit b4af2fb31556d12119f11a106ba8f423d821c8b1
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Jun 26 15:33:30 2014 -0400
+
+    LP#925776 Add placeholder script for backport to 2.5 for function staff uri visibility
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+9	0	Open-ILS/src/sql/Pg/upgrade/0883.function.staff-uri-visibility-2.5.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0883.function.staff-uri-visibility-2.5.sql
+
+commit 2c2df1e1ad80d219b14de106e9d76d3cac0c5ce5
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Jun 26 15:30:26 2014 -0400
+
+    LP#925776 Stamping upgrade script for staff uri visibility
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+370	0	Open-ILS/src/sql/Pg/upgrade/0882.function.staff-uri-visibility.sql
+0	366	Open-ILS/src/sql/Pg/upgrade/XXXX.function.staff-uri-visibility.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0882.function.staff-uri-visibility.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.staff-uri-visibility.sql
+
+commit 55520fd63ebc6f6273be96dc85aca917faad9586
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Fri May 2 09:42:28 2014 -0400
+
+    LP#925776 Adding upgrade script
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+366	0	Open-ILS/src/sql/Pg/upgrade/XXXX.function.staff-uri-visibility.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.staff-uri-visibility.sql
+
+commit a61c0c4ff2be9ac1da903f7109a0c90893f88b4f
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Fri May 2 09:10:09 2014 -0400
+
+    LP#925776: Recheck located uri visibility
+    
+    Previous to this commit, once we have determined that there are no
+    local Located URIs or foreign copies, we include the record in the
+    result set in the staff client.  However, the desire of library staff
+    is that foreign Located URIs be valid as a visibility limiter.  So
+    we now recheck at the end for that situation.  This honors the new
+    "Located URIs act like copies" global flag.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+19	1	Open-ILS/src/sql/Pg/300.schema.staged_search.sql
+
+commit 65307dea427c4e006da6035699ee2201e9065cb0
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Fri Jun 6 09:19:58 2014 -0400
+
+    Forward port 2.5.5 and 2.6.1 upgrade scripts
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+78	0	Open-ILS/src/sql/Pg/version-upgrade/2.5.4-2.5.5-upgrade-db.sql
+78	0	Open-ILS/src/sql/Pg/version-upgrade/2.6.0-2.6.1-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.5.4-2.5.5-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.6.0-2.6.1-upgrade-db.sql
+
+commit d1cb0e79e74a2c49d297f1f177dd309090e91c14
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Thu Jun 5 20:27:39 2014 -0400
+
+    LP#1303544 Trim junk from the ISBN in record summary
+    
+    When asserting that we are publishing an ISBN, move the "(pbk.)"
+    and similar such matter outside of the schema.org <span property="isbn">
+    element.
+    
+    See "The walking dead" in the sample dataset for an example.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+9	2	Open-ILS/src/templates/opac/parts/record/summary.tt2
+
+commit 1a9e623ab0d0b841961afaa0a9810a24b8e98f19
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Thu Jun 5 15:16:23 2014 -0700
+
+    LP#1326983: excluded fulfilled holds when adding hold_request.shelf_expires_soon events
+    
+    This patch adjusts the example A/T filter for the
+    hold_request.shelf_expires_soon hook to exclude hold requests that are
+    already marked as fulfilled.  This saves time creating events that
+    would immediately be marked as invalid per the HoldIsAvailable
+    validator.
+    
+    It also addresses an issue for large databases that have lots of
+    fulfilled holds wherein hold_request.shelf_expires_soon events can
+    fail to be added at all due to a cstore timeout.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	1	Open-ILS/examples/action_trigger_filters.json.example
+
+commit 66836d67afa947e11dab9b8e010780ce261202f0
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu Jun 5 09:47:36 2014 -0400
+
+    LP#1326806 Minor repairs to EDI admin documentation
+    
+    Updates to EDI account Path/Incoming/Account docs.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+5	4	docs/admin/acquisitions_admin.txt
+7	6	docs/admin_initial_setup/ordering_materials.txt
+
+commit 53b5adf0cf8098ec761f3b14c30d7789f9c6c942
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date:   Tue Feb 25 12:41:56 2014 -0800
+
+    LP#1284832: Add missing seed data: enable combined search for only the subject class by default
+    
+    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3	0	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+
+commit b102ce25d6340648af38fce160dc5be3a38e04fa
+Author: Dan Pearl <dpearl at cwmars.org>
+Date:   Tue May 20 13:12:47 2014 -0400
+
+    LP#1321363: Suppress Hold Transit use elicits client error
+    
+    This change restores the behavior as designed.
+    
+    Signed-off-by: Dan Pearl <dpearl at cwmars.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit d4c04196352306f4c02fb8200782dc327e4c6aac
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Thu May 29 09:15:01 2014 -0400
+
+    Forward port 2.5.4 upgrade script
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+79	0	Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.5.4-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.5.4-upgrade-db.sql
+
+commit b5ddc813a281b62e98efda801f1b6a7115e6c2ee
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Tue May 20 10:09:08 2014 -0700
+
+    LP#1296937: move the $force_bc parameter of ->charged_items() to an implementation method
+    
+    Argubably, the $force_bc parameter of OpenILS::SIP::Patron->charged_items()
+    method exists solely as an implementation convenience for the renew-all
+    code.  Consequently, this patch removes the $force_bc parameter from the
+    public interface for charged_items() and spins it off into a new
+    implementation method.
+    
+    This patch should be applied at the same time that a reversion of
+    SIPServer commit c97d64412bc is applied.  Note that a user who upgrades
+    SIPServer without upgrading Evergreen to a version that contains this
+    patch will end up in a situation where the code that counts active
+    loans for the patron information response will fetch the loans using
+    $force_bc set to true; this works only by coincidence.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Jeff Godin <jgodin at tadl.org>
+
+8	1	Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+1	1	Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm
+
+commit 4897a05e8ca1a037eaab392e72a88ae6706fa94c
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Tue May 20 10:37:30 2014 -0400
+
+    LP#1321017: Order constituent records by quality
+    
+    Previously, in some cases (often needlessly) we ordered constituent
+    records within a metarecord by a combination of type/form/blvl.  This
+    is not only of little use, but also expensive.  Instead, order them
+    by the bib's calculated quality, which takes type/form/blvl into account
+    already.
+    
+    Also, use the new metabib.record_sorter to find the title tie-breaker
+    instead of using the view-of-a-view-of-a-view mrd compatability shim.
+    
+    The net result is several orders of magnitude speed increase for
+    constituent record retrieval.  In particular, this resolves a problem
+    where doing a SIP2 patron information lookup and requesting a list
+    of holds could cause a timeout if the patron has one or more
+    metarecord holds.
+    
+    This patch also causes the format filter parameter of the following
+    methods to be ignored:
+    
+    open-ils.search.biblio.metarecord_to_records*
+    open-ils.search.biblio.metarecord.mods_slim.batch.retrieve*
+    open-ils.search.biblio.metarecord.mods_slim.retrieve*
+    
+    Since the only use of the format filter was in JSPac code, and since
+    the record attributes mechanism has changed considerably, this removal
+    should be considered intentional.
+    
+    Note that this patch includes a squash of a minor follow-up by Galen
+    Charlton to remove variables made unused by the original patch.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    
+    (for minor follow-up by Galen)
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+36	149	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm
+
+commit c3327de4c99c19e98266a026457b3c07cfe7febe
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed May 14 11:54:47 2014 -0400
+
+    LP#1310751: Reorder query-building wrapper for QueryParser
+    
+    In order to make sure that the transparent boolean pushdown does
+    not cause filters and modifiers to end up deeply embedded in the
+    query tree, we put them at the front.
+    
+    This is a short-term fix.  Long-term, we need to make use of the
+    floating subquery syntax ( {{ ... }} ) available in QueryParser,
+    which is designed to address the semantic separation between what
+    the user types into the search box, and the various UI widgets that
+    can add query clauses.
+    
+    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+19	22	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm
+
+commit e3e264ad948df150906def7591cf306b899dd871
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Thu May 22 14:41:17 2014 -0400
+
+    LP#1322303 cleanse backdate for checkin overdue voiding
+    
+    Passing raw backdates, particularly from offline transactions, which
+    have a space between the date and time, to
+    DateTime::Format::ISO8601->parse_datetime results in "Invalid date
+    format:" errors.  Pass the date through the cleanse routine first.
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
+
+commit 1e26344d218c7a14aa9eed543b2086e2dcf39d10
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Thu Apr 24 10:09:08 2014 -0400
+
+    Fix 2.6 Release Notes typos and formatting
+    
+    This commit fixes an AsciiDoc URL processing bug by marking two fake URLs
+    as lines of code. It also fixes a few small typos and misspellings.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+5	5	docs/RELEASE_NOTES_2_6.txt
+
+commit e40f3979a25388863154351fe054ae20dd473c79
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Wed Apr 23 09:52:25 2014 -0400
+
+    Update docs to point to 2.6 release notes
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+1	1	docs/root.txt
+
+commit 2788a5c72a4e22ce1de91ff023c2e20f9e58fe71
+Author: Erica Rohlfs <erohlfs at esilibrary.com>
+Date:   Fri May 23 14:00:16 2014 -0400
+
+    (documentation) fixed typo.
+    
+    Signed-off-by: Erica Rohlfs <erohlfs at esilibrary.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	docs/admin/actiontriggers.txt
+
+commit d286fbecb77f94624e9663c20bdf6fd001d44a99
+Author: Josh Stompro <Stomproj at larl.org>
+Date:   Wed May 21 08:37:58 2014 -0500
+
+    (doc) 'debian-wheezy' was left out of the OS options
+    
+    Just added 'debian-wheezy' to the OS options, it was left out by mistake.
+    
+    Signed-off-by: Josh Stompro <Stomproj at larl.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	docs/installation/server_installation.txt
+
+commit 926ac84aed08322344fa2cb4124deebdbd5c554b
+Author: Josh Stompro <Stomproj at larl.org>
+Date:   Mon May 19 15:17:15 2014 -0500
+
+    (doc) add overdues to summary of the phone list feature
+    
+    Added "or overdues" to the summary so it is clear that phonelist
+    handles both holds and overdues.
+    
+    Signed-off-by: Josh Stompro <Stomproj at larl.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	docs/admin/phonelist.txt
+
+commit 5beaf3ae96250320417a4c634dc5dbd34f90308d
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Thu May 22 11:24:41 2014 -0400
+
+    LP#1314920 Stamping upgrade script
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+9	0	Open-ILS/src/sql/Pg/upgrade/0881.data.YAOUS-desc-update.sql
+0	9	Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0881.data.YAOUS-desc-update.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql
+
+commit 4dbe9b1746ed929520b4f0006d2904cfe564d365
+Author: Jason Etheridge <jason at esilibrary.com>
+Date:   Thu May 1 04:15:55 2014 -0400
+
+    LP#1314920 change the desc for the org hiding setting
+    
+    so that it references physical_loc instead of ol
+    
+    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1	1	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+9	0	Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql
+
+commit 0575262008f19f16e9da5b1d56d0d9e7be884695
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Fri Mar 7 13:56:25 2014 -0500
+
+    Remove buggy, unused function get_leaders_from_usergroup
+    
+    Recent editing and testing of get_leaders_from_usergroup() uncovered an
+    unrelated bug which renders the function useless (it returns all group
+    members, not just the leader). It wasn't previously caught because
+    Evergreen has no apparent references to this function. This commit
+    removes the unused function.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+0	27	Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/UserGroups.pm
+
+commit e2261fe4fed56d9347583f98a7808d1bd7d009e8
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Tue May 20 11:42:32 2014 -0700
+
+    LP#1321411: restore ability to handle credit payments using a processor other than Stripe
+    
+    This patch ensures that the processor name is passed
+    to OpenILS::Application::Circ::CreditCard::process_payment, avoiding
+    an exception thrown by Business::OnlinePayment.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1	0	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm
+
+commit 1ed5744ea0c457faedfbccb2c411978e1284e6e2
+Author: Jeff Godin <jgodin at tadl.org>
+Date:   Wed Oct 30 14:37:10 2013 -0400
+
+    LP#1246843: Don't show contact invalidators for new users
+    
+    Don't show contact invalidator buttons for new users. This affects
+    staged users and cloned users, where the contact fields have a value
+    when the editor initially loads.
+    
+    Signed-off-by: Jeff Godin <jgodin at tadl.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3	1	Open-ILS/web/js/ui/default/actor/user/register.js
+
+commit 4e84fd93e902bda272f77338234c82dad857038a
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Tue May 20 14:30:20 2014 -0400
+
+    LP#1321429: Use server-local time as best-guess
+    
+    When first calculating the shelf expire time, we assume "now" as
+    the starting point by calling DateTime->now().  However, that gives
+    us the time in UTC.  That's not good because closed dates are stored
+    timezone-aware.  Instead, ask for server-local time.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+
+commit e174630d6c666dcfe55d78147398978a9ad26295
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Thu May 1 13:47:46 2014 -0400
+
+    LP#1314902: Restore header bar styles on results pages
+    
+    Commit fc99f4f2 made an incomplete style change, changing
+    'results_header_bar' to be a class, but not changing the CSS.  The
+    simplest solution is to restore 'results_header_bar' to be an id, as
+    this fixes the main view, the responsive view, and also any custom CSS
+    which might affect this id.
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	Open-ILS/src/templates/opac/results.tt2
+
+commit 4df12a913c2b9ca16e734dc965e58fffdb512d0f
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Tue May 20 16:48:57 2014 -0700
+
+    LP#1312945: pin schema update
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+68	0	Open-ILS/src/sql/Pg/upgrade/0880.function.authority.calculate_authority_linking.sql
+0	68	Open-ILS/src/sql/Pg/upgrade/XXXX.function.authority.calculate_authority_linking.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0880.function.authority.calculate_authority_linking.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.authority.calculate_authority_linking.sql
+
+commit 73aff257cd74adba93a954fce0c5d4cb51ce227c
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Tue May 20 16:46:02 2014 -0700
+
+    LP#1312945: add regression test
+    
+    This adds a test for the change to the
+    authority.calculate_authority_linking stored function.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+59	0	Open-ILS/src/sql/Pg/t/regress/lp1312945_auth_linking.pg
+ create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp1312945_auth_linking.pg
+
+commit e7e973193a702441c390586c3a6f3e6762c55e69
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed Apr 30 18:38:29 2014 -0400
+
+    LP#1312945: baseline schema update
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Srey Seng <sreyseng at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+24	14	Open-ILS/src/sql/Pg/999.functions.global.sql
+
+commit 663715d525dd21959cea463a705c619220b3afdd
+Author: Srey Seng <sreyseng at gmail.com>
+Date:   Wed Apr 30 15:20:17 2014 -0700
+
+    LP#1312945: authority.calculate_authority_linking and multiple linked tags
+    
+    The function "authority.calculate_authority_linking" was not able to deal with
+    situations where there are multiple marc tags that are linkable. The function
+    only process the first tag that contains a linking_subfield and returns that
+    to be inserted into the authority_linking table, even when there are more than
+    one of the same tag with linking_subfield.
+    
+    Added an additional loop to loop through each tag, for situations where there are
+    multiples of each tag.
+    
+    Signed-off-by: Srey Seng <sreyseng at gmail.com>
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+68	0	Open-ILS/src/sql/Pg/upgrade/XXXX.function.authority.calculate_authority_linking.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.authority.calculate_authority_linking.sql
+
+commit 89f8e98846f4defbde632abafdb2a019151d6088
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed Apr 30 12:58:11 2014 -0400
+
+    LP#1312945: auth-auth linking: cache less agressively and look for all links
+    
+    There was a logic inversion that was causing miss-use of a per-
+    record cache mechanism.  I remove that entirely, as it's not helpful
+    in practice.
+    
+    Also, after finding one use of a linked field we moved on to the
+    next, though it is possible for more than one link to exist for
+    different uses of a name, say.  Now we'll loop through all fields
+    to find all possible linkages.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Srey Seng <sreyseng at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+22	23	Open-ILS/src/support-scripts/authority_authority_linker.pl.in
+
+commit 2f27b78cf93e33b784f50f0c4ea5d71583532da7
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Tue May 20 08:46:47 2014 -0700
+
+    LP#1296937: (follow-up) make $ids_only be the last parameter for ->charged_items()
+    
+    This change ensures that if a site fails to upgrade SIPServer at the
+    same time that they upgrade Evergreen, the renew all message won't
+    break on them.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+2	2	Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+1	1	Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm
+
+commit 9ce8743646d30396dc6090f98be618d8bbec25f3
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date:   Thu Jan 23 12:07:06 2014 -0500
+
+    LP#1296937: (SIP2) Add ids_only parameter to _items functions
+    
+    This allows the caller to skip loading of barcodes and/or titles when
+    they are not needed, such as when the plan is to return counts, not
+    details.  Per bug 1321017, this is particular useful for patrons
+    that have metarecord holds.
+    
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+20	9	Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+1	1	Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm
+
+commit 148449c8c574461635009eb25687a08b1692da95
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Fri May 16 10:40:49 2014 -0700
+
+    LP#1320048: remove the Date.W3CDTF() JavaScript module
+    
+    With the closed dates editor now using util.date, and
+    no other active use of Date.W3CDTF() going on, it can go.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+0	132	Open-ILS/web/opac/common/js/Date.W3CDTF.js
+0	3	Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
+0	1	Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
+ delete mode 100644 Open-ILS/web/opac/common/js/Date.W3CDTF.js
+
+commit 1990e6f2e26cc8bf46798f29e7a50ebeedadebb2
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Fri May 16 10:35:01 2014 -0700
+
+    LP#1320048: remove last use of Date.W3CDTF() from closed dates editor
+    
+    To test, verify that the closed dates editor continues to
+    function normally, i.e.,
+    
+    * single all-day closures can be added
+    * a multi-day closing can be added
+    * one can set a "detailed closing" with a custom start
+      time and end time
+    * existing closures are display properly
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+3	3	Open-ILS/xul/staff_client/server/admin/closed_dates.js
+3	1	Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+
+commit 6d747f95e8c88775b6b2b3cecbc757a1455165d7
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Fri May 16 10:03:45 2014 -0700
+
+    LP#1320048: correctly display closures in the closed dates editor
+    
+    This patch fixes a problem introduced by the patch for bug 1187035
+    that caused the closed dates editor to display all closures as if
+    they started and ended at the current time.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+16	25	Open-ILS/xul/staff_client/server/admin/closed_dates.js
+1	0	Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+
+commit ba0e6c0b09d763e1fef0685c03aa169e4d6562d7
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Apr 10 23:16:41 2014 -0400
+
+    Documentation for adding OpenSearch to Firefox
+    
+    With some sample screenshots!
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+-	-	docs/media/opensearch1.png
+-	-	docs/media/opensearch2.png
+-	-	docs/media/opensearch3.png
+-	-	docs/media/opensearch4.png
+31	0	docs/opac/opensearch.txt
+2	0	docs/root.txt
+ create mode 100644 docs/media/opensearch1.png
+ create mode 100644 docs/media/opensearch2.png
+ create mode 100644 docs/media/opensearch3.png
+ create mode 100644 docs/media/opensearch4.png
+ create mode 100644 docs/opac/opensearch.txt
+
+commit 0c159dff820720fb560dcf88ab8cdb0aab2b27b6
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Wed May 14 17:03:38 2014 -0400
+
+    Move authority.record_entry trigger changes out of transaction
+    
+    This should prevent 'cannot ALTER TABLE "record_entry" because it has
+    pending trigger events' errors.
+    
+    This is the same approach used in the original 0875 script, but we
+    might also work around the problem with a well-placed
+    SET CONSTRAINTS ALL IMMEDIATE;
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+21	14	Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql
+
+commit 82a656943c6ac116e74847149c03b363c5744962
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Wed May 14 17:49:51 2014 -0400
+
+    Preserve script version from 2.6.0
+    
+    The forward-port had some fixes, so revert those (to be reapplied
+    in the next commit) to better show fix history for 2.6.1.
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+14	21	Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql
+
+commit bcf542d948619c9781d657e8fb13fbd64fb2a7be
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Wed May 14 17:44:03 2014 -0400
+
+    Forward-port 2.6.0 version upgrade script
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+5858	0	Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql
+
+commit c04958b12b5ea91c68a41b891d1443fd868c9400
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Thu May 8 17:37:07 2014 -0400
+
+    Documentation: add a 'where' clause to bib record import stored procedure
+    
+    The stored procedure for doing bib record import was lacking a 'where'
+    clause in one of the update statements.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+2	1	docs/admin_initial_setup/migrating_your_data.txt
+
+commit 34c2878082127a35bc4a6064ab95274b983ca02c
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Thu May 1 17:32:36 2014 -0400
+
+    Fix for docs on library information pages
+    
+    Fixes an AsciiDoc URL processing error.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+2	2	docs/opac/linked_libraries.txt
+
+commit 7b759a453dd036f9a5813d76dd5f4b35f62df71b
+Author: Hekman Library Technology Team <libsysadmin at calvin.edu>
+Date:   Tue Apr 22 15:37:17 2014 -0400
+
+    Docs 2.6: Lost Item Billing Min/Max Price Settings
+    
+    Add a short description for the new 2.6 feature "Lost Item Billing: New
+    Min/Max Price Settings" to the only section where it seems to fit, and it
+    seems obscure and hard to find. It could be useful to create a new, more
+    prominent section for common Org Unit Settings, possibly organized by
+    category. Sending this via GitHub to test the new Docs workflow.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+4	0	docs/admin_initial_setup/borrowing_items.txt
+
+commit 88b85a8321fa519662c6890e9cfb5b176315c123
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Wed Apr 30 11:57:16 2014 -0400
+
+    Documentation: added missing word to 'library settings editor' docs
+    
+    Added "editor" to label of what menu should be used.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+1	1	docs/admin/lsa-library_settings_editor.txt
+
+commit e7957e6ca408692d4e64055213818e6a0e00f73b
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Wed Apr 30 10:53:27 2014 -0400
+
+    Documentation: Removed bare setting names from Stripe payment doc
+    
+    Per jboyer-isl's suggestions
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+0	9	docs/admin/lsa-library_settings_editor.txt
+
+commit 09fbc004969b4c642df3352907da361686dc21e7
+Author: Yamil Suarez <yamil at yamil.com>
+Date:   Wed Apr 30 10:22:42 2014 -0400
+
+    Documentation: Copied Stripe payment info into 'Library Settings Editor'
+    
+    Only modified slightly from the documentation provided in the EG 2.6
+    release notes.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+39	0	docs/admin/lsa-library_settings_editor.txt
+
+commit 22d3dcfd57d1ed1c2ed7813ca3e39f5cd571b34e
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Sun Apr 27 02:43:16 2014 -0400
+
+    Library information pages
+    
+    Updating the linked libraries documentation to include details on the new
+    library information pages introduced in 2.6.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+38	14	docs/opac/linked_libraries.txt
+
+commit ebe8cf27027b990723d6956a11bdc508ffe66bda
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Sun Apr 27 00:48:36 2014 -0400
+
+    Linked libraries docs
+    
+    Documentation to the 2.5 feature that allows sites to add links in the
+    catalog from copy details area of the catalog.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+23	0	docs/opac/linked_libraries.txt
+2	0	docs/root.txt
+ create mode 100644 docs/opac/linked_libraries.txt
+
+commit d9604850f60f10ee619e0e0bf1b5f08faf1f08a1
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Apr 24 20:58:17 2014 -0400
+
+    Only create extension intarray if it does not already exist
+    
+    Simple change to skip over adding intarray if it already exists in a database
+    for some reason.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/upgrade/0864.MVF_CRA-upgrade.sql
+
+commit f6bb7916c865d0f7b0843b73dd89a8479b4be4bc
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date:   Tue Apr 22 09:20:20 2014 -0400
+
+    LP#1310283: Propogate .staff through Z3950 searches
+    
+    So that local catalog Z3950 searches don't only show opac visible bibs.
+    
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+4	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
+
+commit 3665b7c34fffd76cb3b4aa6756ba477f6ff8075a
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Wed Apr 23 01:45:43 2014 -0400
+
+    LP#1311467: fix heading validation in bib editor
+    
+    This patch fixes a regression whereby clicking the validate button
+    in the bib editor would result in no headings getting checked.
+    
+    In the process, it enables 'startwith' to be used as a JSON query
+    operator for all types of predicates, not just the results of
+    transformed values.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+2	0	Open-ILS/examples/fm_IDL.xml
+21	4	Open-ILS/src/c-apps/oils_sql.c
+
+commit cfd5d5219c1d8b43fc6e6d87e496e09384f6f919
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Wed Apr 16 09:56:53 2014 -0400
+
+    Compile and Tweak Release Notes for 2.6.0
+    
+    Also, add '.txt' to template name, since our build process expects
+    and uses that extension.
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+557	0	docs/RELEASE_NOTES_2_6.txt
+0	18	docs/RELEASE_NOTES_NEXT/Administration/staff-initials.txt
+0	98	docs/RELEASE_NOTES_NEXT/Cataloging/fixed_fields_enhancements.txt
+0	39	docs/RELEASE_NOTES_NEXT/Cataloging/marc_export_replacement.txt
+0	24	docs/RELEASE_NOTES_NEXT/Circulation/lost_min_max_item_pricing.txt
+0	17	docs/RELEASE_NOTES_NEXT/Circulation/user_editor_update_expire_date_button.txt
+0	40	docs/RELEASE_NOTES_NEXT/OPAC/Composite_Record_Attributes.txt
+0	13	docs/RELEASE_NOTES_NEXT/OPAC/Disable_Autosuggest.txt
+0	21	docs/RELEASE_NOTES_NEXT/OPAC/Located_URI_visibility.txt
+0	45	docs/RELEASE_NOTES_NEXT/OPAC/Multi_Valued_fields.txt
+0	5	docs/RELEASE_NOTES_NEXT/OPAC/OpenSearch.txt
+0	33	docs/RELEASE_NOTES_NEXT/OPAC/TPAC_library_pages.txt
+0	38	docs/RELEASE_NOTES_NEXT/OPAC/TPAC_metarecords.txt
+0	8	docs/RELEASE_NOTES_NEXT/OPAC/WCAG.txt
+0	36	docs/RELEASE_NOTES_NEXT/OPAC/stripe_payments.txt
+0	18	docs/RELEASE_NOTES_NEXT/RELEASE_NOTE_TEMPLATE
+18	0	docs/RELEASE_NOTES_NEXT/RELEASE_NOTE_TEMPLATE.txt
+3	46	docs/RELEASE_NOTES_NEXT/_acknowledgments
+0	21	docs/RELEASE_NOTES_NEXT/removal_of_ingest.txt
+ create mode 100644 docs/RELEASE_NOTES_2_6.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/staff-initials.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/fixed_fields_enhancements.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/marc_export_replacement.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/lost_min_max_item_pricing.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/user_editor_update_expire_date_button.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/Composite_Record_Attributes.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/Disable_Autosuggest.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/Located_URI_visibility.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/Multi_Valued_fields.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/OpenSearch.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/TPAC_library_pages.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/TPAC_metarecords.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/WCAG.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/stripe_payments.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/RELEASE_NOTE_TEMPLATE
+ create mode 100644 docs/RELEASE_NOTES_NEXT/RELEASE_NOTE_TEMPLATE.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/removal_of_ingest.txt
+
+commit 4128a12cfe52b74718f125428bc9de90785ad525
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Tue Apr 22 11:34:07 2014 -0400
+
+    Grab an up-to-date relator code list. Thanks, LoC!
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+269	0	Open-ILS/src/extras/relators.tsv
+ create mode 100644 Open-ILS/src/extras/relators.tsv
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..2ce1395 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
 sub ils_version {
     # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
     # For branches, format is "x-y"
-    return "HEAD";
+    return "2-7-0-beta1";
 }
 
 __PACKAGE__->register_method(
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 2278f15..99908c3 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0889', :eg_version); -- berick/kmlussier/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.0-beta1', :eg_version);
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-beta1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-beta1-upgrade-db.sql
new file mode 100644
index 0000000..7bf2179
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-beta1-upgrade-db.sql
@@ -0,0 +1,765 @@
+--Upgrade Script for 2.6 to 2.7.0-beta1
+\set eg_version '''2.7.0-beta1'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.0-beta1', :eg_version);
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0884', :eg_version);
+
+UPDATE container.biblio_record_entry_bucket_type
+SET label = oils_i18n_gettext(
+	'bookbag',
+	'Book List',
+	'cbrebt',
+	'label'
+) WHERE code = 'bookbag';
+
+UPDATE container.user_bucket_type
+SET label = oils_i18n_gettext(
+	'folks:pub_book_bags.view',
+	'List Published Book Lists',
+	'cubt',
+	'label'
+) WHERE code = 'folks:pub_book_bags.view';
+
+UPDATE container.user_bucket_type
+SET label = oils_i18n_gettext(
+	'folks:pub_book_bags.add',
+	'Add to Published Book Lists',
+	'cubt',
+	'label'
+) WHERE code = 'folks:pub_book_bags.add';
+
+UPDATE action_trigger.hook
+SET description = oils_i18n_gettext(
+	'container.biblio_record_entry_bucket.csv',
+	'Produce a CSV file representing a book list',
+	'ath',
+	'description'
+) WHERE key = 'container.biblio_record_entry_bucket.csv';
+
+UPDATE action_trigger.reactor
+SET description = oils_i18n_gettext(
+	'ContainerCSV',
+	'Facilitates producing a CSV file representing a book list by introducing an "items" variable into the TT environment, sorted as dictated according to user params',
+	'atr',
+	'description'
+)
+WHERE module = 'ContainerCSV';
+
+UPDATE action_trigger.event_definition
+SET template = REPLACE(template, 'bookbag', 'book list'),
+name = 'Book List CSV'
+WHERE name = 'Bookbag CSV';
+
+UPDATE config.org_unit_setting_type
+SET description = oils_i18n_gettext(
+	'opac.patron.temporary_list_warn',
+	'Present a warning dialog to the patron when a patron adds a book to a temporary book list.',
+	'coust',
+	'description'
+) WHERE name = 'opac.patron.temporary_list_warn';
+
+UPDATE config.usr_setting_type
+SET label = oils_i18n_gettext(
+	'opac.default_list',
+	'Default list to use when adding to a list',
+	'cust',
+	'label'
+),
+description = oils_i18n_gettext(
+	'opac.default_list',
+	'Default list to use when adding to a list',
+	'cust',
+	'description'
+) WHERE name = 'opac.default_list';
+
+
+SELECT evergreen.upgrade_deps_block_check('0885', :eg_version);
+
+CREATE OR REPLACE FUNCTION evergreen.ranked_volumes(
+    bibid BIGINT[],
+    ouid INT,
+    depth INT DEFAULT NULL,
+    slimit HSTORE DEFAULT NULL,
+    soffset HSTORE DEFAULT NULL,
+    pref_lib INT DEFAULT NULL,
+    includes TEXT[] DEFAULT NULL::TEXT[]
+) RETURNS TABLE(id BIGINT, name TEXT, label_sortkey TEXT, rank BIGINT) AS $$
+    WITH RECURSIVE ou_depth AS (
+        SELECT COALESCE(
+            $3,
+            (
+                SELECT depth
+                FROM actor.org_unit_type aout
+                    INNER JOIN actor.org_unit ou ON ou_type = aout.id
+                WHERE ou.id = $2
+            )
+        ) AS depth
+    ), descendant_depth AS (
+        SELECT  ou.id,
+                ou.parent_ou,
+                out.depth
+        FROM  actor.org_unit ou
+                JOIN actor.org_unit_type out ON (out.id = ou.ou_type)
+                JOIN anscestor_depth ad ON (ad.id = ou.id),
+                ou_depth
+        WHERE ad.depth = ou_depth.depth
+            UNION ALL
+        SELECT  ou.id,
+                ou.parent_ou,
+                out.depth
+        FROM  actor.org_unit ou
+                JOIN actor.org_unit_type out ON (out.id = ou.ou_type)
+                JOIN descendant_depth ot ON (ot.id = ou.parent_ou)
+    ), anscestor_depth AS (
+        SELECT  ou.id,
+                ou.parent_ou,
+                out.depth
+        FROM  actor.org_unit ou
+                JOIN actor.org_unit_type out ON (out.id = ou.ou_type)
+        WHERE ou.id = $2
+            UNION ALL
+        SELECT  ou.id,
+                ou.parent_ou,
+                out.depth
+        FROM  actor.org_unit ou
+                JOIN actor.org_unit_type out ON (out.id = ou.ou_type)
+                JOIN anscestor_depth ot ON (ot.parent_ou = ou.id)
+    ), descendants as (
+        SELECT ou.* FROM actor.org_unit ou JOIN descendant_depth USING (id)
+    )
+
+    SELECT ua.id, ua.name, ua.label_sortkey, MIN(ua.rank) AS rank FROM (
+        SELECT acn.id, aou.name, acn.label_sortkey,
+            RANK() OVER w
+        FROM asset.call_number acn
+            JOIN asset.copy acp ON (acn.id = acp.call_number)
+            JOIN descendants AS aou ON (acp.circ_lib = aou.id)
+        WHERE acn.record = ANY ($1)
+            AND acn.deleted IS FALSE
+            AND acp.deleted IS FALSE
+            AND CASE WHEN ('exclude_invisible_acn' = ANY($7)) THEN
+                EXISTS (
+                    SELECT 1
+                    FROM asset.opac_visible_copies
+                    WHERE copy_id = acp.id AND record = acn.record
+                ) ELSE TRUE END
+        GROUP BY acn.id, acp.status, aou.name, acn.label_sortkey, aou.id
+        WINDOW w AS (
+            ORDER BY
+                COALESCE(
+                    CASE WHEN aou.id = $2 THEN -20000 END,
+                    CASE WHEN aou.id = $6 THEN -10000 END,
+                    (SELECT distance - 5000
+                        FROM actor.org_unit_descendants_distance($6) as x
+                        WHERE x.id = aou.id AND $6 IN (
+                            SELECT q.id FROM actor.org_unit_descendants($2) as q)),
+                    (SELECT e.distance FROM actor.org_unit_descendants_distance($2) as e WHERE e.id = aou.id),
+                    1000
+                ),
+                evergreen.rank_cp_status(acp.status)
+        )
+    ) AS ua
+    GROUP BY ua.id, ua.name, ua.label_sortkey
+    ORDER BY rank, ua.name, ua.label_sortkey
+    LIMIT ($4 -> 'acn')::INT
+    OFFSET ($5 -> 'acn')::INT;
+$$ LANGUAGE SQL STABLE ROWS 10;
+
+CREATE OR REPLACE FUNCTION evergreen.ranked_volumes
+    ( bibid BIGINT, ouid INT, depth INT DEFAULT NULL, slimit HSTORE DEFAULT NULL, soffset HSTORE DEFAULT NULL, pref_lib INT DEFAULT NULL, includes TEXT[] DEFAULT NULL::TEXT[] )
+    RETURNS TABLE (id BIGINT, name TEXT, label_sortkey TEXT, rank BIGINT)
+    AS $$ SELECT * FROM evergreen.ranked_volumes(ARRAY[$1],$2,$3,$4,$5,$6,$7) $$ LANGUAGE SQL STABLE;
+
+
+SELECT evergreen.upgrade_deps_block_check('0886', :eg_version);
+
+INSERT INTO config.copy_status
+(id, name, holdable, opac_visible, copy_active, restrict_copy_delete)
+VALUES (17, 'Lost and Paid', FALSE, FALSE, FALSE, TRUE);
+
+INSERT INTO config.org_unit_setting_type
+(name, grp, label, description, datatype)
+VALUES
+('circ.use_lost_paid_copy_status',
+ 'circ',
+ oils_i18n_gettext('circ.use_lost_paid_copy_status',
+     'Use Lost and Paid copy status',
+     'coust', 'label'),
+ oils_i18n_gettext('circ.use_lost_paid_copy_status',
+     'Use Lost and Paid copy status when lost or long overdue billing is paid',
+     'coust', 'description'),
+ 'bool');
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0888', :eg_version);
+
+DROP VIEW acq.lineitem_summary;
+
+CREATE VIEW acq.lineitem_summary AS
+    SELECT 
+        li.id AS lineitem, 
+        (
+            SELECT COUNT(lid.id) 
+            FROM acq.lineitem_detail lid
+            WHERE lineitem = li.id
+        ) AS item_count,
+        (
+            SELECT COUNT(lid.id) 
+            FROM acq.lineitem_detail lid
+            WHERE recv_time IS NOT NULL AND lineitem = li.id
+        ) AS recv_count,
+        (
+            SELECT COUNT(lid.id) 
+            FROM acq.lineitem_detail lid
+                JOIN acq.cancel_reason acqcr ON (acqcr.id = lid.cancel_reason)
+            WHERE acqcr.keep_debits IS FALSE AND lineitem = li.id
+        ) AS cancel_count,
+        (
+            SELECT COUNT(lid.id) 
+            FROM acq.lineitem_detail lid
+                JOIN acq.cancel_reason acqcr ON (acqcr.id = lid.cancel_reason)
+            WHERE acqcr.keep_debits IS TRUE AND lineitem = li.id
+        ) AS delay_count,
+        (
+            SELECT COUNT(lid.id) 
+            FROM acq.lineitem_detail lid
+                JOIN acq.fund_debit debit ON (lid.fund_debit = debit.id)
+            WHERE NOT debit.encumbrance AND lineitem = li.id
+        ) AS invoice_count,
+        (
+            SELECT COUNT(DISTINCT(lid.id)) 
+            FROM acq.lineitem_detail lid
+                JOIN acq.claim claim ON (claim.lineitem_detail = lid.id)
+            WHERE lineitem = li.id
+        ) AS claim_count,
+        (
+            SELECT (COUNT(lid.id) * li.estimated_unit_price)::NUMERIC(8,2)
+            FROM acq.lineitem_detail lid
+            WHERE lid.cancel_reason IS NULL AND lineitem = li.id
+        ) AS estimated_amount,
+        (
+            SELECT SUM(debit.amount)::NUMERIC(8,2)
+            FROM acq.lineitem_detail lid
+                JOIN acq.fund_debit debit ON (lid.fund_debit = debit.id)
+            WHERE debit.encumbrance AND lineitem = li.id
+        ) AS encumbrance_amount,
+        (
+            SELECT SUM(debit.amount)::NUMERIC(8,2)
+            FROM acq.lineitem_detail lid
+                JOIN acq.fund_debit debit ON (lid.fund_debit = debit.id)
+            WHERE NOT debit.encumbrance AND lineitem = li.id
+        ) AS paid_amount
+
+        FROM acq.lineitem AS li;
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0889', :eg_version);
+
+-- Update ACQ cancel reason names, but only those that 
+-- have not already been locally modified from stock values.
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Canceled: Invalid ISBN', 'acqcr', 'label')
+    WHERE id = 1 AND label = 'invalid_isbn';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Canceled: Postpone', 'acqcr', 'label')
+    WHERE id = 2 AND label = 'postpone';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: Delivered but Lost', 'acqcr', 'label')
+    WHERE id = 3 AND label = 'delivered_but_lost';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Canceled: Deleted', 'acqcr', 'label')
+    WHERE id = 1002 AND label = 'Deleted';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: Changed', 'acqcr', 'label')
+    WHERE id = 1003 AND label = 'Changed';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: No Action', 'acqcr', 'label')
+    WHERE id = 1004 AND label = 'No action';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: Accepted without amendment', 'acqcr', 'label')
+    WHERE id = 1005 AND label = 'Accepted without amendment';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Canceled: Not Accepted', 'acqcr', 'label')
+    WHERE id = 1007 AND label = 'Not accepted';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Canceled: Not Found', 'acqcr', 'label')
+    WHERE id = 1010 AND label = 'Not found';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: Accepted with amendment', 'acqcr', 'label')
+    WHERE id = 1024 AND label = 'Accepted with amendment, no confirmation required';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: Split Quantity', 'acqcr', 'label')
+    WHERE id = 1211 AND label = 'Split quantity';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: Ordered Quantity', 'acqcr', 'label')
+    WHERE id = 1221 AND label = 'Ordered quantity';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: Pieces Delivered', 'acqcr', 'label')
+    WHERE id = 1246 AND label = 'Pieces delivered';
+
+UPDATE acq.cancel_reason 
+    SET label = oils_i18n_gettext(1,'Delayed: Backorder', 'acqcr', 'label')
+    WHERE id = 1283 AND label = 'Backorder quantity';
+
+-- action/trigger additions
+-- All following changes are only applied where the source data matches
+-- the stock data.  IOW, if a template has been locally modified, 
+-- it's left unchanged.
+
+DO $$
+BEGIN
+    -- avoid collisions by testing for the presence of the 
+    -- desired environment addition.
+
+    PERFORM 1 FROM action_trigger.environment
+        WHERE event_def = 4 AND path = 'lineitems.cancel_reason';
+    IF NOT FOUND THEN 
+        INSERT INTO action_trigger.environment (event_def, path) 
+            VALUES (4, 'lineitems.cancel_reason');
+    END IF;
+
+    PERFORM 1 FROM action_trigger.environment
+        WHERE event_def = 14 AND path = 'cancel_reason';
+    IF NOT FOUND THEN 
+        INSERT INTO action_trigger.environment (event_def, path) 
+            VALUES ( 14, 'cancel_reason' );
+    END IF;
+
+    PERFORM 1 FROM action_trigger.environment
+        WHERE event_def = 14 AND path = 'lineitem_details.cancel_reason';
+    IF NOT FOUND THEN 
+        INSERT INTO action_trigger.environment (event_def, path) 
+            VALUES ( 14, 'lineitem_details.cancel_reason' );
+    END IF;
+END $$;
+
+UPDATE action_trigger.event_definition SET template = 
+$$
+[%- USE date -%]
+[%-
+    # find a lineitem attribute by name and optional type
+    BLOCK get_li_attr;
+        FOR attr IN li.attributes;
+            IF attr.attr_name == attr_name;
+                IF !attr_type OR attr_type == attr.attr_type;
+                    attr.attr_value;
+                    LAST;
+                END;
+            END;
+        END;
+    END
+-%]
+
+<h2>Purchase Order: [% target.name %] ([% target.id %])</h2>
+<br/>
+date <b>[% date.format(date.now, '%Y%m%d') %]</b>
+<br/>
+
+<style>
+    table td { padding:5px; border:1px solid #aaa;}
+    table { width:95%; border-collapse:collapse; }
+    #vendor-notes { padding:5px; border:1px solid #aaa; }
+</style>
+<table id='vendor-table'>
+  <tr>
+    <td valign='top'>Vendor</td>
+    <td>
+      <div>[% target.provider.name %]</div>
+      <div>[% target.provider.addresses.0.street1 %]</div>
+      <div>[% target.provider.addresses.0.street2 %]</div>
+      <div>[% target.provider.addresses.0.city %]</div>
+      <div>[% target.provider.addresses.0.state %]</div>
+      <div>[% target.provider.addresses.0.country %]</div>
+      <div>[% target.provider.addresses.0.post_code %]</div>
+    </td>
+    <td valign='top'>Ship to / Bill to</td>
+    <td>
+      <div>[% target.ordering_agency.name %]</div>
+      <div>[% target.ordering_agency.billing_address.street1 %]</div>
+      <div>[% target.ordering_agency.billing_address.street2 %]</div>
+      <div>[% target.ordering_agency.billing_address.city %]</div>
+      <div>[% target.ordering_agency.billing_address.state %]</div>
+      <div>[% target.ordering_agency.billing_address.country %]</div>
+      <div>[% target.ordering_agency.billing_address.post_code %]</div>
+    </td>
+  </tr>
+</table>
+
+<br/><br/>
+<fieldset id='vendor-notes'>
+    <legend>Notes to the Vendor</legend>
+    <ul>
+    [% FOR note IN target.notes %]
+        [% IF note.vendor_public == 't' %]
+            <li>[% note.value %]</li>
+        [% END %]
+    [% END %]
+    </ul>
+</fieldset>
+<br/><br/>
+
+<table>
+  <thead>
+    <tr>
+      <th>PO#</th>
+      <th>ISBN or Item #</th>
+      <th>Title</th>
+      <th>Quantity</th>
+      <th>Unit Price</th>
+      <th>Line Total</th>
+      <th>Delayed / Canceled</th>
+      <th>Notes</th>
+    </tr>
+  </thead>
+  <tbody>
+
+  [% subtotal = 0 %]
+  [% FOR li IN target.lineitems %]
+
+  <tr>
+    [% count = li.lineitem_details.size %]
+    [% price = li.estimated_unit_price %]
+    [% litotal = (price * count) %]
+    [% subtotal = subtotal + litotal %]
+    [% 
+        ident_attr = helpers.get_li_order_ident(li.attributes);
+        SET ident_value = ident_attr.attr_value IF ident_attr;
+    %]
+    <td>[% target.id %]</td>
+    <td>[% ident_value %]</td>
+    <td>[% PROCESS get_li_attr attr_name = 'title' %]</td>
+    <td>[% count %]</td>
+    <td>[% price %]</td>
+    <td>[% litotal %]</td>
+    <td>[% li.cancel_reason.label %]</td>
+    <td>
+        <ul>
+        [% FOR note IN li.lineitem_notes %]
+            [% IF note.vendor_public == 't' %]
+                <li>[% note.value %]</li>
+            [% END %]
+        [% END %]
+        </ul>
+    </td>
+  </tr>
+  [% END %]
+  <tr>
+    <td/><td/><td/><td/>
+    <td>Subtotal</td>
+    <td>[% subtotal %]</td>
+  </tr>
+  </tbody>
+</table>
+
+<br/>
+
+Total Line Item Count: [% target.lineitems.size %]
+$$
+WHERE id = 4 AND template = 
+$$
+[%- USE date -%]
+[%-
+    # find a lineitem attribute by name and optional type
+    BLOCK get_li_attr;
+        FOR attr IN li.attributes;
+            IF attr.attr_name == attr_name;
+                IF !attr_type OR attr_type == attr.attr_type;
+                    attr.attr_value;
+                    LAST;
+                END;
+            END;
+        END;
+    END
+-%]
+
+<h2>Purchase Order: [% target.name %] ([% target.id %])</h2>
+<br/>
+date <b>[% date.format(date.now, '%Y%m%d') %]</b>
+<br/>
+
+<style>
+    table td { padding:5px; border:1px solid #aaa;}
+    table { width:95%; border-collapse:collapse; }
+    #vendor-notes { padding:5px; border:1px solid #aaa; }
+</style>
+<table id='vendor-table'>
+  <tr>
+    <td valign='top'>Vendor</td>
+    <td>
+      <div>[% target.provider.name %]</div>
+      <div>[% target.provider.addresses.0.street1 %]</div>
+      <div>[% target.provider.addresses.0.street2 %]</div>
+      <div>[% target.provider.addresses.0.city %]</div>
+      <div>[% target.provider.addresses.0.state %]</div>
+      <div>[% target.provider.addresses.0.country %]</div>
+      <div>[% target.provider.addresses.0.post_code %]</div>
+    </td>
+    <td valign='top'>Ship to / Bill to</td>
+    <td>
+      <div>[% target.ordering_agency.name %]</div>
+      <div>[% target.ordering_agency.billing_address.street1 %]</div>
+      <div>[% target.ordering_agency.billing_address.street2 %]</div>
+      <div>[% target.ordering_agency.billing_address.city %]</div>
+      <div>[% target.ordering_agency.billing_address.state %]</div>
+      <div>[% target.ordering_agency.billing_address.country %]</div>
+      <div>[% target.ordering_agency.billing_address.post_code %]</div>
+    </td>
+  </tr>
+</table>
+
+<br/><br/>
+<fieldset id='vendor-notes'>
+    <legend>Notes to the Vendor</legend>
+    <ul>
+    [% FOR note IN target.notes %]
+        [% IF note.vendor_public == 't' %]
+            <li>[% note.value %]</li>
+        [% END %]
+    [% END %]
+    </ul>
+</fieldset>
+<br/><br/>
+
+<table>
+  <thead>
+    <tr>
+      <th>PO#</th>
+      <th>ISBN or Item #</th>
+      <th>Title</th>
+      <th>Quantity</th>
+      <th>Unit Price</th>
+      <th>Line Total</th>
+      <th>Notes</th>
+    </tr>
+  </thead>
+  <tbody>
+
+  [% subtotal = 0 %]
+  [% FOR li IN target.lineitems %]
+
+  <tr>
+    [% count = li.lineitem_details.size %]
+    [% price = li.estimated_unit_price %]
+    [% litotal = (price * count) %]
+    [% subtotal = subtotal + litotal %]
+    [% 
+        ident_attr = helpers.get_li_order_ident(li.attributes);
+        SET ident_value = ident_attr.attr_value IF ident_attr;
+    %]
+    <td>[% target.id %]</td>
+    <td>[% ident_value %]</td>
+    <td>[% PROCESS get_li_attr attr_name = 'title' %]</td>
+    <td>[% count %]</td>
+    <td>[% price %]</td>
+    <td>[% litotal %]</td>
+    <td>
+        <ul>
+        [% FOR note IN li.lineitem_notes %]
+            [% IF note.vendor_public == 't' %]
+                <li>[% note.value %]</li>
+            [% END %]
+        [% END %]
+        </ul>
+    </td>
+  </tr>
+  [% END %]
+  <tr>
+    <td/><td/><td/><td/>
+    <td>Subtotal</td>
+    <td>[% subtotal %]</td>
+  </tr>
+  </tbody>
+</table>
+
+<br/>
+
+Total Line Item Count: [% target.lineitems.size %]
+$$;
+
+-- lineitem worksheet
+UPDATE action_trigger.event_definition SET template =
+$$
+[%- USE date -%]
+[%- SET li = target; -%]
+<div class="wrapper">
+    <div class="summary" style='font-size:110%; font-weight:bold;'>
+
+        <div>Title: [% helpers.get_li_attr("title", "", li.attributes) %]</div>
+        <div>Author: [% helpers.get_li_attr("author", "", li.attributes) %]</div>
+        <div class="count">Item Count: [% li.lineitem_details.size %]</div>
+        <div class="lineid">Lineitem ID: [% li.id %]</div>
+        <div>Open Holds: [% helpers.bre_open_hold_count(li.eg_bib_id) %]</div>
+        [% IF li.cancel_reason.label %]
+        <div>[% li.cancel_reason.label %]</div>
+        [% END %]
+
+        [% IF li.distribution_formulas.size > 0 %]
+            [% SET forms = [] %]
+            [% FOREACH form IN li.distribution_formulas; forms.push(form.formula.name); END %]
+            <div>Distribution Formulas: [% forms.join(',') %]</div>
+        [% END %]
+
+        [% IF li.lineitem_notes.size > 0 %]
+            Lineitem Notes:
+            <ul>
+                [%- FOR note IN li.lineitem_notes -%]
+                    <li>
+                    [% IF note.alert_text %]
+                        [% note.alert_text.code -%] 
+                        [% IF note.value -%]
+                            : [% note.value %]
+                        [% END %]
+                    [% ELSE %]
+                        [% note.value -%] 
+                    [% END %]
+                    </li>
+                [% END %]
+            </ul>
+        [% END %]
+    </div>
+    <br/>
+    <table>
+        <thead>
+            <tr>
+                <th>Branch</th>
+                <th>Barcode</th>
+                <th>Call Number</th>
+                <th>Fund</th>
+                <th>Shelving Location</th>
+                <th>Recd.</th>
+                <th>Notes</th>
+                <th>Delayed / Canceled</th>
+            </tr>
+        </thead>
+        <tbody>
+        <!-- set detail.owning_lib from fm object to org name -->
+        [% FOREACH detail IN li.lineitem_details %]
+            [% detail.owning_lib = detail.owning_lib.shortname %]
+        [% END %]
+
+        [% FOREACH detail IN li.lineitem_details.sort('owning_lib') %]
+            [% 
+                IF detail.eg_copy_id;
+                    SET copy = detail.eg_copy_id;
+                    SET cn_label = copy.call_number.label;
+                ELSE; 
+                    SET copy = detail; 
+                    SET cn_label = detail.cn_label;
+                END 
+            %]
+            <tr>
+                <!-- acq.lineitem_detail.id = [%- detail.id -%] -->
+                <td style='padding:5px;'>[% detail.owning_lib %]</td>
+                <td style='padding:5px;'>[% IF copy.barcode   %]<span class="barcode"  >[% detail.barcode   %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% IF cn_label %]<span class="cn_label" >[% cn_label  %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% IF detail.fund %]<span class="fund">[% detail.fund.code %] ([% detail.fund.year %])</span>[% END %]</td>
+                <td style='padding:5px;'>[% copy.location.name %]</td>
+                <td style='padding:5px;'>[% IF detail.recv_time %]<span class="recv_time">[% detail.recv_time %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% detail.note %]</td>
+                <td style='padding:5px;'>[% detail.cancel_reason.label %]</td>
+            </tr>
+        [% END %]
+        </tbody>
+    </table>
+</div>
+$$
+WHERE id = 14 AND template = 
+$$
+[%- USE date -%]
+[%- SET li = target; -%]
+<div class="wrapper">
+    <div class="summary" style='font-size:110%; font-weight:bold;'>
+
+        <div>Title: [% helpers.get_li_attr("title", "", li.attributes) %]</div>
+        <div>Author: [% helpers.get_li_attr("author", "", li.attributes) %]</div>
+        <div class="count">Item Count: [% li.lineitem_details.size %]</div>
+        <div class="lineid">Lineitem ID: [% li.id %]</div>
+        <div>Open Holds: [% helpers.bre_open_hold_count(li.eg_bib_id) %]</div>
+
+        [% IF li.distribution_formulas.size > 0 %]
+            [% SET forms = [] %]
+            [% FOREACH form IN li.distribution_formulas; forms.push(form.formula.name); END %]
+            <div>Distribution Formulas: [% forms.join(',') %]</div>
+        [% END %]
+
+        [% IF li.lineitem_notes.size > 0 %]
+            Lineitem Notes:
+            <ul>
+                [%- FOR note IN li.lineitem_notes -%]
+                    <li>
+                    [% IF note.alert_text %]
+                        [% note.alert_text.code -%] 
+                        [% IF note.value -%]
+                            : [% note.value %]
+                        [% END %]
+                    [% ELSE %]
+                        [% note.value -%] 
+                    [% END %]
+                    </li>
+                [% END %]
+            </ul>
+        [% END %]
+    </div>
+    <br/>
+    <table>
+        <thead>
+            <tr>
+                <th>Branch</th>
+                <th>Barcode</th>
+                <th>Call Number</th>
+                <th>Fund</th>
+                <th>Shelving Location</th>
+                <th>Recd.</th>
+                <th>Notes</th>
+            </tr>
+        </thead>
+        <tbody>
+        <!-- set detail.owning_lib from fm object to org name -->
+        [% FOREACH detail IN li.lineitem_details %]
+            [% detail.owning_lib = detail.owning_lib.shortname %]
+        [% END %]
+
+        [% FOREACH detail IN li.lineitem_details.sort('owning_lib') %]
+            [% 
+                IF detail.eg_copy_id;
+                    SET copy = detail.eg_copy_id;
+                    SET cn_label = copy.call_number.label;
+                ELSE; 
+                    SET copy = detail; 
+                    SET cn_label = detail.cn_label;
+                END 
+            %]
+            <tr>
+                <!-- acq.lineitem_detail.id = [%- detail.id -%] -->
+                <td style='padding:5px;'>[% detail.owning_lib %]</td>
+                <td style='padding:5px;'>[% IF copy.barcode   %]<span class="barcode"  >[% detail.barcode   %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% IF cn_label %]<span class="cn_label" >[% cn_label  %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% IF detail.fund %]<span class="fund">[% detail.fund.code %] ([% detail.fund.year %])</span>[% END %]</td>
+                <td style='padding:5px;'>[% copy.location.name %]</td>
+                <td style='padding:5px;'>[% IF detail.recv_time %]<span class="recv_time">[% detail.recv_time %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% detail.note %]</td>
+            </tr>
+        [% END %]
+        </tbody>
+    </table>
+</div>
+$$;
+
+
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index 2737f47..51719d9 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -1,7 +1,7 @@
 <html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
 <h1 style="text-decoration: underline">Evergreen</h1>
 <p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_7_0_beta1</p>
 <h2>What is Evergreen?</h2>
 <blockquote>
 <p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..51d56e7 100644
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main");
 pref("open-ils.enable_join_tabs", true);
 
 // We'll use this one to help brand some build information into the client, and rely on subversion keywords
-pref("open-ils.repository.headURL","$HeadURL$");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_7_0_beta1");
 pref("open-ils.repository.author","$Author$");
 pref("open-ils.repository.revision","$Revision$");
 pref("open-ils.repository.date","$Date$");
diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi
index a954357..31ae06e 100644
--- a/Open-ILS/xul/staff_client/windowssetup.nsi
+++ b/Open-ILS/xul/staff_client/windowssetup.nsi
@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 ; Old versions of makensis don't like this, moved to Makefile
 ;!define /file PRODUCT_VERSION "client/VERSION"
-!define PRODUCT_TAG "Master"
+!define PRODUCT_TAG "2.7"
 !define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}"
 !define UI_IMAGESET "beta"
 ;!define UI_IMAGESET "release"
diff --git a/README b/README
deleted file mode 120000
index b57451a..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.txt
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..b8aa148
--- /dev/null
+++ b/README
@@ -0,0 +1,619 @@
+Installing the Evergreen server
+===============================
+:toc:
+:numbered:
+
+Preamble: referenced user accounts
+----------------------------------
+
+In subsequent sections, we will refer to a number of different accounts, as
+follows:
+
+  * Linux user accounts:
+    ** The *user* Linux account is the account that you use to log onto the
+       Linux system as a regular user.
+    ** The *root* Linux account is an account that has system administrator
+       privileges. On Debian and Fedora you can switch to this account from
+       your *user* account by issuing the `su -` command and entering the
+       password for the *root* account when prompted. On Ubuntu you can switch
+       to this account from your *user* account using the `sudo su -` command
+       and entering the password for your *user* account when prompted.
+    ** The *opensrf* Linux account is an account that you create when installing
+       OpenSRF. You can switch to this account from the *root* account by
+       issuing the `su - opensrf` command.
+    ** The *postgres* Linux account is created automatically when you install
+       the PostgreSQL database server. You can switch to this account from the
+       *root* account by issuing the `su - postgres` command.
+  * PostgreSQL user accounts:
+    ** The *evergreen* PostgreSQL account is a superuser account that you will
+       create to connect to the PostgreSQL database server.
+  * Evergreen administrator account:
+    ** The *egadmin* Evergreen account is an administrator account for
+       Evergreen that you will use to test connectivity and configure your
+       Evergreen instance.
+
+Preamble: developer instructions
+--------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must install some extra packages
+and perform one step before they can proceed with the `./configure` step.
+
+As the *root* Linux account, install the following packages:
+
+  * autoconf
+  * automake
+  * libtool
+
+As the *user* Linux account, issue the following command in the Evergreen
+source directory to generate the configure script and Makefiles:
+
+[source, bash]
+------------------------------------------------------------------------------
+autoreconf -i
+------------------------------------------------------------------------------
+
+Installing prerequisites
+------------------------
+
+Evergreen has a number of prerequisite packages that must be installed
+before you can successfully configure, compile, and install Evergreen.
+
+1. Begin by installing the most recent version of OpenSRF (2.3.0 or later).
+   You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On many distributions, it is necessary to install PostgreSQL 9 from external
+   repositories.
++
+  * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the
+    *root* Linux account and add the following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+deb http://backports.debian.org/debian-backports squeeze-backports main contrib
+------------------------------------------------------------------------------
++
+  * Ubuntu Precise and Trusty comes with PostgreSQL 9+, so no additional steps are required.
+  * Fedora comes with PostgreSQL 9, so no additional steps are required.
++
+3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to
+   retrieve the new packages from the backports repository.
+4. Issue the following commands as the *root* Linux account to install
+   prerequisites using the `Makefile.install` prerequisite installer,
+   substituting `debian-jessie`, `debian-wheezy`, `debian-squeeze`, `fedora`, 
+   `ubuntu-trusty`, or `ubuntu-precise` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+5. Add the libdbi-libdbd libraries to the system dynamic library path by
+   issuing the following commands as the *root* Linux account:
++
+[NOTE]
+You should skip this step if installing on Ubuntu Precise or Trusty. The ubuntu
+targets use libdbd-pgsql from packages.
++
+.Debian
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
++
+.Fedora
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+   command as the *root* Linux account to install Evergreen, build the server
+   portion of the staff client, and copy example configuration files to
+   `/openils/conf`.
+   Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+   of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_2_7_0_beta1 install
+------------------------------------------------------------------------------
++
+2. The server portion of the staff client expects `http://hostname/xul/server`
+   to resolve. Issue the following commands as the *root* Linux account to
+   create a symbolic link pointing to the `server` subdirectory of the server
+   portion of the staff client that we just built using the staff client ID
+   'rel_name':
++
+[source, bash]
+------------------------------------------------------------------------------
+cd /openils/var/web/xul
+ln -sf rel_name/server server
+------------------------------------------------------------------------------
+
+Change ownership of the Evergreen files
+---------------------------------------
+
+All files in the `/openils/` directory and subdirectories must be owned by the
+`opensrf` user. Issue the following command as the *root* Linux account to
+change the ownership on the files:
+
+[source, bash]
+------------------------------------------------------------------------------
+chown -R opensrf:opensrf /openils
+------------------------------------------------------------------------------
+
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
+Configure the Apache Web server
+-------------------------------
+
+1. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian and Ubuntu Precise
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf       /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup    /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf       /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup    	/etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf       /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup          /etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------
++
+2. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+3. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+  a. To enable access to the offline upload / execute interface from any
+     workstation on any network, make the following change (and note that
+     you *must* secure this for a production instance):
+     * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+     * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+  b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+     to `/etc/httpd/`.
+4. Change the user for the Apache server.
+  * (Debian and Ubuntu): As the *root* Linux account, edit
+    `/etc/apache2/envvars`.  Change `export APACHE_RUN_USER=www-data` to 
+    `export APACHE_RUN_USER=opensrf`.
+  * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`.
+    Change `User apache` to `User opensrf`.
+5. Configure Apache with performance settings appropriate for Evergreen:
+  * (Debian and Ubuntu): As the *root* Linux account, edit
+    `/etc/apache2/apache2.conf`:
+  * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`:
+    a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of
+       a request timing out unexpectedly, but increase the risk of using up
+       all available Apache child processes.
+    b. 'Optional': Change `MaxKeepAliveRequests` to `100`
+    c. (Debian, Ubuntu Precise, and Fedora) Update the prefork configuration 
+       section to suit your environment. The following settings apply to a busy 
+       system:
++
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+   StartServers           20
+   MinSpareServers         5
+   MaxSpareServers        15
+   MaxClients            150
+   MaxRequestsPerChild 10000
+</IfModule>
+------------------------------------------------------------------------------
+    d. (Ubuntu Trusty) As the *root* user, edit 
+       /etc/apache2/mods-available/mpm_prefork.conf to match the above values.  
+       Then, also as the *root* user, enable the mpm_prefork module by doing:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf`
+   file to change references from the non-existent `/etc/apache2/` directory
+   to `/etc/httpd/`.
+7. (Debian and Ubuntu Precise): As the *root* Linux account, enable the Evergreen site:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite default  # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default  # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+8. (Ubuntu): As the *root* Linux account, enable Apache to write
+   to the lock directory; this is currently necessary because Apache
+   is running as the `opensrf` user:
++
+[source,bash]
+------------------------------------------------------------------------------
+chown opensrf /var/lock/apache2
+------------------------------------------------------------------------------
+
+Configure OpenSRF for the Evergreen application
+-----------------------------------------------
+There are a number of example OpenSRF configuration files in `/openils/conf/`
+that you can use as a template for your Evergreen installation. Issue the
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml
+cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
+------------------------------------------------------------------------------
+
+When you installed OpenSRF, you created four Jabber users on two
+separate domains and edited the `opensrf_core.xml` file accordingly. Please
+refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the
+Evergreen version of the `opensrf_core.xml` file using the same Jabber users
+and domains as you used while installing and testing OpenSRF.
+
+[NOTE]
+The `-b` flag tells the `cp` command to create a backup version of the
+destination file. The backup version of the destination file has a tilde (`~`)
+appended to the file name, so if you have forgotten the Jabber users and
+domains, you can retrieve the settings from the backup version of the files.
+
+`eg_db_config`, described in the following section, sets the database
+connection information in `opensrf.xml` for you.
+
+Creating the Evergreen database
+-------------------------------
+
+Setting up the PostgreSQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For production use, most libraries install the PostgreSQL database server on a
+dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
+installer does *not* install the PostgreSQL 9 database server that is required
+by every Evergreen system. You can install the packages required by Debian or
+Ubuntu on the machine of your choice using the following commands as the
+*root* Linux account:
+
+.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system.  To install Postgres server packages, 
+use the make target 'postgres-server-<OSTYPE>'.  Choose the most appropriate 
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-squeeze
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
+------------------------------------------------------------------------------
+
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora also requires you to initialize the PostgreSQL
+cluster and start the service. Issue the following commands as the *root* user:
+
+[source, bash]
+------------------------------------------------------------------------------
+postgresql-setup initdb
+systemctl start postgresql
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Ubuntu Precise)
+[source,bash]
+---------------------------------------------------------------------------------
+apt-get install gcc libxml-libxml-perl libxml-libxslt-perl libbusiness-isbn-perl
+apt-get install libjson-xs-perl liblibrary-callnumber-lc-perl libmarc-record-perl
+apt-get install libmarc-xml-perl libuuid-tiny-perl
+cpan Rose::URI
+---------------------------------------------------------------------------------
+
+.(Debian "wheezy" and Ubuntu Trusty) 
+standalone PostgreSQL 9 server
+[source,bash]
+---------------------------------------------------------------------------------
+apt-get install gcc libxml-libxml-perl libxml-libxslt-perl libbusiness-isbn-perl
+apt-get install libjson-xs-perl liblibrary-callnumber-lc-perl libmarc-record-perl
+apt-get install libmarc-xml-perl libuuid-tiny-perl librose-uri-perl
+---------------------------------------------------------------------------------
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN
+yum install perl-Library-CallNumber-LC perl-MARC-Record perl-MARC-Charset
+yum install perl-MARC-File-XML perl-UUID-Tiny
+------------------------------------------------------------------------------
+
+You need to create a PostgreSQL superuser to create and access the database.
+Issue the following command as the *postgres* Linux account to create a new
+PostgreSQL superuser named `evergreen`. When prompted, enter the new user's
+password:
+
+[source, bash]
+------------------------------------------------------------------------------
+createuser -s -P evergreen
+------------------------------------------------------------------------------
+
+.Enabling connections to the PostgreSQL database
+
+Your PostgreSQL database may be configured by default to prevent connections,
+for example, it might reject attempts to connect via TCP/IP or from other
+servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf`
+file, found in the `/etc/postgresql/` directory on Debian and Ubuntu, and in
+the `/var/lib/pgsql/data/` directory on Fedora. A simple way to enable TCP/IP
+connections from localhost to all databases with password authentication, which
+would be suitable for a test install of Evergreen on a single server, is to
+ensure the file contains the following entries _before_ any "host ... ident"
+entries:
+
+------------------------------------------------------------------------------
+host    all             all             ::1/128                 md5
+host    all             all             127.0.0.1/32            md5
+------------------------------------------------------------------------------
+
+When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to
+make the changes take effect.  For more information on configuring connectivity
+to PostgreSQL, see
+http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html
+
+Creating the Evergreen database and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have created the *evergreen* PostgreSQL account, you also need to
+create the database and schema, and configure your configuration files to point
+at the database server. Issue the following command as the *root* Linux account
+from inside the Evergreen source directory, replacing <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+with the values you want for the *egadmin* Evergreen administrator account:
+
+[source, bash]
+------------------------------------------------------------------------------
+perl Open-ILS/src/support-scripts/eg_db_config --update-config \
+       --service all --create-database --create-schema --create-offline \
+       --user <user> --password <password> --hostname <hostname> --port <port> \
+       --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass>
+------------------------------------------------------------------------------
+
+This creates the database and schema and configures all of the services in
+your `/openils/conf/opensrf.xml` configuration file to point to that database.
+It also creates the configuration files required by the Evergreen `cgi-bin`
+administration scripts, and sets the user name and password for the *egadmin*
+Evergreen administrator account to your requested values.
+
+You can get a complete set of options for `eg_db_config.pl` by passing the
+`--help` parameter.
+
+Loading sample data
+~~~~~~~~~~~~~~~~~~~
+If you add the `--load-all-sample` parameter to the `eg_db_config` command,
+a set of authority and bibliographic records, call numbers, copies, staff
+and regular users, and transactions will be loaded into your target
+database. This sample dataset is commonly referred to as the _concerto_
+sample data, and can be useful for testing out Evergreen functionality and
+for creating problem reports that developers can easily recreate with their
+own copy of the _concerto_ sample data.
+
+Creating the database on a remote server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In a production instance of Evergreen, your PostgreSQL server should be
+installed on a dedicated server.
+
+PostgreSQL 9.1 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.1 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_control -l --start-all
+------------------------------------------------------------------------------
++
+  ** If you receive the error message `bash: osrf_control: command not found`,
+     then your environment variable `PATH` does not include the `/openils/bin`
+     directory; this should have been set in the *opensrf* Linux account's
+     `.bashrc` configuration file. To manually set the `PATH` variable, edit the
+     configuration file `~/.bashrc` as the *opensrf* Linux account and add the
+     following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+export PATH=$PATH:/openils/bin
+------------------------------------------------------------------------------
++
+3. As the *opensrf* Linux account, generate the Web files needed by the staff
+   client and catalogue and update the organization unit proximity (you need to do
+   this the first time you start Evergreen, and after that each time you change
+   the library hierarchy in `config.cgi`):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh -u
+------------------------------------------------------------------------------
++
+4. As the *root* Linux account, restart the Apache Web server:
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/apache2 restart
+------------------------------------------------------------------------------
++
+If the Apache Web server was running when you started the OpenSRF services, you
+might not be able to successfully log in to the OPAC or staff client until the
+Apache Web server is restarted.
+
+Testing connections to Evergreen
+--------------------------------
+
+Once you have installed and started Evergreen, test your connection to
+Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following
+commands to start `srfsh` and try to log onto the Evergreen server using the
+*egadmin* Evergreen administrator user name and password that you set using the
+`eg_db_config` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+You should see a result like:
+
+    Received Data: "250bf1518c7527a03249858687714376"
+    ------------------------------------
+    Request Completed Successfully
+    Request Time in seconds: 0.045286
+    ------------------------------------
+
+    Received Data: {
+       "ilsevent":0,
+       "textcode":"SUCCESS",
+       "desc":" ",
+       "pid":21616,
+       "stacktrace":"oils_auth.c:304",
+       "payload":{
+          "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a",
+          "authtime":420
+       }
+
+    }
+
+    ------------------------------------
+    Request Completed Successfully
+    Request Time in seconds: 1.336568
+    ------------------------------------
+
+If this does not work, it's time to do some troubleshooting.
+
+  * As the *opensrf* Linux account, run the `settings-tester.pl` script to see
+    if it finds any system configuration problems. The script is found at
+    `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source
+    tree.
+  * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide].
+  * If you have faithfully followed the entire set of installation steps
+    listed here, you are probably extremely close to a working system.
+    Gather your configuration files and log files and contact the
+    http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development 
+mailing list] for assistance before making any drastic changes to your system
+    configuration.
+
+Getting help
+------------
+
+Need help installing or using Evergreen? Join the mailing lists at
+http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode
+IRC network on the #evergreen channel.
+
+License
+-------
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+Unported License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/configure.ac b/configure.ac
index 585ab00..11a660f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
 
 export PATH=${PATH}:/usr/sbin
 AC_PREREQ(2.61)
-AC_INIT(Open-ILS, trunk, open-ils-dev at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 2.7.0-beta1, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.7.0-beta1])
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])

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


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list