[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_10_6 created. 749676ce657352947aa2858af70fa37a7df326b3
Evergreen Git
git at git.evergreen-ils.org
Thu Aug 25 20:49:32 EDT 2016
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_10_6 has been created
at 749676ce657352947aa2858af70fa37a7df326b3 (commit)
- Log -----------------------------------------------------------------
commit 749676ce657352947aa2858af70fa37a7df326b3
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Aug 25 20:15:01 2016 -0400
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..5f7b41b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,809 @@
-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 6003862e49417ace15d19563b17c1b39a2539a96
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 20:08:58 2016 -0400
+
+ bump up upgrade instructions for 2.10.6
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+19 18 docs/installation/server_upgrade.txt
+
+commit fa4ccde581b6daa9e93f56f1b47328334258a96f
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 20:06:25 2016 -0400
+
+ forward-port 2.9.6-2.9.7 schema upgrade script
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+5 0 Open-ILS/src/sql/Pg/version-upgrade/2.9.6-2.9.7-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.9.6-2.9.7-upgrade-db.sql
+
+commit 8226f259fa43b85357d501d031dc90f4af46f3e4
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Aug 25 17:29:12 2016 -0400
+
+ Docs: Add Additional 2.9.7 Acknowledgments for Testing/Signoff
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3 0 docs/RELEASE_NOTES_2_9.txt
+
+commit 157d7007eb043b9ea48c9a66564464fb6830b593
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Aug 25 17:26:19 2016 -0400
+
+ Docs: Adding 2.9.7 Release Notes
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+49 0 docs/RELEASE_NOTES_2_9.txt
+
+commit d8b50cb63e7a0fde8c931233035e7e5a1d068d52
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Jun 15 13:04:23 2016 -0400
+
+ Docs: Adding 2.9.6 Release Notes
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+34 0 docs/RELEASE_NOTES_2_9.txt
+
+commit b56b63e12780df7a9c27a96793841dba4c9158e4
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 19:56:42 2016 -0400
+
+ let the 2.10.6 release notes be free of errorr
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+4 4 docs/RELEASE_NOTES_2_10.adoc
+
+commit 1b49902949094b6bbecf07e8bad49caf16b4b423
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 17:04:41 2016 -0400
+
+ first pass at 2.10.6 release notes
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+89 0 docs/RELEASE_NOTES_2_10.adoc
+
+commit 29c563c4003fd893f7eada8bc620b37eb0ccfa69
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Aug 25 17:01:05 2016 -0400
+
+ Translation updates - po files, part 2
+
+ Missed the *new* po files in the previous commit. Number of new
+ translations for Spanish now stands at 9000+ (wow!).
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+34 0 build/i18n/po/FlattenerGrid.js/es-ES.po
+125 0 build/i18n/po/PCrudFilterPane.js/es-ES.po
+4713 0 build/i18n/po/webstaff/es-ES.po
+1 1 docs/RELEASE_NOTES_NEXT/Translations/Updates.adoc
+ create mode 100644 build/i18n/po/FlattenerGrid.js/es-ES.po
+ create mode 100644 build/i18n/po/PCrudFilterPane.js/es-ES.po
+ create mode 100644 build/i18n/po/webstaff/es-ES.po
+
+commit 762d7cc018532ee91a83893bc4f4705b04a5b16e
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Aug 25 15:27:56 2016 -0400
+
+ Translation updates - po files
+
+ Translations have been significantly increased. In particular, Spanish
+ has received a huge update with over 8,000 new translations, Czech has
+ received a sizeable update of over 800 translations, and additional
+ smaller updates have been added for Arabic, French (Canada), and
+ Armenian.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+19 15 build/i18n/po/AutoFieldWidget.js/es-ES.po
+25 25 build/i18n/po/Searcher.js/es-ES.po
+23 17 build/i18n/po/URLVerify.js/es-ES.po
+5 5 build/i18n/po/XULTermLoader.js/es-ES.po
+4 4 build/i18n/po/acq.js/cs-CZ.po
+54 24 build/i18n/po/acq.js/es-ES.po
+7 7 build/i18n/po/admin.properties/es-ES.po
+4 4 build/i18n/po/cat.properties/cs-CZ.po
+138 99 build/i18n/po/cat.properties/es-ES.po
+7 6 build/i18n/po/circ.properties/cs-CZ.po
+91 60 build/i18n/po/circ.properties/es-ES.po
+6 6 build/i18n/po/circ.properties/hy-AM.po
+11 11 build/i18n/po/common.properties/es-ES.po
+5 5 build/i18n/po/conify.dtd/es-ES.po
+7 7 build/i18n/po/conify.js/es-ES.po
+593 574 build/i18n/po/db.seed/cs-CZ.po
+3077 1917 build/i18n/po/db.seed/es-ES.po
+14 14 build/i18n/po/fm_IDL.dtd/cs-CZ.po
+1714 1698 build/i18n/po/fm_IDL.dtd/es-ES.po
+5 5 build/i18n/po/fm_IDL.dtd/fr-CA.po
+292 208 build/i18n/po/ils_events.xml/es-ES.po
+4 4 build/i18n/po/lang.dtd/cs-CZ.po
+2489 2290 build/i18n/po/lang.dtd/es-ES.po
+22 10 build/i18n/po/match_set.js/es-ES.po
+271 165 build/i18n/po/offline.properties/es-ES.po
+239 62 build/i18n/po/opac.dtd/ar-AR.po
+38 14 build/i18n/po/opac.dtd/es-ES.po
+4 4 build/i18n/po/patron.properties/cs-CZ.po
+413 276 build/i18n/po/patron.properties/es-ES.po
+16 12 build/i18n/po/pickup_and_return.js/es-ES.po
+12 11 build/i18n/po/pull_list.js/es-ES.po
+13 13 build/i18n/po/register.js/es-ES.po
+42 24 build/i18n/po/reports.dtd/es-ES.po
+6 6 build/i18n/po/reports.js/es-ES.po
+56 21 build/i18n/po/reservation.js/es-ES.po
+19 11 build/i18n/po/selfcheck.js/es-ES.po
+14 12 build/i18n/po/serial.js/es-ES.po
+169 134 build/i18n/po/serial.properties/es-ES.po
+8 8 build/i18n/po/tpac/ar-AR.po
+27 21 build/i18n/po/tpac/cs-CZ.po
+453 386 build/i18n/po/tpac/es-ES.po
+22 12 build/i18n/po/tpac/fr-CA.po
+129 123 build/i18n/po/webstaff/cs-CZ.po
+7 0 docs/RELEASE_NOTES_NEXT/Translations/Updates.adoc
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Translations/Updates.adoc
+
+commit 2838a8294d5e5bde97c6f23e6884bc3ff9b9d1d4
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 14:03:38 2016 -0400
+
+ LP#1617017: make another TPAC string translatable
+
+ "Export List" in hold_history.tt2
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1 1 Open-ILS/src/templates/opac/myopac/hold_history.tt2
+
+commit fb2a828fab884680ac904cee89784ab39802c077
+Author: blake <blake at mobiusconsortium.org>
+Date: Thu Jun 30 15:41:35 2016 -0500
+
+ LP1496556 Claimed never checked out count not increased when applied to LOST circulation
+
+ Bug within the Lost copy status checkin block. Needed to set the stop_fines
+
+ Signed-off-by: blake <blake at mobiusconsortium.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit 88d141146534dd4116ee69afa3b64d55fb50656e
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Aug 25 11:57:42 2016 -0400
+
+ LP#1613709: Make DOB validation alert failure translatable.
+
+ The alert message about an invalid DOB being entered in the OPAC
+ patron registration is not translatable. The solution, suggested by
+ Eva Cerninakova, is to wrap the string in the l() template function to
+ make it so. That is what this branch does.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/templates/opac/parts/js.tt2
+
+commit 04acf5f610ab716eddcb962a14aaeb88042ac3d9
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 11:11:00 2016 -0400
+
+ LP#1616882: mark another string as translateable
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1 1 Open-ILS/src/templates/opac/parts/myopac/base.tt2
+
+commit f920694c092aa3610cab94f3a0cd42ed801f57ae
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 11:05:25 2016 -0400
+
+ LP#1616882: mark string as translateable
+
+ This patch makes the "Branch relationship" string in TPAC
+ available to be translated.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1 1 Open-ILS/src/templates/opac/parts/library/core_info.tt2
+
+commit 838d34f187b11309ad7d99152811873c6751d28b
+Author: Jason Stephenson <jason at sigio.com>
+Date: Mon May 30 13:01:45 2016 -0400
+
+ LP 1583608: The make_release script always makes a db upgrade script.
+
+ Alter make_release to always create a db upgrade script, even when no
+ actual db upgrades need to be applied. The minimal script created
+ will at least set the upgrade version in config.upgrade_log.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+2 2 build/tools/make_release
+
+commit 0438a04530ac4769ce2196d234a4016ba952c58b
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Aug 24 11:41:57 2016 -0400
+
+ LP#1205492: fix crash when attempting to renew deposit & rental loans in OPAC
+
+ This patch fixes a bug where attempting to renew a loan on an item
+ that requires a deposit or a rental fee can cause an Apache
+ internal server error.
+
+ In particular, this patch supplies descriptions for the following
+ events:
+
+ ITEM_DEPOSIT_REQUIRED
+ ITEM_RENTAL_FEE_REQUIRED
+ ITEM_DEPOSIT_PAID
+
+ It also normalizes how 'fail_part' is set in the renewal response,
+ as the payload of an event returned when a renewal fails can
+ be either a hash or an acp Fieldmapper object depending on the
+ type of event. In the former case, attempting to access an
+ nonexistent ->fail_part method is what causes the crash.
+
+ To test
+ -------
+ [1] Create an item that requires a deposit or a rental fee
+ and check it out.
+ [2] Attempt to renew the loan in the public catalog. Note
+ that an internal server error is returned.
+ [3] Apply the patch and attept step 2 again. This time, the
+ public catalog should display a notification to the patron
+ that the renewal cannot take place, rather than crashing.
+ [4] Set up other situations where a renewal should fail for
+ reasons other than a deposit/rental fee being required. Verify
+ that appropriate error messages are displayed in the public
+ catalog.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+3 3 Open-ILS/src/extras/ils_events.xml
+9 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+2 2 Open-ILS/src/templates/opac/myopac/circs.tt2
+
+commit e0a3df1d99441bd2bff808f06566a0861f39dd46
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Sat Aug 20 01:39:09 2016 -0400
+
+ LP#1612364: Add transparency to some format icons
+
+ Some format icons had a white background instead of a transparent one. The
+ transparent ones will look better in the My Account screens, where the icons
+ site on a gray background.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+- - Open-ILS/web/images/format_icons/icon_format/cd.png
+- - Open-ILS/web/images/format_icons/icon_format/cdmusic.png
+- - Open-ILS/web/images/format_icons/icon_format/dvd.png
+- - Open-ILS/web/images/format_icons/icon_format/eaudio.png
+- - Open-ILS/web/images/format_icons/icon_format/ebook.png
+- - Open-ILS/web/images/format_icons/icon_format/evideo.png
+- - Open-ILS/web/images/format_icons/icon_format/kit.png
+- - Open-ILS/web/images/format_icons/icon_format/map.png
+- - Open-ILS/web/images/format_icons/icon_format/microform.png
+- - Open-ILS/web/images/format_icons/icon_format/music.png
+- - Open-ILS/web/images/format_icons/icon_format/phonomusic.png
+- - Open-ILS/web/images/format_icons/icon_format/score.png
+- - Open-ILS/web/images/format_icons/icon_format/vhs.png
+
+commit 8f3f77578c83aad7d5d0fc198b2bd3eb761777f7
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Mon Aug 22 06:10:14 2016 -0400
+
+ LP#1614807: Make holds history more responsive
+
+ When retrieving the holds history page on a mobile device, re-orient the table
+ as we do with other My Account screens.
+
+ Test plan
+ Pre-patch, retrieve the holds history screen for a patron that has enabled
+ holds history. Resize the screen to a width of 600 pixels or smaller. No
+ adjustments will be made to the table, and horizontal scrolling is required to
+ see some data.
+
+ Post-patch, after resizing this screen, the table should reorient itself with
+ the headers displaying in the left column, as is done on the other My Account
+ screens.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+21 5 Open-ILS/src/templates/opac/css/style.css.tt2
+
+commit 345ae86e22b60722dd1afbc46afd39c0da6acd64
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Sat Aug 20 00:54:40 2016 -0400
+
+ LP#1614807: Fix spacing issues in responsive design for My Account screens
+
+ This commit fixes the following spacing issues that are found in the My Account
+ screens when loaded on a small-screen device:
+
+ * When a field has no value, the text in the table header, which displays along
+ the left, is cut off at the bottom. The Notes field on the Holds page is one
+ place where this issue is commonly seen. With the fix, the headers are slightly
+ out of alignment with the field data, but this is still an improvement over
+ cutting off text on the screen.
+
+ * If the only title(s) listed on the screen are short, requiring little width
+ in a table cell, the text in the table header runs into field data. A good
+ example in the Concerto data is if the user only has a check out for record ID
+ 2 (Le concerto) on their account.
+
+ * The checkboxes in the Check Out History and Items on Hold screen were pushed
+ to the right. We fix it by giving the cells with a checkbox a "checkbox_column"
+ class, which was already in use by the checkbox on the Items Out screen.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+5 0 Open-ILS/src/templates/opac/css/style.css.tt2
+2 2 Open-ILS/src/templates/opac/myopac/circ_history.tt2
+2 2 Open-ILS/src/templates/opac/myopac/holds.tt2
+
+commit 45bc9c2bad16e3910cd710bd47e058573c2e3830
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Fri Aug 19 13:41:14 2016 -0400
+
+ LP#1614807: Holds history should look like other My Account screens
+
+ The Holds History My Account interface looks entirely different than the Items
+ Out, Check Out History, and Items On Holds interfaces. This commit adds a new
+ acct_holds_hist_header CSS class that shares the same styles as the CSS classes
+ used for the other three interfaces. Inline styles are removed from this table.
+
+ Test plan
+ Pre-patch: Go to the My Account Items Out, Check Out History, Items on Hold,
+ and Holds History interfaces. While the first three interfaces use a table with
+ a white background for the headers and a gray background for the body, the Holds
+ History interface is the opposite.
+
+ Post patch: All four interfaces should show a similar style to each other.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+3 3 Open-ILS/src/templates/opac/css/style.css.tt2
+15 17 Open-ILS/src/templates/opac/myopac/hold_history.tt2
+
+commit 401b3e4e305b48d4d991a4b5b9c8cd880136e195
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Fri Aug 19 11:59:27 2016 -0400
+
+ LP#1614807: Fix Circ History table header display on small screens
+
+ Because the table in circs.tt2 and circ_history.tt2 shared the same CSS class,
+ circ_history.tt2 was displaying circs.tt2's column headers on mobile devices
+ and other small screens. The two tables now have distinct classes, and
+ styles.css.tt2 has been updated to provide the correct table headers for the
+ circ history page.
+
+ Test plan
+ Pre-patch, pull up a user account that has a circ history in My Account, go to
+ the Check Out History tab, then resize the screen to a width of 600 pixels or
+ smaller. The table headers will now display along the side, but the headers
+ will be the ones that typically display in the Items Out screen. The Barcode
+ will display in the Date Returned row and the Call number will display in the
+ Barcode row.
+
+ Post-patch, after resizing the screen, the headers that display along the side
+ should match the ones from the Checkout History interface. All data should
+ display in its appropriate row.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+13 30 Open-ILS/src/templates/opac/css/style.css.tt2
+1 1 Open-ILS/src/templates/opac/myopac/circ_history.tt2
+
+commit 40732b267e19c91d3a0bbf7ace515917b4cb3b8f
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Mon Jun 20 12:38:00 2016 -0400
+
+ LP1593834: Add Date Header to A/T Email Examples
+
+ RFCs 822 and 2822 specify that a Date: header has to be sent
+ indicating when an email was sent. Without this, clients that
+ default to displaying the Sent Date may end up using a "NULL"
+ date, or 1970-01-01 00:00:00 UTC, which is not ideal. This
+ adds the header to the example A/T templates for email and
+ SMS messages, and includes instructions on correcting
+ existing tempalates.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+27 0 Open-ILS/src/sql/Pg/950.data.seed-values.sql
+16 0 docs/RELEASE_NOTES_NEXT/Administration/Action_Trigger_Email_Headers.adoc
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/Action_Trigger_Email_Headers.adoc
+
+commit 8fce88a1e29fb87753f721ed3d3e6e271cd893b0
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Wed Aug 24 08:11:11 2016 -0400
+
+ LP#1306666: Rename test file
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+0 423 Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t
+423 0 Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t
+ delete mode 100644 Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t
+
+commit 4c308d5cc8c2748bf276940d4e3d4b9bc11c4422
+Author: Jason Stephenson <jstephenson at mvlcstaff.org>
+Date: Mon Mar 28 15:34:32 2016 -0400
+
+ LP 1306666: Add Perl tests for new behavior.
+
+ These tests check that the copy status is correct after aborting
+ transits dependent upon the status of the copy. More tests could be
+ added to cover more situations, but these tests cover the basics.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+423 0 Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t
+
+commit 22cf9bb24ef8a81660998617c1126891c14a2c84
+Author: Jason Stephenson <jstephenson at mvlcstaff.org>
+Date: Fri Mar 18 16:38:33 2016 -0400
+
+ LP 1306666: Abort Transit Only Change Copy Status if In Transit
+
+ When aborting a transit, the copy status is presently changed, either
+ to the status stored in action.transit_copy or to Reshelving if the
+ transit was for a hold. This causes problems with "hanging" transits
+ where something was not handled properly before. We've had cases
+ where a transit sticks around on a copy that is later checked out, and
+ while that copy is checked out, the transit is aborted, thus setting
+ the copy status to Reshelving when it should be Checked Out.
+
+ The code change in this branch only changes the copy's status if it is
+ In Transit. A copy in any other status has its status left untouched.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+14 10 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
+
+commit 46b9c4f0bf66df57da7e45e0606d1ac1d6a26ada
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Aug 19 11:41:14 2016 -0400
+
+ LP#1615025 TPAC large circ history sort repair
+
+ Fix TPAC circ history retrieval code thinko so that history rows are
+ retrieved one at a time instead of in a batch (.atomic) to avoid
+ overwhelming Ejabberd.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+10 8 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+
+commit 172b2317d6fc11685cc6a2ca7ac5fddb9a1b4f97
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Aug 17 11:01:26 2016 -0400
+
+ LP#1476049: disable serve-cgi-bin Apache config on Jessie
+
+ This patch ensures that the stock Apache configuration
+ "serve-cgi-bin" is disabled when installing on Debian Jessie,
+ as otherwise the default cgi-bin location
+ can override what Evergreen specifies for offline.pl.
+
+ To test:
+
+ [1] Run the Makefile.install step on Jessie; verify
+ that there is no /etc/apache2/conf-enabled/serve-cgi-bin.conf
+ symlink.
+ [2] Proceed with the rest of the Evergreen installation; verify
+ that the Apache error log doesn't contain a warning like this:
+
+ "The Alias directive in /etc/apache2/sites-enabled/eg.conf ...
+ will probably never match because it overlaps an earlier
+ ScriptAlias."
+
+ [3] For extra credit, verify that one can access offline circulation
+ sessions.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+3 0 Open-ILS/src/extras/install/Makefile.debian-jessie
+
+commit b0dc5c36ea9b9fb96c02281f8001d31657cda379
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Tue Apr 26 10:23:14 2016 -0700
+
+ fixing missing newline
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+1 0 docs/cataloging/cataloging_web_client.txt
+1 0 docs/root.txt
+
+commit fbda66d05f9aa3f64d2d0325e4300ed5d1210c9c
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Tue Mar 15 11:50:30 2016 -0700
+
+ resolving merge conflict
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+28 0 docs/cataloging/cataloging_web_client.txt
+5 1 docs/root.txt
+ create mode 100644 docs/cataloging/cataloging_web_client.txt
+
+commit ccac5b5f5cc68be574cfd274bed9fdde21fc8cf3
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Tue Mar 15 21:44:57 2016 -0700
+
+ LP954213 adding MARC Editor documentation somewhat based on 2.1
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+94 0 docs/cataloging/MARC_Editor.txt
+0 43 docs/cataloging/MARC_Fixed_Field.txt
+1 1 docs/cataloging/physical_char_wizard.txt
+7 1 docs/root.txt
+ create mode 100644 docs/cataloging/MARC_Editor.txt
+ delete mode 100644 docs/cataloging/MARC_Fixed_Field.txt
+
+commit 9f3e0e209fd1fac2c8b6528aa73bb58ea731918b
+Author: Jim Keenan <jkeenan at cwmars.org>
+Date: Fri Aug 12 14:51:28 2016 -0400
+
+ lp1592934 removed lines referencing edition fields 534 and 775. These fields refer to other, different editions of the work and not to the work actually being returned.
+
+ Signed-off-by: Jim Keenan <jkeenan at cwmars.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 3 Open-ILS/src/templates/opac/parts/misc_util.tt2
+
+commit 3df9e925090c1f65fb5e0733f3d8ca3eea5d702f
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 11 08:20:34 2016 -0400
+
+ LP#1612054: unbreak test case now that SSN is no longer an ID type
+
+ The patch for bug 1566016 broke the live_t/17-lp1579225_new_patron_passwords.t
+ test, as it used a patron ID type that is no longer in the seed
+ data. This patch fixes the test.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1 1 Open-ILS/src/perlmods/live_t/17-lp1579225_new_patron_passwords.t
+
+commit 505d70f0a006a54dc3c8d16ba25affe07ad5c0ff
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Fri Mar 4 20:51:04 2016 -0500
+
+ LP#1576502 Fulfilled holds also should not display as active
+
+ Once a hold has been fulfilled, the patron doesn't consider it active, so let's
+ change the active status for those holds too.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+8 6 Open-ILS/src/templates/opac/myopac/hold_history.tt2
+
+commit a23e17d66f2287530aed4b7a3e7b21c38cb8c62e
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Aug 10 10:26:06 2016 -0400
+
+ LP#1609556: (follow-up) restore previous 852$d output
+
+ The previous patch had a side-effect of changing the 852$d
+ value from the circ library's shortname to its long name. This
+ patch restores the previous behavior.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+
+commit c887ac651de1082a73a1d28af93a318e68855a2b
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date: Wed Jul 27 14:00:28 2016 -0700
+
+ LP#1609556: use unapi functions to retrieve holdings for SRU/Z39.50
+
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+68 34 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+
+commit 022810ff439253fdb94bd128534eda64c1b50556
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Tue Aug 9 15:50:50 2016 -0400
+
+ LP#1611495 Don't use .xml for MARC21 files in Vandelay Export
+
+ The new 'Export Non-imported Records' feature in Vandelay (see bug
+ LP#1548147) was tweaked before merge to export MARC21 files by default
+ (rather than MARC-XML). However, the file save dialog still defaults to
+ (and filters by) ".xml" for the file extension. This is confusing and
+ otherwise problematic.
+
+ Let's go ahead and save the export using a ".mrc" extension instead.
+ While not an official extension (as far as I know), it is widely used,
+ easy to understand, and far less likely to cause issues with other
+ software.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+4 4 Open-ILS/web/js/ui/default/vandelay/vandelay.js
+
+commit 66ee8ab4580604b2d7a88ec902f5654fab8018f6
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Thu Aug 4 10:37:17 2016 -0400
+
+ Delay Novelist loading slightly
+
+ So that if Novelist holds things up other JavaScript, like staff client calls,
+ are not delayed due to Novelist issues.
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+2 1 Open-ILS/src/templates/opac/parts/acjs.tt2
+
+commit ffa57c81e0c3477b82577b8a1afa68d91097516c
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Mon Mar 28 11:03:59 2016 -0400
+
+ LP1559281: Allow Baker and Taylor Fake ISBNs
+
+ For Content Cafe, jam two B&T entrys into the hash so that Business::ISBN
+ doesn't register them as invalid prefix ISBNs.
+
+ B&T uses internal ISBN's with country codes 630 and 631 for materials
+ ordered through them when no assigned ISBN exists. The ContentCafe
+ added content service knows about these ISBNs, but they are not generally
+ used by other providers.
+
+ To Test: This only works if you are using the ContentCafe added content provider.
+
+ - Before Patch -
+ 1. Add the isbn 9786315820243 as the only isbn on a record. Remove UPCs also..
+ 2. Clear the added content cache by restarting memcached or using the staff link.
+ 3. View record in catalog and you should see no cover art.
+
+ - After Patch -
+ 1. Clear the added content cache.
+ 2. View the record in the catalog and you should now see cover art for the title
+ "Video games: the movie"
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+4 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent/ContentCafe.pm
+
+commit 81c6b3587cf0be50e8c482bd8bbf6994db37ba35
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Thu May 19 13:27:11 2016 -0400
+
+ LP#1424656: Fix grammatical error in My Account holds screen
+
+ Changes the holds queue position string from 'x hold on y copies' to 'Hold #x on
+ y copies', which is gramatically correct.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/templates/opac/parts/hold_status.tt2
+
+commit 8c6d44500a8e668869cb5402991afc6d2bcc9611
+Author: Jason Boyer <jboyer1 at library.in.gov>
+Date: Fri Aug 14 11:26:54 2015 -0400
+
+ LP 1481441: Improve Hold Failure Messages
+
+ Rearranging the order of the various sources of hold
+ failure messages makes it less likely to see spurious
+ "Item is too new to transit this far" messages. Now
+ errors due to excessive fines or number of existing
+ holds.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+ Conflicts:
+ Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+
+1 1 Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+
+commit 65f31c52d163ebd80ad796ee423af0b7d1221735
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Aug 1 18:09:04 2016 -0400
+
+ LP#1608711: Update schema.org property name from "seller" to "offeredBy"
+
+ Per the 2015-11-05 release of schema.org
+ (http://schema.org/docs/releases.html#v2.2), the "offeredBy" property is now
+ the preferred property to use for non-commercial entities (such as libraries)
+ making an offer of an item for borrowing, sale, etc.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1 1 Open-ILS/src/templates/opac/parts/library_name_link.tt2
+
+commit 5a97be51a7368f81c181444955b5a5ff8d9535ae
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date: Thu Jul 14 14:10:13 2016 -0700
+
+ LP#1589586: use all fund debits (even encumbrances) when doing prorate calculations
+
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Invoice.pm
+
+commit 4b90a2aa40a34332c509826c00d66f0d63e0f07f
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Wed Jul 13 09:37:11 2016 -0400
+
+ Docs: Fix syntax for code block within list
+
+ This commit fixes two small AsciiDoc syntax problems that prevented a
+ line of code from displaying properly. First, it changes the code block
+ lines from three dashes to four dashes. Second, it adds a plus sign on
+ the preceding line, to connect the code block to the previous list item.
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+3 3 docs/admin_initial_setup/designing_your_catalog.txt
+
+commit fefaf9688e338271e0fc975328b0143a4ef1cdff
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Fri Jul 8 10:32:05 2016 -0400
+
+ Docs: Small syntax fix, formatting improvements
+
+ This commit fixes a small AsciiDoc syntax bug caused by a real '_' that
+ accidentally closed the '_' italics tag. This block of documentation
+ will now more closely match the identical content found in
+ 'admin/template_toolkit.txt' (chapter labeled "TPac Configuration and
+ Customization").
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+5 5 docs/admin_initial_setup/designing_your_catalog.txt
+
+commit 6c0e9a84ce81fc9da4c91f42967403ae46d70681
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Sun Jun 26 12:52:43 2016 -0400
+
+ Docs: Add tip for using "temp" as a login_types when using "Change Operator: New"
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+4 0 docs/admin/authentication_proxy.txt
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..6a24ac5 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-10-6";
}
__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 7a011f0..55fcb15 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 ('0981', :eg_version); -- gmcharlt/jlundgren/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.10.6', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.10.5-2.10.6-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.10.5-2.10.6-upgrade-db.sql
new file mode 100644
index 0000000..e92c972
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.10.5-2.10.6-upgrade-db.sql
@@ -0,0 +1,5 @@
+--Upgrade Script for 2.10.5 to 2.10.6
+\set eg_version '''2.10.6'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.10.6', :eg_version);
+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 7b2b3f5..53e6c93 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/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_10_6</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..d208f21 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/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_10_6");
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..07050a7 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.10"
!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..5615bb4
--- /dev/null
+++ b/README
@@ -0,0 +1,712 @@
+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/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must perform one step before they
+can proceed with the `./configure` step.
+
+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
+------------------------
+
+ * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
+ is 9.1.
+ * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0),
+ Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04),
+ Ubuntu Precise Pangolin (12.04), and Fedora.
+ If you are running an older version of these distributions, you may want
+ to upgrade before upgrading Evergreen. For instructions on upgrading these
+ distributions, visit the Debian, Ubuntu or Fedora websites.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 2.4.0.
+
+
+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.4.0 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
+ repositories.
++
+ * Debian Wheezy and Jessie Ubuntu Precise and Trusty comes with
+ PostgreSQL 9.1+, so no additional steps are required.
+ * Fedora 19 and 20 come with PostgreSQL 9.2+, 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`, `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, Trusty or Debian Jessie. The ubuntu
+and Debian Jessie targets use libdbd-pgsql from packages.
++
+.Debian Wheezy
+[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
+------------------------------------------------------------------------------
+
+6. OPTIONAL: Developer additions
++
+To perform certain developer tasks from a Git source code checkout,
+additional packages may be required. As the *root* Linux account:
++
+ * To install packages needed for retriving and managing web dependencies,
+ use the <osname>-developer Makefile.install target. Currently,
+ this is only needed for building and installing the (preview) browser
+ staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen release bundles, use
+ the <osname>-packager Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-packager
+------------------------------------------------------------------------------
+
+Optional: Extra steps for browser-based staff client
+----------------------------------------------------
+
+[NOTE]
+Skip this entire section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+[NOTE]
+You make skip the subsection `Install dependencies for browser-based staff client'
+if you are installing on either Debian Jessie or Ubuntu Trusty and you have
+installed the `Optional: Developer Additions' described above. You will still
+need to do the steps in `Install files for browser-based staff client' below.
+
+Install dependencies for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Install Node.js. For more information see also:
+ https://github.com/joyent/node/wiki/installation[Node.js Installation]
++
+[source,sh]
+------------------------------------------------------------------------------
+# Go to a temporary directory
+cd /tmp
+
+# Clone the code and checkout the necessary version
+git clone https://github.com/joyent/node.git
+cd node
+git checkout -b v0.10.28 v0.10.28
+
+# set -j to the number of CPU cores on the server + 1
+./configure && make -j2 && sudo make install
+
+# update packages
+% sudo npm update
+------------------------------------------------------------------------------
++
+2. Install Grunt CLI
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g grunt-cli
+------------------------------------------------------------------------------
++
+3. Install Bower
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g bower
+------------------------------------------------------------------------------
+
+Install files for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Building, Testing, Minification: The remaining steps all take place within
+ the staff JS web root:
++
+[source,sh]
+------------------------------------------------------------------------------
+cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/
+------------------------------------------------------------------------------
++
+2. Install Project-local Dependencies. npm inspects the 'package.json' file
+ for dependencies and fetches them from the Node package network.
++
+[source,sh]
+------------------------------------------------------------------------------
+npm install # fetch Grunt dependencies
+bower install # fetch JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build, run tests, concat+minify
+grunt all
+------------------------------------------------------------------------------
+
+
+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_10_6 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/egdownloads
+
+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 Wheezy 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 and Debian Jessie
+[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 Wheezy, 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, Debian Jessie) 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 Wheezy 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, Debian Jessie):
++
+[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
+------------------------------------------------------------------------------
++
+9. Learn more about additional Apache options in the following sections:
+ * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+ * <<_apache_access_handler_perl_module,Apache Access Handler Perl Module>>
+
+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-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+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]
+---------------------------------------------------------------------------------
+cpan Rose::URI
+---------------------------------------------------------------------------------
+
+.(Debian "wheezy" and Ubuntu Trusty)
+No extra modules required for these distributions.
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+cpan Rose::URI
+------------------------------------------------------------------------------
+
+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` 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 org unit configuration.
+):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh
+------------------------------------------------------------------------------
++
+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
+ ------------------------------------
+[[install-troubleshooting-1]]
+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 74e6b3b..fc150a8 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.10.6, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.10.6])
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