[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_3_2 created. 0cbe034ef5d7c1b8142469b87a059a75cea9001f
Evergreen Git
git at git.evergreen-ils.org
Thu Dec 20 11:34:03 EST 2012
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_3_2 has been created
at 0cbe034ef5d7c1b8142469b87a059a75cea9001f (commit)
- Log -----------------------------------------------------------------
commit 0cbe034ef5d7c1b8142469b87a059a75cea9001f
Author: Bill Erickson <berick at esilibrary.com>
Date: Thu Dec 20 10:42:13 2012 -0500
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..f5d9493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1224 @@
-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 c66daa339936f278df660b544875124ae6cfafb0
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Thu Dec 20 09:47:17 2012 -0500
+
+ Translations update step 2: newpot
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+7 1 build/i18n/po/acq.js/acq.js.pot
+13 1 build/i18n/po/circ.properties/circ.properties.pot
+5 1 build/i18n/po/common.properties/common.properties.pot
+717 717 build/i18n/po/db.seed/db.seed.pot
+1373 1369 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot
+74 1 build/i18n/po/lang.dtd/lang.dtd.pot
+15 1 build/i18n/po/offline.properties/offline.properties.pot
+5 1 build/i18n/po/patron.properties/patron.properties.pot
+1325 196 build/i18n/po/tpac/tpac.pot
+
+commit 7b6b762e78dd4e2d81becac1afffb917c0348c6b
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Thu Dec 20 09:36:56 2012 -0500
+
+ Translations update step 1: update profiles
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+5 5 build/i18n/po/AutoFieldWidget.js/tr-TR.po
+178 0 build/i18n/po/Searcher.js/oc-FR.po
+6 3 build/i18n/po/XULTermLoader.js/oc-FR.po
+7 7 build/i18n/po/admin.properties/oc-FR.po
+12 7 build/i18n/po/cat.properties/cs-CZ.po
+16 11 build/i18n/po/cat.properties/de-DE.po
+12 4 build/i18n/po/cat.properties/en-CA.po
+13 8 build/i18n/po/cat.properties/en-GB.po
+13 8 build/i18n/po/cat.properties/es-ES.po
+11 6 build/i18n/po/cat.properties/fr-CA.po
+12 7 build/i18n/po/cat.properties/hy-AM.po
+502 252 build/i18n/po/cat.properties/oc-FR.po
+11 6 build/i18n/po/cat.properties/pt-BR.po
+11 6 build/i18n/po/cat.properties/ru-RU.po
+11 3 build/i18n/po/cat.properties/tr-TR.po
+5 5 build/i18n/po/circ.properties/cs-CZ.po
+6 4 build/i18n/po/circ.properties/en-CA.po
+190 62 build/i18n/po/circ.properties/oc-FR.po
+114 102 build/i18n/po/conify.dtd/oc-FR.po
+210 180 build/i18n/po/conify.js/oc-FR.po
+22 22 build/i18n/po/db.seed/en-CA.po
+182 182 build/i18n/po/db.seed/en-GB.po
+18 18 build/i18n/po/fm_IDL.dtd/cs-CZ.po
+39 39 build/i18n/po/fm_IDL.dtd/en-CA.po
+3526 2105 build/i18n/po/fm_IDL.dtd/oc-FR.po
+6 6 build/i18n/po/fm_IDL.dtd/tr-TR.po
+5 5 build/i18n/po/ils_events.xml/en-CA.po
+5 5 build/i18n/po/ils_events.xml/hy-AM.po
+16 3 build/i18n/po/lang.dtd/cs-CZ.po
+84 68 build/i18n/po/lang.dtd/en-CA.po
+2887 1847 build/i18n/po/lang.dtd/oc-FR.po
+8 6 build/i18n/po/multiclass_search_help.html/oc-FR.po
+8 8 build/i18n/po/offline.properties/en-CA.po
+358 106 build/i18n/po/offline.properties/oc-FR.po
+52 50 build/i18n/po/offline.properties/tr-TR.po
+14 5 build/i18n/po/opac.dtd/de-DE.po
+12 3 build/i18n/po/opac.dtd/en-CA.po
+64 38 build/i18n/po/opac.dtd/ru-RU.po
+14 12 build/i18n/po/opac.dtd/tr-TR.po
+12 12 build/i18n/po/opac.js/oc-FR.po
+356 148 build/i18n/po/patron.properties/oc-FR.po
+63 31 build/i18n/po/pickup_and_return.js/oc-FR.po
+5 5 build/i18n/po/pickup_and_return.js/pt-BR.po
+8 8 build/i18n/po/pull_list.js/de-DE.po
+43 27 build/i18n/po/pull_list.js/oc-FR.po
+167 18 build/i18n/po/register.js/oc-FR.po
+90 80 build/i18n/po/reports.js/oc-FR.po
+15 15 build/i18n/po/reports.js/tr-TR.po
+79 46 build/i18n/po/reservation.js/oc-FR.po
+133 37 build/i18n/po/selfcheck.js/oc-FR.po
+668 0 build/i18n/po/serial.properties/oc-FR.po
+666 0 build/i18n/po/serial.properties/tr-TR.po
+ create mode 100644 build/i18n/po/Searcher.js/oc-FR.po
+ create mode 100644 build/i18n/po/serial.properties/oc-FR.po
+ create mode 100644 build/i18n/po/serial.properties/tr-TR.po
+
+commit 1472e06d8837bb663fdef9247900f5e64858fb54
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Fri Sep 14 15:30:15 2012 -0400
+
+ Consistent permission filtering in ACQ search results
+
+ Add permission checks to search result objects when calling unified
+ search in 'idlist' mode, consistent with the existing permission checks
+ for non-id-list mode. Without this, different forms of the call return
+ different sets of results.
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+4 8 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm
+
+commit d87ea53f5d55cf4027eac69179577ff5cfa7dde0
+Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+Date: Wed Dec 19 11:41:28 2012 -0500
+
+ LP #1092179 FlattenerGrid Filter dialog lead to clobbering grid's base query
+
+ You could see this in the Simplified Hold Pull List interface. Using
+ the filter dialog would refresh the grid and populate it with rows
+ corresponding to your filters, but it would throw away your setting from
+ the context org dropdown (labeled "Show the pull list for..." there).
+
+ FlattenerGrid had a broken mechanism for trying to nicely mix a user's
+ input from things like context org dropdowns with whatever they put into
+ the filter dialog, and now that mechanism has been fixed.
+
+ This also means a tiny change to the User Event Log interface to react
+ to the slight change in FlattenerGrid's API.
+
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3 4 Open-ILS/src/templates/actor/user/event_log.tt2
+7 1 Open-ILS/src/templates/circ/hold_pull_list.tt2
+10 3 Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js
+
+commit 8ed9d9b1f491580278e148f214599fdad02142b1
+Author: Simon Hieu Mai <hieu.mai at mnsu.edu>
+Date: Wed Dec 19 14:33:54 2012 -0600
+
+ LP#1088561: remove current password (renew password issue with TPAC)
+
+ If a user chooses to have their browser remember their password for the
+ catalog, it can fill in the password to the change password form page
+ as hidden dots. This behavior was observed specifically with Firefox.
+
+ Instead, add autocomplete="off" attribute to the form to force users to
+ enter existing password to change to a new password as intended.
+
+ Signed-off-by: Simon Mai <hieu.mai at mnsu.edu>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 1 Open-ILS/src/templates/opac/myopac/update_password.tt2
+
+commit b246fe01853dee7d4803e2e1dece799f096d46f3
+Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
+Date: Tue Dec 18 10:42:59 2012 +0200
+
+ Add fi-FI to update_pofiles script
+
+ Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 0 build/i18n/scripts/update_pofiles
+
+commit 8e8b12a8b558618a0aee6b7a0b5fb2ed30a3eb7a
+Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
+Date: Tue Dec 18 10:41:28 2012 +0200
+
+ po-files for Finnish translation
+
+ Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+30 0 build/i18n/po/AutoFieldWidget.js/fi-FI.po
+174 0 build/i18n/po/Searcher.js/fi-FI.po
+38 0 build/i18n/po/TranslatorPopup.js/fi-FI.po
+18 0 build/i18n/po/User.js/fi-FI.po
+38 0 build/i18n/po/XULTermLoader.js/fi-FI.po
+502 0 build/i18n/po/acq.js/fi-FI.po
+486 0 build/i18n/po/admin.properties/fi-FI.po
+82 0 build/i18n/po/auth.properties/fi-FI.po
+98 0 build/i18n/po/authority.js/fi-FI.po
+136 0 build/i18n/po/capture.js/fi-FI.po
+2482 0 build/i18n/po/cat.properties/fi-FI.po
+2023 0 build/i18n/po/circ.properties/fi-FI.po
+861 0 build/i18n/po/common.properties/fi-FI.po
+502 0 build/i18n/po/conify.dtd/fi-FI.po
+394 0 build/i18n/po/conify.js/fi-FI.po
+4319 0 build/i18n/po/db.seed/fi-FI.po
+7681 0 build/i18n/po/fm_IDL.dtd/fi-FI.po
+1258 0 build/i18n/po/ils_events.xml/fi-FI.po
+14531 0 build/i18n/po/lang.dtd/fi-FI.po
+12 0 build/i18n/po/multiclass_search_help.html/fi-FI.po
+1534 0 build/i18n/po/offline.properties/fi-FI.po
+2717 0 build/i18n/po/opac.dtd/fi-FI.po
+190 0 build/i18n/po/opac.js/fi-FI.po
+1987 0 build/i18n/po/patron.properties/fi-FI.po
+156 0 build/i18n/po/pickup_and_return.js/fi-FI.po
+90 0 build/i18n/po/pull_list.js/fi-FI.po
+180 0 build/i18n/po/register.js/fi-FI.po
+819 0 build/i18n/po/reports.dtd/fi-FI.po
+433 0 build/i18n/po/reports.js/fi-FI.po
+284 0 build/i18n/po/reservation.js/fi-FI.po
+198 0 build/i18n/po/selfcheck.js/fi-FI.po
+688 0 build/i18n/po/serial.properties/fi-FI.po
+3677 0 build/i18n/po/tpac/fi-FI.po
+ create mode 100644 build/i18n/po/AutoFieldWidget.js/fi-FI.po
+ create mode 100644 build/i18n/po/Searcher.js/fi-FI.po
+ create mode 100644 build/i18n/po/TranslatorPopup.js/fi-FI.po
+ create mode 100644 build/i18n/po/User.js/fi-FI.po
+ create mode 100644 build/i18n/po/XULTermLoader.js/fi-FI.po
+ create mode 100644 build/i18n/po/acq.js/fi-FI.po
+ create mode 100644 build/i18n/po/admin.properties/fi-FI.po
+ create mode 100644 build/i18n/po/auth.properties/fi-FI.po
+ create mode 100644 build/i18n/po/authority.js/fi-FI.po
+ create mode 100644 build/i18n/po/capture.js/fi-FI.po
+ create mode 100644 build/i18n/po/cat.properties/fi-FI.po
+ create mode 100644 build/i18n/po/circ.properties/fi-FI.po
+ create mode 100644 build/i18n/po/common.properties/fi-FI.po
+ create mode 100644 build/i18n/po/conify.dtd/fi-FI.po
+ create mode 100644 build/i18n/po/conify.js/fi-FI.po
+ create mode 100644 build/i18n/po/db.seed/fi-FI.po
+ create mode 100644 build/i18n/po/fm_IDL.dtd/fi-FI.po
+ create mode 100644 build/i18n/po/ils_events.xml/fi-FI.po
+ create mode 100644 build/i18n/po/lang.dtd/fi-FI.po
+ create mode 100644 build/i18n/po/multiclass_search_help.html/fi-FI.po
+ create mode 100644 build/i18n/po/offline.properties/fi-FI.po
+ create mode 100644 build/i18n/po/opac.dtd/fi-FI.po
+ create mode 100644 build/i18n/po/opac.js/fi-FI.po
+ create mode 100644 build/i18n/po/patron.properties/fi-FI.po
+ create mode 100644 build/i18n/po/pickup_and_return.js/fi-FI.po
+ create mode 100644 build/i18n/po/pull_list.js/fi-FI.po
+ create mode 100644 build/i18n/po/register.js/fi-FI.po
+ create mode 100644 build/i18n/po/reports.dtd/fi-FI.po
+ create mode 100644 build/i18n/po/reports.js/fi-FI.po
+ create mode 100644 build/i18n/po/reservation.js/fi-FI.po
+ create mode 100644 build/i18n/po/selfcheck.js/fi-FI.po
+ create mode 100644 build/i18n/po/serial.properties/fi-FI.po
+ create mode 100644 build/i18n/po/tpac/fi-FI.po
+
+commit aab7d0c5f1c6a886825e1af533e660e8fe6bd29a
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Tue Dec 18 15:51:12 2012 -0500
+
+ Make config.update_coded_value_map() consistent
+
+ The version of this function in the upgrade file is different than
+ the one in the 002.schema.config.sql file. This commit fixes the
+ broken logic in the 002 file and makes it match the logic in the
+ old upgrade file.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+3 3 Open-ILS/src/sql/Pg/002.schema.config.sql
+38 0 Open-ILS/src/sql/Pg/upgrade/0748.function.update_coded_value_map.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0748.function.update_coded_value_map.sql
+
+commit ffd0f422c2decaf9418a1ce290006e7c7f6d17bd
+Author: James Fournie <jfournie at sitka.bclibraries.ca>
+Date: Tue Dec 18 12:45:51 2012 -0800
+
+ Check for a selection_depth returned from title_hold.is_possible.
+ See Launchpad 1064651 for details. This is a quick fix which solves a
+ fairly serious issue whereby copies outside of a hard boundary could fill
+ holds when they are placed within the TPAC in the staff client.
+
+ Signed-off-by: James Fournie <jfournie at sitka.bclibraries.ca>
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+3 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+
+commit fea6fbebeb9ba992ca3058bc6d013bca22d0ab37
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Tue Dec 18 08:52:55 2012 -0500
+
+ Dojo IDL: Set the "Accept-Language" header
+
+ The internationalization support for /reports/fm_IDL.xml keys off of the
+ Accept-Language header - which, if not set to ^[a-z]{2}-[A-Z]{2}$, falls
+ back to en-US. Setting the header in the dojo.xhrGet() request makes
+ Apache able to serve up the right flavour of /reports/fm_IDL.xml
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
+
+2 2 Open-ILS/web/js/dojo/fieldmapper/IDL.js
+
+commit 928fe1298f06f971ac03028d335fac7d1943075e
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Tue Dec 18 07:39:18 2012 -0500
+
+ Set locale properly in Apache configuration
+
+ A RewriteCond only applies to the next RewriteRule, while our config was
+ attempting to apply multiple rules for a single condition. Fix that up
+ by using skip (S) rules to apply blocks of rules for the condition in
+ question.
+
+ Also, use the HTTP:Accept-Language value directly, rather than relying
+ on a backreference (which did not seem to be working as desired).
+
+ These fixes enable screens like the Register Patron interface to present
+ field labels from the IDL in the correct locale, whereas previously they
+ would always default to en-US.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
+
+10 12 Open-ILS/examples/apache/eg_vhost.conf
+
+commit a1ce433236954e325af243ec1d6eb8e6ad76be01
+Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
+Date: Sun Dec 2 22:49:42 2012 +0200
+
+ LP#1078596: Cannot translate strings handled by fieldmapper
+
+ Strings that should be translatable only show up in English,
+ for example in the Patron Registration screen.
+
+ There's a bug in the fieldmapper where it sets a variable to
+ an empty array, but later in the code only checks whether that
+ particular variable exists, not if it's an empty array.
+
+ Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 1 Open-ILS/web/js/dojo/fieldmapper/IDL.js
+
+commit fbe8ebdc287b563d6583251d906b985aea5789a3
+Author: Ben Shum <bshum at biblio.org>
+Date: Wed Nov 28 16:05:53 2012 -0500
+
+ Syndetics - retrieve summary as part of added content
+
+ As noted by Steve Callender in LP1027131, Syndetics added content is not
+ retrieving summary.html to be displayed in the catalog.
+
+ This change adds a function similar to toc/anotes to bring in summary data.
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+
+19 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent/Syndetic.pm
+
+commit 23b56b4ae3ddb74bd3203fdd6dacbf0f0acea913
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Tue Dec 4 11:04:08 2012 -0500
+
+ ACQ: repair lineitem cancel-reason fleshing
+
+ When fetching lineitems for display in the general lineitem list page,
+ if the lineitem is cancelled, be sure we correctly retrieve the
+ cancel-reason object.
+
+ 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/Acq/Lineitem.pm
+
+commit f74a2ee9380fc9c30dfad7f03390d53229a2a899
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Tue Nov 6 16:32:23 2012 -0500
+
+ Fix foreign character display in receipts
+
+ This commit makes two changes to the staff client print code to
+ help with the proper display of foreign characters:
+
+ 1) Specify the utf-8 charset in the receipt Data URIs.
+ 2) Properly encode the entire data string using encodeURIComponent
+ rather than encode(). Failing to do so was causing XULRunner to
+ be "creative" with the interpretation of the data.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+5 4 Open-ILS/xul/staff_client/chrome/content/util/print.js
+
+commit d22b66ccd0b64f862f302db5534f550d05528683
+Author: Ben Shum <bshum at biblio.org>
+Date: Tue Dec 18 00:12:38 2012 -0500
+
+ Stamping upgrade script for hold request email notify default false
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+7 0 Open-ILS/src/sql/Pg/upgrade/0746.action.hold_request.email_notify_default_false.sql
+0 7 Open-ILS/src/sql/Pg/upgrade/XXXX.action.hold_request.email_notify_default_false.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0746.action.hold_request.email_notify_default_false.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.action.hold_request.email_notify_default_false.sql
+
+commit b6621e6febdb6739017ec38ef9c93ada95ace332
+Author: Michael Peters <mrpeters at library.in.gov>
+Date: Thu Sep 13 16:28:04 2012 -0400
+
+ LP#1047475 Set action.hold_request.email_notify to default to false
+
+ LP#1047475 points out that email notify prefs are ignored in TPAC.
+ Even if a patron deselects email notify during hold request time, it
+ will always be set to true due to the column default.
+
+ This change defaults the column in the database to false (like most
+ other similar columns are) and resolves the bug.
+
+ Credit to Steve Callender for the idea.
+
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 1 Open-ILS/src/sql/Pg/090.schema.action.sql
+7 0 Open-ILS/src/sql/Pg/upgrade/XXXX.action.hold_request.email_notify_default_false.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.action.hold_request.email_notify_default_false.sql
+
+commit bac86e4f87f1b36a7f46ed062eda19a6f6717494
+Author: Dan Pearl <dpearl at cwmars.org>
+Date: Tue Dec 11 10:13:41 2012 -0500
+
+ LP: #1086064 Ignore spaces in opac username/barcode entry field
+
+ Too often, patrons copy the spacing on the barcode on their keytag,
+ or enter a spurious space before entering their name/barcode. This
+ change will remove spaces in their name/barcode.
+
+ (For now, keep the login screen's directions to omit spaces when
+ entering the username/barcode.)
+
+ Signed-off-by: Dan Pearl <dpearl at cwmars.org>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+
+commit 6b3830a4f03b6d4744bb2eea663f164d7f83c186
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Tue Dec 4 10:08:36 2012 -0500
+
+ Highlight selected facets over multiple lines
+
+ As reported by Dan Pearl in LP# 1086150, selected facets that wrap over
+ multiple lines only have the first line highlighted. Which is odd, and
+ easily fixed with a small tweak to the CSS.
+
+ 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/css/style.css.tt2
+
+commit 551de43d37e51f81ffe2135678024cc7314b7488
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date: Tue Oct 30 13:07:21 2012 -0400
+
+ Use uri_escape_utf8 in EGCatLoader/Record.pm.
+
+ To avoid this:
+
+ [Tue Oct 30 12:34:36 2012] [error] [client 134.241.121.11] egweb: Context
+ Loader error: Can't escape \\x{02B9}, try uri_escape_utf8() instead at
+ /usr/local/share/perl/5.14.2/OpenILS/WWW/EGCatLoader/Record.pm line 472 \n,
+ referer: http://catalog.mvlc.org/eg/opa c/results?fi%3Aitem_type=&query=
+ zhenshchiny&qtype=keyword&locg=1
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+
+commit cc8039a36d41fa6f8f316a6843bb07fc63f04f59
+Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
+Date: Thu Dec 13 10:00:43 2012 +0200
+
+ LP#1088868: Column sort popup menu has no background style
+
+ Change the menu from "popup" element to "menupopup", as per tsbere's suggestion.
+
+ Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2 2 Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+
+commit 8b2a2db2384eab017531e40f01871ceba6c5befe
+Author: Michael Peters <mrpeters at library.in.gov>
+Date: Wed Nov 28 12:45:02 2012 -0500
+
+ LP#1084161 KPAC: Added Content Tabs can be too wide
+
+ In cases where LOTS of added content might be available, the
+ record summary is not wide enough to fit all of the tabs.
+
+ This decreases their padding width to fit them comfortably.
+
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 1 Open-ILS/web/css/skin/default/kpac/style.css
+
+commit dce0c479378fb7bbb9cd663ee4ab04c5cae8a404
+Author: Michael Peters <mrpeters at library.in.gov>
+Date: Mon Dec 17 09:10:19 2012 -0500
+
+ LP#1090385 Fix success message for copy template deletion
+
+ We were displaying the "confirm" message twice, instead of the
+ existing "success" message.
+
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 1 Open-ILS/xul/staff_client/server/cat/copy_editor.js
+
+commit 8bba46869f7056b0d9a68beb7b1f7c5dae9ebed8
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date: Wed Oct 31 13:25:04 2012 -0400
+
+ Fix OSRF_HOME and EXT in Open-ILs/src/java/Makefil.am.
+
+ Change the paths so that they work.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+2 2 Open-ILS/src/java/Makefile.am
+
+commit d710795be44bd9cadb0191434d7ba42b6bd12fc3
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date: Tue Oct 30 17:10:42 2012 -0400
+
+ Update Java dependencies.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+1 2 Open-ILS/src/java/Makefile.am
+
+commit 99978c63b5f267cad91cfe8e3743d7a8cb30862b
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Wed Apr 11 13:26:42 2012 -0400
+
+ mod_perl expects child_init return values
+
+ So add in Apache2::Const::OK returns on all of them.
+
+ [LFW: Added the same change to AutoSuggest.pm for consistency's sake.]
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+4 3 Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/PasswordReset.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm
+1 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm
+
+commit 9de5542b463e688ea88880ad0952dd900b20b358
+Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+Date: Thu Mar 22 22:21:36 2012 -0400
+
+ Acq: Yet more efforts to sanitize data for the EDI translator
+
+ I specifically did this to address cases reported to me by Galen
+ Charlton in which get_li_attr_jedi() would return the string "nul", but
+ I hope this is a nail in the coffin for problems involving
+ JEDI-producing Action/Trigger templates feeding the EDI translator
+ strings that the latter doesn't like.
+
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+35 20 Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm
+
+commit 2202b1d9ac53d2a51960ea34ef7d177c40864e81
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sun Dec 9 00:36:08 2012 -0500
+
+ Make the acquisitions setup show up in the manual
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+2 0 docs/root.txt
+
+commit a3ba43e7a80ace2e38614cd4c89688deeeb6aa70
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sun Dec 9 00:30:29 2012 -0500
+
+ Add acquisitions setup chapter
+
+ Another product of the Evergreen in Action documentation sprint!
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+238 0 docs/admin_initial_setup/ordering_materials.txt
+- - docs/media/order_record_loading.png
+ create mode 100644 docs/admin_initial_setup/ordering_materials.txt
+ create mode 100644 docs/media/order_record_loading.png
+
+commit 1e5c687ab1b6001e0e4f92c9c9d832f88da320c1
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sat Dec 8 19:55:24 2012 -0500
+
+ Add the "Importing via the staff client" chapter
+
+ ... from the Evergreen In Action doc sprint.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+190 0 docs/admin_initial_setup/importing_via_staff_client.txt
+- - docs/media/create_match_sets.png
+- - docs/media/import_item_attributes.png
+- - docs/media/record_quality_metrics.png
+2 0 docs/root.txt
+ create mode 100644 docs/admin_initial_setup/importing_via_staff_client.txt
+ create mode 100644 docs/media/create_match_sets.png
+ create mode 100644 docs/media/import_item_attributes.png
+ create mode 100644 docs/media/record_quality_metrics.png
+
+commit fcccca0070e49c22a0ce083c3ec8c215c4f614e7
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sat Dec 8 18:36:12 2012 -0500
+
+ Roll in some Evergreen in Action chapters
+
+ For the initial import we're keeping the formatting and words identical,
+ so that we can manually sycnhronize changes as needed between the FLOSS
+ Manuals version of this documentation and the AsciiDoc version.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+99 0 docs/admin_initial_setup/describing_your_organization.txt
+321 0 docs/admin_initial_setup/describing_your_people.txt
+349 0 docs/admin_initial_setup/migrating_your_data.txt
+12 0 docs/root.txt
+ create mode 100644 docs/admin_initial_setup/describing_your_organization.txt
+ create mode 100644 docs/admin_initial_setup/describing_your_people.txt
+ create mode 100644 docs/admin_initial_setup/migrating_your_data.txt
+
+commit 9fae051f36ccb639d6641b5a03515e10296ca687
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sat Dec 8 18:37:51 2012 -0500
+
+ Add a target ID to fix the epub transform
+
+ Commit a850606073 added a link pointing to this ID, but the target ID
+ did not exist, breaking the epub transform. Now it works again.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 0 docs/admin/lsa-library_settings_editor.txt
+
+commit 9a133df9a957bda564ed4bfcf77fe5e82bf4b91a
+Author: BC Libraries Cooperative <sdineen at sitka.bclibraries.ca>
+Date: Fri Nov 30 11:10:39 2012 -0500
+
+ Documentation: Add sections to workstation admin chapter.
+
+ Content from:
+ http://docs.sitka.bclibraries.ca/Sitka/current/html/intro_start_workstation_admi$
+
+ Receipt template editor sections moved to this chapter.
+ Converted to asciidoc by rsoulliere. Index terms added by rsoulliere
+ Some duplicate images were also removed from media directory.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+0 34 docs/admin/lsa-receipt_template_editor.txt
+210 0 docs/admin/workstation_admin.txt
+- - docs/media/Authority_Control_Sets1.jpg.1
+- - docs/media/Authority_Control_Sets2.jpg.1
+- - docs/media/Authority_Control_Sets3.jpg.1
+- - docs/media/Authority_Control_Sets4.jpg.1
+- - docs/media/Authority_Control_Sets5.jpg.1
+- - docs/media/Authority_Control_Sets6.jpg.1
+- - docs/media/Authority_Control_Sets7.jpg.1
+- - docs/media/Authority_Control_Sets8.jpg.1
+- - docs/media/Authority_Control_Sets9.jpg.1
+- - docs/media/Call_Number_Prefixes_and_Suffixes_2_22.jpg.1
+- - docs/media/Core_Source_1.jpg.1
+- - docs/media/Saved_Catalog_Searches_2_21.jpg.1
+- - docs/media/Saved_Catalog_Searches_2_22.jpg.1
+- - docs/media/Sorting_Columns3.jpg.1
+- - docs/media/receipt-11a.png
+- - docs/media/receipt-2.png
+- - docs/media/workstation-button_bar-1.png
+- - docs/media/workstation-button_bar-2.png
+- - docs/media/workstation-button_bar-3.png
+0 2 docs/root.txt
+ delete mode 100644 docs/admin/lsa-receipt_template_editor.txt
+ delete mode 100644 docs/media/Authority_Control_Sets1.jpg.1
+ delete mode 100644 docs/media/Authority_Control_Sets2.jpg.1
+ delete mode 100644 docs/media/Authority_Control_Sets3.jpg.1
+ delete mode 100644 docs/media/Authority_Control_Sets4.jpg.1
+ delete mode 100644 docs/media/Authority_Control_Sets5.jpg.1
+ delete mode 100644 docs/media/Authority_Control_Sets6.jpg.1
+ delete mode 100644 docs/media/Authority_Control_Sets7.jpg.1
+ delete mode 100644 docs/media/Authority_Control_Sets8.jpg.1
+ delete mode 100644 docs/media/Authority_Control_Sets9.jpg.1
+ delete mode 100644 docs/media/Call_Number_Prefixes_and_Suffixes_2_22.jpg.1
+ delete mode 100644 docs/media/Core_Source_1.jpg.1
+ delete mode 100644 docs/media/Saved_Catalog_Searches_2_21.jpg.1
+ delete mode 100644 docs/media/Saved_Catalog_Searches_2_22.jpg.1
+ delete mode 100644 docs/media/Sorting_Columns3.jpg.1
+ create mode 100644 docs/media/receipt-11a.png
+ create mode 100644 docs/media/receipt-2.png
+ create mode 100644 docs/media/workstation-button_bar-1.png
+ create mode 100644 docs/media/workstation-button_bar-2.png
+ create mode 100644 docs/media/workstation-button_bar-3.png
+
+commit d84fbb3f58a8698de1f03326812b68870fe73ba8
+Author: BC Libraries Cooperative <sdineen at sitka.bclibraries.ca>
+Date: Thu Nov 29 15:39:57 2012 -0500
+
+ Documentation: Add workstation administration chapter.
+
+ Content from: http://docs.sitka.bclibraries.ca/Sitka/current/html/intro_start_workstation_admin.html
+ Converted to asciidoc by rsoulliere.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+122 0 docs/admin/workstation_admin.txt
+- - docs/media/workstation_admin-1.jpg
+- - docs/media/workstation_admin-2.jpg
+- - docs/media/workstation_admin-3.png
+- - docs/media/workstation_admin-4.png
+- - docs/media/workstation_admin-5.png
+- - docs/media/workstation_admin-6.jpg
+2 0 docs/root.txt
+ create mode 100644 docs/admin/workstation_admin.txt
+ create mode 100644 docs/media/workstation_admin-1.jpg
+ create mode 100644 docs/media/workstation_admin-2.jpg
+ create mode 100644 docs/media/workstation_admin-3.png
+ create mode 100644 docs/media/workstation_admin-4.png
+ create mode 100644 docs/media/workstation_admin-5.png
+ create mode 100644 docs/media/workstation_admin-6.jpg
+
+commit e4b35e205155ace6b66a94171e26c1c00a0ebc69
+Author: Michael Peters <mrpeters at library.in.gov>
+Date: Wed Nov 28 12:36:10 2012 -0500
+
+ Fix misspelling of "summary" in KPAC Added Content
+
+ Summary != Smmary
+
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 1 Open-ILS/src/templates/kpac/parts/addedcontent.tt2
+
+commit 03858ec3b8d3e625db7d50a5a43c1ff95c84c4e9
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Thu Nov 29 10:43:28 2012 -0500
+
+ Documentation: Add staff client login chapter.
+
+ Included standalone interface and loggin out information as well as
+ a few index terms.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+57 0 docs/admin/staff_client-login.txt
+2 0 docs/root.txt
+ create mode 100644 docs/admin/staff_client-login.txt
+
+commit db8f59b698c9118528534c8359c7099b7dd1fce8
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Wed Nov 28 11:36:54 2012 -0500
+
+ Documentation: Add chapter on staff client installation.
+
+ Also included information on removing staff client preferences
+ (from EG wiki) and registering workstations.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+173 0 docs/installation/staff_client_installation.txt
+- - docs/media/staff_client_installation_0.png
+- - docs/media/staff_client_installation_1.png
+- - docs/media/staff_client_installation_2.png
+- - docs/media/staff_client_installation_3.png
+- - docs/media/staff_client_installation_4.png
+2 0 docs/root.txt
+ create mode 100644 docs/installation/staff_client_installation.txt
+ create mode 100644 docs/media/staff_client_installation_0.png
+ create mode 100644 docs/media/staff_client_installation_1.png
+ create mode 100644 docs/media/staff_client_installation_2.png
+ create mode 100644 docs/media/staff_client_installation_3.png
+ create mode 100644 docs/media/staff_client_installation_4.png
+
+commit fd1edec01fa557f5bef7af7134c666ee33022b47
+Author: Melissa Lefebvre <mlefebvre at biblio.org>
+Date: Tue Nov 27 13:35:42 2012 -0500
+
+ KPAC - add shelving location to copy table display
+
+ Addition of shelving location information to the display along with the
+ removal of broken "view library info" javascript link.
+
+ Signed-off-by: Melissa Lefebvre <mlefebvre at biblio.org>
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+4 4 Open-ILS/src/templates/kpac/parts/copy_table.tt2
+
+commit f2637d02138436d0fd38ee2b2a619435a8fc9c9b
+Author: Ben Shum <bshum at biblio.org>
+Date: Wed Nov 21 14:17:59 2012 -0500
+
+ KPAC - fix getit_results with short titles
+
+ When using the "Get it" options to either add an item to a list or place an
+ item on hold, one would get an internal server error whenever attemping this
+ on a bib record with a short title.
+
+ Turns out that the substr function that shortens the length of long titles
+ breaks when the title is 18 characters or less.
+
+ Add an IF check around the substr function to avoid this error.
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+
+1 1 Open-ILS/src/templates/kpac/getit_results.tt2
+
+commit 419194ddf821ab675dccbb91f9e887daa1934a4c
+Author: Ben Shum <bshum at biblio.org>
+Date: Mon Nov 19 17:34:33 2012 -0500
+
+ KPAC - fix Get It and pickup library selector
+
+ Change PROCESS to INCLUDE to prevent variable leaks from breaking
+ the pickup library selector's values.
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+
+2 2 Open-ILS/src/templates/kpac/getit.tt2
+
+commit 82359534187f32052534bcbd64a1fdef3868c271
+Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
+Date: Tue Nov 27 12:39:02 2012 +0200
+
+ LP#1082260: Update OPAC low search hits template for i18n
+
+ The OPAC lowhits.tt2 template is only partially translatable,
+ and the translatable part is impossible to make sound good
+ for languages with different word order than English.
+
+ This patch changes the already translatable part so there
+ are 4 different phrases to translate (instead of two phrase
+ fragments), and makes the search hints translatable.
+
+ For English language, the patch does not introduce any visible differences.
+
+ Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+34 27 Open-ILS/src/templates/opac/parts/result/lowhits.tt2
+
+commit be1302ab9a5767f1817db6e906defb52175f5303
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Mon Nov 26 10:17:53 2012 -0500
+
+ Documentation: Fix some typos in upgrade instructions.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+2 2 docs/installation/server_upgrade.txt
+
+commit a28c1ba302b8f9bd28a8d01d61d4454b48e8e686
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Nov 19 15:55:34 2012 -0500
+
+ Docs: Add offline circulation basics
+
+ Based heavily on the documentation from Evergreen 1.6, which was in turn
+ based heavily on the Sitka documentation for offline mode, add some
+ coverage of the offline processes for registering patrons, checking
+ items in and out, renewing items, and uploading & processing
+ transactions.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+265 0 docs/circulation/offline_mode.txt
+8 0 docs/root.txt
+ create mode 100644 docs/circulation/offline_mode.txt
+
+commit 71be7344f8e6a141dfcf15bfa3935e7a4bee6ee4
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Wed Sep 26 23:47:26 2012 -0400
+
+ Set eg_version at start of 2.2 upgrade scripts
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+1 0 Open-ILS/src/sql/Pg/version-upgrade/2.2.0-2.2.1-upgrade-db.sql
+1 0 Open-ILS/src/sql/Pg/version-upgrade/2.2.1-2.2.2-upgrade-db.sql
+
+commit f81737c0084a6189d278486bfa15bdb2c516d6f8
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Wed Sep 26 23:25:53 2012 -0400
+
+ Apply the 0715 update for acq settings_group
+
+ We add the 'acq' config.settings_group in the seed data, and add the
+ other settings groups in the 2.1-2.2 upgrade script, but need to add the
+ acq settings_group to the 2.1-2.2 upgrade script.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+9 0 Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
+
+commit b7f049cc9cd4793cd6a6ca2fd08c448e70b1a31a
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Sep 26 23:34:32 2012 -0400
+
+ After upgrade, list records with missing or incorrect 901$c
+
+ This is a common cause of pain for upgrades. Let's try to identify the
+ problem early (even if it takes forever on a site with 3 million bibs)
+ and offer advice on correcting the problem if it is flagged.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+19 0 Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
+
+commit a4d4dcd71f41135e1d84e60dfa082993285bf42d
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Thu Sep 13 12:47:32 2012 -0400
+
+ rel_2_1 does not have a config.upgrade_log.applied_to column
+
+ Thanks to Michael Peters for running into & reporting this problem when
+ attempting to upgrade from 2.1.2 to 2.1.3!
+
+ Fix the version upgrade script.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+3 3 Open-ILS/src/sql/Pg/version-upgrade/2.1.2-2.1.3-upgrade-db.sql
+
+commit d6556aba50bbda5c40e11a8b790da5818b8a9c76
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Wed Nov 14 13:38:09 2012 -0500
+
+ Documentation: Grammar fix on upgrade instructions.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+1 1 docs/installation/server_upgrade.txt
+
+commit 5ba2c40a6c751323989e69c06194c0079234f5c2
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Wed Nov 14 13:35:17 2012 -0500
+
+ Documentation: Specify that Apache files should be updated as root.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+1 1 docs/installation/server_upgrade.txt
+
+commit 765b5dfb0b9e54287007d518c05b0960f380d22c
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Wed Nov 14 13:18:01 2012 -0500
+
+ Documentation: Update upgrade instructions for 2.3.1
+
+ Fleshed out the Apache instructions with more precise cp commands.
+ I find this helpful since I like to copy and paste the commands.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+37 36 docs/installation/server_upgrade.txt
+
+commit 14201d14be6bf4f80ed4b07ea70e8a6ba7a1b04c
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Tue Nov 13 15:51:38 2012 -0500
+
+ Stamping upgrade script for lost xact_finish opt.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+25 0 Open-ILS/src/sql/Pg/upgrade/0744.data.coust_lost_xact_finish_on_zero.sql
+0 25 Open-ILS/src/sql/Pg/upgrade/XXXX.data.coust_lost_xact_finish_on_zero.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0744.data.coust_lost_xact_finish_on_zero.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.coust_lost_xact_finish_on_zero.sql
+
+commit d9f58b94114dfb07072277023d6d6a55e74747ed
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date: Sat Nov 3 12:04:34 2012 -0400
+
+ Address Launchpad Bug 793550.
+
+ Check for stop fines reason of CHECKIN or RENEW before closing a circulation
+ transaction when the balance reaches zero.
+
+ Also, if the stop fines reason is LOST, then check a new ou setting,
+ circ.lost.xact_open_on_zero, to determine if the transaction is closed or
+ kept open. The setting is checked for the circulation copy's circ_lib.
+
+ Add CircCommon->can_close_circ.
+
+ Following up on Dan Wells' comments on Launchpad Bug 793550, I have moved
+ the logic to check if the circ transaction can be closed to its own utility
+ function in OpenILS::Application::Circ::CircCommon. This potentially
+ consolidates the logic in one place in case we need to use it elsewhere.
+
+ Instead of checking for stop fines reasons of CHECKIN and RENEW and
+ checking for checkin time on the circ, we just check for checkin time.
+ Both CHECKIN and RENEW should set the checkin time.
+
+ Also, use the constant for stop fines reason of LOST, rather than the
+ literal string "LOST".
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+30 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
+5 3 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm
+19 0 Open-ILS/src/sql/Pg/950.data.seed-values.sql
+25 0 Open-ILS/src/sql/Pg/upgrade/XXXX.data.coust_lost_xact_finish_on_zero.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.coust_lost_xact_finish_on_zero.sql
+
+commit a56a6af3e0e3403ba3eed201dc32e3bc6afb2eef
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Nov 12 11:46:21 2012 -0500
+
+ No need for vanity info in OpenSRF article
+
+ We don't credit particular authors in the Evergreen docs, and we don't
+ want to dissuade contributors from improving & evolving any particular
+ section of the docs, so get rid of a hangover attribution from the
+ OpenSRF article.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+0 2 docs/development/intro_opensrf.txt
+
+commit ecb7e2fe7eef3e120dff7e8b8e738c029847385a
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Nov 12 11:32:31 2012 -0500
+
+ Add "Intro to OpenSRF" to development section
+
+ We have the Asciidoc source, so let's drop it into place. Triggered by a
+ request for info on OpenSRF development on IRC that was answered with
+ "we don't really have much information on that" response. *Poof*, now
+ we have some.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1353 0 docs/development/intro_opensrf.txt
+40 0 docs/development/perl_client.pl
+60 0 docs/development/python_client.py
+- - docs/media/CONNECT.png
+- - docs/media/REQUEST.png
+1 0 docs/root.txt
+ create mode 100644 docs/development/intro_opensrf.txt
+ create mode 100644 docs/development/perl_client.pl
+ create mode 100644 docs/development/python_client.py
+ create mode 100644 docs/media/CONNECT.png
+ create mode 100644 docs/media/REQUEST.png
+
+commit 8b035158d3ff1885050698694006011e62851c16
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Nov 12 11:28:58 2012 -0500
+
+ Docs: resolve transform errors and warnings
+
+ ePub really doesn't like absolute references to images - which is good,
+ it shouldn't. Also, single line NOTE blocks are much easier to deal with
+ using the prefix approach (and don't generate warnings during normal
+ HTML generation).
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 4 docs/acquisitions/invoices.txt
+1 1 docs/admin/acquisitions_admin.txt
+
+commit cf5c74eb28479c3c90cf87e7aaa765f27c4cc54a
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Mon Nov 12 11:10:31 2012 -0500
+
+ Documentation: Fix small typo in 2.3 release notes. s/how/now.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+1 1 docs/RELEASE_NOTES_2_3.txt
+
+commit e7f537d7316d9d2357c920031540b0c9a4053dcf
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Mon Nov 12 10:36:09 2012 -0500
+
+ Documentation: Fix some broken links and adjust an image in the
+ Acquistions Admin chapter as pointed out by Remington Steed.
+
+ Added anchors, pointed links to "Line Item Features" and changed
+ wording accordingly. I cropped image and use a red box for highlighting.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+3 3 docs/admin/acquisitions_admin.txt
+- - docs/media/acq_marc_search-2.png
+
+commit 2c25070639e8cbfb998a44a47ed102af44689072
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Nov 12 09:17:05 2012 -0500
+
+ Add translation update info back into official docs
+
+ This disappeared in the 2.3 release for some reason; let's get it back.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 1 docs/root.txt
+
+commit 4bc22d32e1a337c48f02c5a364274206a06f37ef
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Wed Nov 7 12:55:49 2012 -0500
+
+ make_release: add the \set eg_version command to upgrade script
+
+ We were echoing the output to STDOUT instead of redirecting it to the
+ upgrade script that we were generating. Let's go the last mile and
+ actually get it into the upgrade script.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+1 1 build/tools/make_release
+
+commit 6ae6890b3ea8fc40e3a57cd7c74377754c9cab4c
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Wed Oct 10 17:36:52 2012 -0400
+
+ Make it possible to suppress IDL fields
+
+ Some clients of external services, particularly pcrud and reporter-store,
+ need to be able to access tables that contain columns we'd rather restrict.
+ For instance, the passwd field on actor.usr.
+
+ To effect this feature we provide a blacklist attribute for fields, called
+ suppress_controller, which works in the same way as the class controller
+ attribute but names controllers not allowed to use the field. When the field
+ is explicitly named in a query (fieldmapper select block or json_query) an
+ error is thrown, and suppressed fields are ingored in general fieldmapper
+ search/retreive requests.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+1 1 Open-ILS/examples/fm_IDL.xml
+1 0 Open-ILS/examples/fm_IDL.xsd
+7 0 Open-ILS/src/c-apps/oils_idl-core.c
+27 2 Open-ILS/src/c-apps/oils_sql.c
+3 0 Open-ILS/web/reports/xul/source-browse.js
+3 0 Open-ILS/web/reports/xul/source-setup.js
+
+commit f6290fd2aedab7d4758f6905d9b417feefcea1c0
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Tue Nov 6 15:28:28 2012 -0500
+
+ Move 'initial host' feature docs into 2.3 release notes
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+15 0 docs/RELEASE_NOTES_2_3.txt
+0 12 docs/RELEASE_NOTES_NEXT/initial_host.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/initial_host.txt
+
+commit 197e2517391f86b5319ad149e1b1bafc10a7e186
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Fri Nov 2 15:28:27 2012 -0400
+
+ CStoreEditor auto-activity log redaction
+
+ CStoreEditor logs all update calls to the activity log as key/value
+ pairs on the updated object. Avoid loging key/value pairs for objects
+ when the API call being relayed by CStoreEditor is on the list of
+ log-protect API calls. Instead, log "**DETAILS REDACTED**".
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+20 3 Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
+
+commit e15c45f422f3f90556bc00839e03b569874a5f81
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Nov 5 22:14:34 2012 -0500
+
+ Document log redaction XML chunk for opensrf_core.xml
+
+ Based on Bill Erickson's original version.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+26 1 docs/RELEASE_NOTES_2_3.txt
+
+commit e643b9bbfbede6daaf571e082929d96a32971b58
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Wed Oct 31 09:00:19 2012 -0400
+
+ Add sample log redaction config to EG opensrf_core
+
+ Redact parameter logging for the following API calls:
+
+ Login:
+ open-ils.auth.authenticate.verify
+ open-ils.auth.authenticate.complete
+ open-ils.auth_proxy.login
+
+ User updates:
+ open-ils.actor.user.password
+ open-ils.actor.user.username
+ open-ils.actor.user.email
+ open-ils.actor.patron.update
+ open-ils.cstore.direct.actor.user.create
+ open-ils.cstore.direct.actor.user.update
+ open-ils.cstore.direct.actor.user.delete
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+18 0 Open-ILS/examples/opensrf_core.xml.example
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index cd4dbbf..28a9e03 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/;
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-3-2";
}
__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 196e37f..1082b1d 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -88,6 +88,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 ('0748', :eg_version); -- dbwells/dbs
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.2', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.3.1-2.3.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.3.1-2.3.2-upgrade-db.sql
new file mode 100644
index 0000000..106647b
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.3.1-2.3.2-upgrade-db.sql
@@ -0,0 +1,69 @@
+--Upgrade Script for 2.3.1 to 2.3.2
+\set eg_version '''2.3.2'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.2', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('0744', :eg_version);
+
+INSERT INTO config.org_unit_setting_type
+ (name, grp, label, description, datatype)
+ VALUES (
+ 'circ.lost.xact_open_on_zero',
+ 'finance',
+ oils_i18n_gettext(
+ 'circ.lost.xact_open_on_zero',
+ 'Leave transaction open when lost balance equals zero',
+ 'coust',
+ 'label'
+ ),
+ oils_i18n_gettext(
+ 'circ.lost.xact_open_on_zero',
+ 'Leave transaction open when lost balance equals zero. This leaves the lost copy on the patron record when it is paid',
+ 'coust',
+ 'description'
+ ),
+ 'bool'
+ );
+
+
+SELECT evergreen.upgrade_deps_block_check('0746', :eg_version);
+
+ALTER TABLE action.hold_request ALTER COLUMN email_notify SET DEFAULT 'false';
+
+-- LP#1091831 - reapply config.update_coded_value_map()
+-- due to broken schema version
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0748', :eg_version);
+
+CREATE OR REPLACE FUNCTION config.update_coded_value_map(in_ctype TEXT, in_code TEXT, in_value TEXT, in_description TEXT DEFAULT NULL, in_opac_visible BOOL DEFAULT NULL, in_search_label TEXT DEFAULT NULL, in_is_simple BOOL DEFAULT NULL, add_only BOOL DEFAULT FALSE) RETURNS VOID AS $f$
+DECLARE
+ current_row config.coded_value_map%ROWTYPE;
+BEGIN
+ -- Look for a current value
+ SELECT INTO current_row * FROM config.coded_value_map WHERE ctype = in_ctype AND code = in_code;
+ -- If we have one..
+ IF FOUND AND NOT add_only THEN
+ -- Update anything we were handed
+ current_row.value := COALESCE(current_row.value, in_value);
+ current_row.description := COALESCE(current_row.description, in_description);
+ current_row.opac_visible := COALESCE(current_row.opac_visible, in_opac_visible);
+ current_row.search_label := COALESCE(current_row.search_label, in_search_label);
+ current_row.is_simple := COALESCE(current_row.is_simple, in_is_simple);
+ UPDATE config.coded_value_map
+ SET
+ value = current_row.value,
+ description = current_row.description,
+ opac_visible = current_row.opac_visible,
+ search_label = current_row.search_label,
+ is_simple = current_row.is_simple
+ WHERE id = current_row.id;
+ ELSE
+ INSERT INTO config.coded_value_map(ctype, code, value, description, opac_visible, search_label, is_simple) VALUES
+ (in_ctype, in_code, in_value, in_description, COALESCE(in_opac_visible, TRUE), in_search_label, COALESCE(in_is_simple, FALSE));
+ END IF;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+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 2609bb6..3f0bccf 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_3_2</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 6352b6e..1c7943a 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_3_2");
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 e0bc1ef..e7e96bb 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.3"
!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..024bab1
--- /dev/null
+++ b/README
@@ -0,0 +1,549 @@
+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
+------------------------------------------------------------------------------
+
+After running `make install`, developers also 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/.
+------------------------------------------------------------------------------
+
+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.1 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf.php
+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
+------------------------------------------------------------------------------
++
+ * On Ubuntu Lucid, you can use a PPA (personal package archive), which are
+ package sources hosted on Launchpad. The one most commonly used by Evergreen
+ Community members is maintained by Martin Pitt, who also maintains the
+ official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue
+ the following commands to add the PPA source:
++
+[source, bash]
+------------------------------------------------------------------------------
+apt-get install python-software-properties
+add-apt-repository ppa:pitti/postgresql
+------------------------------------------------------------------------------
++
+ * Ubuntu Precise 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-squeeze`, `fedora`, `ubuntu-lucid`, 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. The ubuntu-precise
+target uses libdbd-pgsql from packages.
++
+.Debian / Ubuntu Lucid
+[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]
+------------------------------------------------------------------------------
+./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+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_3_2 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
+------------------------------------------------------------------------------
+
+Configure the Apache Web server
+-------------------------------
+
+1. Use the example configuration files in `Open-ILS/examples/apache/` 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
+[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/startup.pl /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf /etc/httpd/conf.d/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/httpd/
+cp Open-ILS/examples/apache/startup.pl /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. Replace `Allow from 10.0.0.0/8` with `Allow from all` (to enable
+ access to the offline upload / execute interface from any workstation on
+ any network - note that you must secure this for a production instance)
+ 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. 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>
+------------------------------------------------------------------------------
++
+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): 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
+------------------------------------------------------------------------------
+
+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.pl`, described in the following section, sets the database
+connection information in `opensrf.xml` for you.
+
+Creating the Evergreen database
+-------------------------------
+
+By default, the `Makefile.install` prerequisite installer does not install
+the PostgreSQL 9 database server required by every Evergreen system;
+for production use, most libraries install the PostgreSQL database server on a
+dedicated machine. You can install the packages required by Debian or Ubuntu Lucid
+on the machine of your choice using the following commands as the *root*
+Linux account:
+
+.(Debian and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91
+------------------------------------------------------------------------------
+
+.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91
+------------------------------------------------------------------------------
+
+You can install the packages required by Fedora on the machine of your choice
+using the following commands as the *root* Linux account:
+
+.(Fedora) Installing PostgreSQL server packages
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server
+postgresql-setup initdb
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules as the
+*root* Linux account:
+
+.(Debian / Ubuntu) Installing additional Perl modules on a standalone PostgreSQL 9 server
+[source, bash]
+------------------------------------------------------------------------------
+aptitude install gcc libxml-libxml-perl libxml-libxslt-perl
+cpan Business::ISBN
+cpan JSON::XS
+cpan Library::CallNumber::LC
+cpan MARC::Record
+cpan MARC::File::XML
+cpan UUID::Tiny
+------------------------------------------------------------------------------
+
+.(Fedora) Installing additional Perl modules on a standalone PostgreSQL 9 server
+[source, bash]
+------------------------------------------------------------------------------
+yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN
+cpan Library::CallNumber::LC
+cpan MARC::Record
+cpan MARC::File::XML
+cpan 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
+------------------------------------------------------------------------------
+
+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.pl --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.
+
+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.pl`.
+
+For PostgreSQL 9.0
+^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.0, you can either:
+
+ * Install the PostgreSQL contrib modules on the machine on which you
+ are installing the Evergreen code, and use the `--create-database`
+ option from that machine, or
+ * Copy the `Open-ILS/src/sql/Pg/create_database.sql` script to your
+ PostgreSQL server and invoke it as the *postgres* Linux account:
++
+[source, bash]
+------------------------------------------------------------------------------
+psql -vdb_name=<dbname> -vcontrib_dir=`pg_config --sharedir`/contrib -f create_database.sql
+------------------------------------------------------------------------------
+
+Then you can issue the `eg_db_config.pl` command as above _without_ the
+`--create-database` argument to create your schema and configure your
+configuration files.
+
+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_ctl.sh -l -a start_all
+------------------------------------------------------------------------------
++
+ ** If you receive the error message `bash: osrf_ctl.sh: 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.pl` 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 acccount, 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://open-ils.org/listserv.php[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/listserv.php 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/build/tools/make_release b/build/tools/make_release
index c5580c1..819f94f 100755
--- a/build/tools/make_release
+++ b/build/tools/make_release
@@ -2,7 +2,7 @@
GIT_ABS=`git rev-parse --show-toplevel`
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD | sed 's|.*/||'`
-HEADURLBASE="http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/"
+HEADURLBASE="http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_3_2"
HEADURL="$HEADURLBASE$GIT_BRANCH"
# Drop to the root of the checkout
diff --git a/configure.ac b/configure.ac
index 89e64f6..4a76d65 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.3.2, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.3.2])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_PREFIX_DEFAULT([/openils/])
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list