[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_3_3_1 created. 906ad705e6475ee1606264c656f3cffa41a6cbe0
Evergreen Git
git at git.evergreen-ils.org
Fri May 24 14:32:40 EDT 2019
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_3_3_1 has been created
at 906ad705e6475ee1606264c656f3cffa41a6cbe0 (commit)
- Log -----------------------------------------------------------------
commit 906ad705e6475ee1606264c656f3cffa41a6cbe0
Author: Dan Wells <dbw2 at calvin.edu>
Date: Mon May 20 10:46:56 2019 -0400
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c73e..90ef76fbe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,834 @@
-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 9080c8f1a61f0b5956de96424b4fa53c343cc44a
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Feb 28 16:31:37 2019 -0500
+
+ Customize upgrade notes for 3.3.1
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+26 64 docs/installation/server_upgrade.adoc
+
+commit 7decd0a4f9c9477cb083f060dfa583bd38e2d440
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Mon May 20 10:34:14 2019 -0400
+
+ Bump OpenILS.pm version
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit 79749d0a6cf20cb8611a85839f8374d76faef95d
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Mon May 20 10:30:01 2019 -0400
+
+ Translation updates - po files
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+37 13 build/i18n/po/db.seed/ar-JO.po
+38 14 build/i18n/po/db.seed/cs-CZ.po
+35 11 build/i18n/po/db.seed/de-DE.po
+35 11 build/i18n/po/db.seed/en-CA.po
+35 11 build/i18n/po/db.seed/en-GB.po
+37 13 build/i18n/po/db.seed/es-ES.po
+35 11 build/i18n/po/db.seed/fi-FI.po
+35 11 build/i18n/po/db.seed/fr-CA.po
+35 11 build/i18n/po/db.seed/he-IL.po
+35 11 build/i18n/po/db.seed/hu-HU.po
+37 13 build/i18n/po/db.seed/hy-AM.po
+35 11 build/i18n/po/db.seed/oc-FR.po
+35 11 build/i18n/po/db.seed/pt-BR.po
+35 11 build/i18n/po/db.seed/ru-RU.po
+35 11 build/i18n/po/db.seed/sv-SE.po
+35 11 build/i18n/po/db.seed/tr-TR.po
+2789 2813 build/i18n/po/fm_IDL.dtd/cs-CZ.po
+11 11 build/i18n/po/tpac/ar-JO.po
+13 13 build/i18n/po/tpac/cs-CZ.po
+11 11 build/i18n/po/tpac/de-DE.po
+11 11 build/i18n/po/tpac/en-CA.po
+11 11 build/i18n/po/tpac/en-GB.po
+11 11 build/i18n/po/tpac/es-ES.po
+11 11 build/i18n/po/tpac/fi-FI.po
+11 11 build/i18n/po/tpac/fr-CA.po
+11 11 build/i18n/po/tpac/he-IL.po
+11 11 build/i18n/po/tpac/hu-HU.po
+11 11 build/i18n/po/tpac/hy-AM.po
+11 11 build/i18n/po/tpac/oc-FR.po
+11 11 build/i18n/po/tpac/pt-BR.po
+11 11 build/i18n/po/tpac/ru-RU.po
+11 11 build/i18n/po/tpac/sv-SE.po
+11 11 build/i18n/po/tpac/tr-TR.po
+242 222 build/i18n/po/webstaff/ar-JO.po
+266 243 build/i18n/po/webstaff/cs-CZ.po
+232 221 build/i18n/po/webstaff/en-CA.po
+232 221 build/i18n/po/webstaff/en-GB.po
+242 222 build/i18n/po/webstaff/es-ES.po
+232 221 build/i18n/po/webstaff/hy-AM.po
+232 221 build/i18n/po/webstaff/ru-RU.po
+
+commit 0236c16b240fda84723344ba10e250a11f489c3a
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Fri May 17 16:39:34 2019 -0400
+
+ Docs: Add bugfix release notes for 3.3.1
+
+ This commit also relabels the original (now redundant) headings.
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+103 6 docs/RELEASE_NOTES_3_3.adoc
+
+commit 9c5182acc8860e252024f82b03cb8a09e129ccb5
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue May 14 13:03:35 2019 -0400
+
+ LP1813633 TCN search can find deleted records
+
+ As with the XUL client, when performing a bib record TCN search
+ (Cataloging -> Retrieve Record By TCN), first look for non-deleted
+ records with the requested TCN. When none are found, perform a
+ secondary search for deleted records with the requested TCN.
+
+ To test in concerto:
+
+ [1] Navigate to Cataloging -> Retrieve Record By TCN
+ [2] Search for TCN value "10", which is deleted by default in Concerto.
+ [3] Confirm the deleted record is loaded.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Garry Collum <gcollum at gmail.com>
+
+11 6 Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
+
+commit e25a67e3c9c159c858abeb2e1a2855c8fd3bff27
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date: Fri Jun 8 12:09:54 2018 -0700
+
+ LP#1788680 prevent copy template apply failure on null stat cats
+
+ Under some circumstances, the current code can result in a JS failure:
+
+ Cannot read property 'filter' of undefined
+
+ When this happens, the copy template may apply partially or not at all.
+ This change simply makes sure cp.stat_cat_entries() exists before
+ attempting to filter it.
+
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+7 5 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+
+commit 9a9ddad891cb3ce898b94566ce6cb907ba781363
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Apr 9 11:43:10 2019 -0400
+
+ LP1823982 Vandelay Match Set new tree repair
+
+ When creating a new Match Set expression, provide a default root
+ 'AND' node upon which new nodes may be added.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+1 1 Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.html
+36 1 Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.ts
+
+commit 8eadece4af39f78d5fb0b9b012ad1a5b085bf303
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Wed May 8 10:43:02 2019 -0400
+
+ Stamping upgrade script for Vandelay on PG10
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+34 0 Open-ILS/src/sql/Pg/upgrade/1163.schema.lp1820339-pg10-vandelay.sql
+0 34 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1820339-pg10-vandelay.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1163.schema.lp1820339-pg10-vandelay.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1820339-pg10-vandelay.sql
+
+commit fd73d8b313ebe219050f7e66a9fb04c3705908eb
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Apr 25 18:11:59 2019 -0400
+
+ LP1820339: Vandelay Imports on Pg 10
+
+ The previous commit used a function that only exists in Pg 10, so it
+ would require everyone to upgrade PostgreSQL.
+
+ After some investigation, Ben Shum and I found a method that works on
+ Pg 9.4 through Pg 10 by putting the existing function into a
+ subselect as suggested by PostgreSQL documentation.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+
+2 2 Open-ILS/src/sql/Pg/012.schema.vandelay.sql
+2 2 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1820339-pg10-vandelay.sql
+
+commit 4ee6adc2c355ff050e7d0729543666da17c8beba
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Fri Mar 15 15:35:26 2019 -0400
+
+ LP1820339: Vandelay Imports on Pg 10
+
+ In vandelay.flatten_marc_hstore there are a couple
+ instances of set-returning functions used inside a
+ CASE statement, which Pg10 is unhappy about. This
+ branch changes these regexp_matches calls to use
+ regexp_match instead which avoids this error.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+
+2 2 Open-ILS/src/sql/Pg/012.schema.vandelay.sql
+34 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1820339-pg10-vandelay.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1820339-pg10-vandelay.sql
+
+commit 68fa034e20e624643e8bb53db156e53ba172b2b0
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Mon Dec 3 08:11:29 2018 -0500
+
+ LP1806394: Placing Holds in Item Buckets
+
+ A missing return prevents a list of item ids from
+ being built so no holds can be placed from item
+ buckets. This branch returns the return to its
+ proper place.
+
+ To test
+ -------
+ [1] Add some items to an item bucket, ensuring that they are
+ all holdable.
+ [2] From the item bucket interface, select the items and choose
+ the Request Selected Items action.
+ [3] Confirm placing the requests.
+ [4] Note that the requests are not actually created.
+ [5] Apply the patch and repeat steps #1-#4. This time, the requests
+ should be placed.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
+ Signed-off-by: Millissa Macomber <millissam at burlingtonwa.gov>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 1 Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
+
+commit 102ac90f11488305b6bcc068563cd16c2bfad9f7
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Mon Apr 29 10:56:14 2019 -0400
+
+ LP#1826890: set page title for Statistical Popularity Badges admin page
+
+ To test
+ -------
+ [1] In the browser client, navigate to Local Administration -> Statistical
+ Popularity Badges
+ [2] Note that the web browser's tab header doesn't display a title for the
+ page, just the URL.
+ [3] Apply the patch and reload the page. This time, a page title should
+ be dispayed in the browser's tab header.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Garry Collum <gcollum at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 1 Open-ILS/src/templates/staff/admin/local/rating/badge.tt2
+
+commit bb42d7e586a4c502aad280c187cf5d7dd9d672bb
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Fri Sep 14 09:52:03 2018 -0400
+
+ LP#1792188: Record -> View Holds fails to refresh on Next/Prev record
+
+ Here we clean up and add back a call to refresh the holds list when navigating
+ between records in a result set.
+
+ To test
+ -------
+ [1] In the web staff client, perform a catalog search, bring up a record,
+ and change to the View Holds tab.
+ [2] Click the "Next" button to navigate to the next hold. Note that
+ the list of holds doesn't change.
+ [3] Apply the patch, refresh, and repeat steps #1 and #2. This time,
+ the list of holds should get updated as you navigate between
+ records in the results list.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: John Yorio <jyorio at equinoxinitiative.org>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+4 2 Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
+
+commit 338021686f109acd3152547804b0a2b848f2ba99
+Author: blake <blake at mobiusconsortium.org>
+Date: Fri Nov 16 09:37:31 2018 -0600
+
+ LP1803729 action_trigger_aggregator.pl help indicates the wrong bash argument for remote-acct
+
+ Fixed the help message action_trigger_aggregator.pl to agree with the code
+
+ Signed-off-by: blake <blake at mobiusconsortium.org>
+ Signed-off-by: Josh Stompro <stompro at stompro.org>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+2 2 Open-ILS/src/support-scripts/action_trigger_aggregator.pl
+
+commit 8fc3db8924ea9157d02a4e90199d25ded399876e
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Wed Apr 10 16:32:13 2019 -0400
+
+ LP#1782014 Fix grid path for Title in patron items out
+
+ When the Items Out grid was updated to use display fields, the
+ displayed title was updated (along with the fleshed data in the
+ javascript) but the grid "path" was not. This commit fixes the path,
+ which fixes title sorting. (Title sorting broke because the
+ simple_record.title was no longer being fleshed in via the JS code, so
+ the grid was attempting to sort on an empty value.)
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+1 1 Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+
+commit 7f917178539842e51f71ba2bfd29403fbf78a32a
+Author: Jason Stephenson <jason at sigio.com>
+Date: Tue Dec 18 09:26:11 2018 -0500
+
+ Lp 1752968: Select content when focusing on the barcode field.
+
+ To reproduce the reported behavior:
+
+ 1. Find a title in the staff client catalog.
+ 2. Click on Add Holdings.
+ 3. See that the Barcode field does not have cursor focus.
+ 4. Repeat step 1.
+ 5. Click on edit next to one of the barcoded items in the list of
+ holdings.
+ 6. Click Show Holdings Details and see that the Barcode field does
+ not have focus and the content is not selected.
+
+ To test this branch:
+
+ 1. Find a title in the staff client catalog.
+ 2. Click on Add Holdings.
+ 3. See that the Barcode field has cursor focus, i.e. the cursor is in
+ the field and blinking.
+ 4. Repeat step 1.
+ 5. Click on edit next to one of the barcoded items in the list of
+ holdings.
+ 6. Click Show Holdings Details and see that the Barcode field has
+ cursor focus and the content is selected/highlighted.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Janet Schrader <jschrader at cwmars.org>
+
+6 1 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+
+commit 530010e20377caa9b82c37dc8f465896d07342f2
+Author: Jason Stephenson <jason at sigio.com>
+Date: Mon Dec 17 11:08:47 2018 -0500
+
+ Lp 1752968: Focus Barcode Field in Volumes/Copy Editor
+
+ Always focus the barcode field when adding or editing volumes or
+ copies.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Janet Schrader <jschrader at cwmars.org>
+
+2 1 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+
+commit 0ed480929c4f5c8ff11c4757d59eb69c3ebdcdd8
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Oct 11 08:50:30 2018 -0400
+
+ LP 1333893: Keep Empty Bib on Volume Transfer
+
+ Volume transfer did not honor the cat.bib_keep_on_empty organizational
+ unit setting when removing empty bib records. This commit changes it
+ so that tranfer honors the setting in the same manner that deleting
+ copies and volumes does.
+
+ To test this fix, set cat.bib_keep_on_empty for your workstation
+ org. unit to true, and then transfer all of the volumes from one bib
+ record to another. The empty bib record should not get deleted.
+
+ You can also test with the setting on false to make sure that the
+ empty bib gets deleted.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Beth Willis <willis at noblenet.org>
+
+8 6 Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
+
+commit bd91fd1223b1bdc73fcc385c346768bbfec87b57
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Mon Apr 29 10:49:19 2019 -0400
+
+ LP#1814943: (follow-up) remove ersatz ctx.page_type line
+
+ Guessing that the original bug was due to "page_type" being
+ entered when "page_title" was meant.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+0 1 Open-ILS/src/templates/staff/admin/local/actor/closed_dates.tt2
+
+commit bb95fb9a626b6e6577061205c45e0e53332824a3
+Author: McCanna <tmccanna at georgialibraries.org>
+Date: Wed Feb 6 13:52:48 2019 -0500
+
+ LP#1814943 Closed Dates Editor Tab Missing Title
+
+ Small fix to add missing page title.
+
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Josh Stompro <stompro at stompro.org>
+ Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 0 Open-ILS/src/templates/staff/admin/local/actor/closed_dates.tt2
+
+commit 1058fc09281ac32cc0ddf17b0cb6e70f6c8aa89c
+Author: Jeff Davis <jeff.davis at bc.libraries.coop>
+Date: Fri Apr 5 11:08:55 2019 -0700
+
+ LP#1823387: avoid double slashes in booking URLs, which will not work with recent versions of Apache
+
+ Signed-off-by: Jeff Davis <jeff.davis at bc.libraries.coop>
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 1 Open-ILS/web/js/ui/default/staff/booking/app.js
+
+commit ea750de623bbad351dece01735bb938123cb490a
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Apr 24 09:19:40 2019 -0400
+
+ LP1642036 Group member detail grid query repair
+
+ Teach the grid to automatically use the current version of the grid
+ query in group member details lookup, since the query changes as
+ patron's change and is sometimes applied after the grid has already
+ absorbed the setQuery function.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: John Amundson <jamundson at cwmars.org>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+9 5 Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+
+commit d08a6ae149e4091c6c8671125cff09ceebe349c3
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Thu Apr 25 11:13:12 2019 -0400
+
+ Docs: Fix TIP block and list formatting
+
+ This improves the formatting of the docs section that Katie Martin just
+ improved.
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+11 12 docs/circulation/circulating_items_web_client.adoc
+
+commit 3c7b3e83b4d085228696183c6010889b7b7e974f
+Author: Katie G. Martin <bcl at blaircountylibraries.org>
+Date: Mon Apr 30 15:35:20 2018 -0500
+
+ Docs: Updated checkin modifiers
+
+ Updated checkin modifiers to include Manual Float Active and Update
+ Inventory and their descriptions. For 3.3 only.
+
+ Signed-off-by: Katie G. Martin <bcl at blaircountylibraries.org>
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+4 1 docs/circulation/circulating_items_web_client.adoc
+- - docs/media/checkinmodifiers-with-inventory.png
+- - docs/media/checkinmodifiers-with-inventory2.png
+ create mode 100644 docs/media/checkinmodifiers-with-inventory.png
+ create mode 100644 docs/media/checkinmodifiers-with-inventory2.png
+
+commit 513a77569afe3a00226f0efdee9bc1d988cdca74
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Apr 24 15:55:33 2019 -0400
+
+ LP1793005 Stamping upgrade / print settings as workstation settings
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+43 0 Open-ILS/src/sql/Pg/upgrade/1162.data.hatch-settings.sql
+0 43 Open-ILS/src/sql/Pg/upgrade/XXXX.data.hatch-settings.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1162.data.hatch-settings.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.hatch-settings.sql
+
+commit 9d19fab93ae10a33707991f9f3c43084ff18fb54
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Sep 17 11:26:11 2018 -0400
+
+ LP#1793005 Angular6 Hatch support / printer settings
+
+ Adds support for Hatch print communication to the Angular(6) app.
+ Migrates the print preferences settings (eg.print.config.*) from
+ in-Hatch settings to server-stored workstation settings.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: blake <blake at mobiusconsortium.org>
+
+2 0 Open-ILS/src/eg2/src/app/common.module.ts
+109 0 Open-ILS/src/eg2/src/app/share/print/hatch.service.ts
+26 7 Open-ILS/src/eg2/src/app/share/print/print.component.ts
+2 0 Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.html
+8 0 Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts
+39 0 Open-ILS/src/sql/Pg/950.data.seed-values.sql
+43 0 Open-ILS/src/sql/Pg/upgrade/XXXX.data.hatch-settings.sql
+2 2 Open-ILS/web/js/ui/default/staff/services/hatch.js
+ create mode 100644 Open-ILS/src/eg2/src/app/share/print/hatch.service.ts
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.hatch-settings.sql
+
+commit 9061f305f7c7dde4acf4f876e4ddcaeed9839c21
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Wed Apr 24 15:41:49 2019 -0400
+
+ LP#1778940: stamp schema update
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+6 0 Open-ILS/src/sql/Pg/upgrade/1161.schema.ate_outputs_indexes.sql
+0 6 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.ate_outputs_indexes.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1161.schema.ate_outputs_indexes.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.ate_outputs_indexes.sql
+
+commit 3209181efbd6887e505bd1903883f46785a96784
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Wed Apr 24 15:37:06 2019 -0400
+
+ LP#1778940: (follow-up) create indexes concurrently during upgrade
+
+ This reduces potential for locking when run in a production
+ database, particularly if done outside of a full version upgrade.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+4 7 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.ate_outputs_indexes.sql
+
+commit 7348a2db080d42115cfd66592a7f6762ba6d8080
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Thu Jun 28 14:36:27 2018 -0400
+
+ LP1778940: Add Indexes to ate.*_output
+
+ When there are many rows in action_trigger.event_output
+ simply ensuring referencial integrity can take an
+ unacceptably long time as Postgres has to make sure
+ that the output being deleted isn't referenced in
+ any of these 3 fields. Adding these indexes keeps
+ these checks always fast.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Josh Stompro <stompro at stompro.org>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+3 0 Open-ILS/src/sql/Pg/400.schema.action_trigger.sql
+9 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.ate_outputs_indexes.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.ate_outputs_indexes.sql
+
+commit be1d8530299c164befbe9b36c4220462539ef727
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Fri Apr 19 17:20:42 2019 -0400
+
+ LP#1825578: reverse direction of sort-order arrows in eg-grid
+
+ This patch adjusts the arrow icons used to indicate if a column
+ in the Angular eg-grid is sorted to use the following convention:
+
+ sort order ascending == display _up_ arrow
+ sort order descending == display _descending_ arrow
+
+ To test
+ -------
+ [1] Apply the patch.
+ [2] In a grid with a sortable column (as can be found in /eg2/en-US/staff/sandbox),
+ click on the heading to sort it. Verify that ascending sort displays
+ the upwards arrow and descending sort the downwards.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+2 2 Open-ILS/src/eg2/src/app/share/grid/grid-header.component.html
+
+commit 8cb0a80a074c57f5f2fd1e097fe7b60f0ac1c7b4
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Apr 18 10:14:04 2019 -0400
+
+ Trivial change to file header comment
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 Open-ILS/src/eg2/src/app/staff/share/holds/holds.service.ts
+
+commit b8052f3da11a1217af5ee3f1a796137b9d44af16
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Apr 18 15:19:18 2019 -0400
+
+ Stamping upgrade script for holds prefetch setting
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+15 0 Open-ILS/src/sql/Pg/upgrade/1160.data.catalog-holds-prefetch.sql
+0 15 Open-ILS/src/sql/Pg/upgrade/XXXX.data.catalog-holds-prefetch.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1160.data.catalog-holds-prefetch.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.catalog-holds-prefetch.sql
+
+commit 69be8cd7fc2158a8c503ab048c22b7249ee34b45
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Mar 4 11:12:33 2019 -0500
+
+ LP1818288 WS Option to pre-fetch record holds
+
+ Adds a workstation setting allowing staff to decide whether to pre-fetch
+ all holds on the record detail holds tab, to perform sorting paging in
+ the client, or to leave the sorting/paging on the server.
+
+ Improves client-side sorting in the grid.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+5 0 Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-checkbox.component.ts
+1 0 Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
+23 8 Open-ILS/src/eg2/src/app/share/grid/grid.ts
+1 0 Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.html
+9 4 Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
+51 18 Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
+10 1 Open-ILS/src/sql/Pg/950.data.seed-values.sql
+15 0 Open-ILS/src/sql/Pg/upgrade/XXXX.data.catalog-holds-prefetch.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.catalog-holds-prefetch.sql
+
+commit cadbc9d6a76c34da67ff6241b1ad69cf48461767
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Mar 4 11:11:24 2019 -0500
+
+ LP1818288 Grid checkboxes emit events
+
+ Modify the grid toolbar checkbox onClick handler to emit events instead
+ of requesting a reference to a function. This is more consistent with
+ other event-handling code.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+5 3 Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-checkbox.component.ts
+25 25 Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
+1 1 Open-ILS/src/eg2/src/app/share/grid/grid.ts
+2 2 Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-items.component.html
+5 5 Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-items.component.ts
+13 14 Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html
+14 17 Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts
+
+commit f3d3ae84ffc1bc4c8e89641110a98e9749a5720e
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Mar 1 15:42:07 2019 -0500
+
+ LP1818288 Release notes - record holds tab
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+15 0 docs/RELEASE_NOTES_NEXT/Client/ang-staff-catalog-record-holds.adoc
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Client/ang-staff-catalog-record-holds.adoc
+
+commit f07c0da1bcde61653244b2fd57a70bb1fd9d7a69
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Sat Feb 16 11:42:14 2019 -0800
+
+ LP1818288 Ang staff catalog record detail holds tab/actions
+
+ Adds support for the Holds tab in the record detail view of the Angular
+ staff catalog. Includes grid and hold-related actions.
+
+ * Holds grid built from the new wide-holds API.
+ * batch cancel holds
+ * batch retarget holds
+ * batch edit holds
+ ** Unified form to modify notify options, dates, etc.
+ * hold detail page (menu and row double-click)
+ * batch mark items damaged
+ * batch mark items missing
+ * show last few circulations
+ * retrieve patron
+ * support for indented menu groups a la angjs grids for grouping the
+ hold actions menu.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+5 3 Open-ILS/src/eg2/src/app/common.module.ts
+12 1 Open-ILS/src/eg2/src/app/core/format.service.ts
+4 4 Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html
+1 1 Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts
+15 3 Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-action.component.ts
+9 1 Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-button.component.ts
+11 2 Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
+51 3 Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.ts
+7 3 Open-ILS/src/eg2/src/app/share/grid/grid.ts
+1 0 Open-ILS/src/eg2/src/app/share/org-select/org-select.component.html
+5 2 Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts
+10 5 Open-ILS/src/eg2/src/app/share/string/string.component.ts
+6 7 Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts
+6 6 Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
+3 3 Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts
+4 0 Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html
+1 1 Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.ts
+5 8 Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.html
+7 0 Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts
+7 1 Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts
+0 142 Open-ILS/src/eg2/src/app/staff/share/hold.service.ts
+0 54 Open-ILS/src/eg2/src/app/staff/share/holdings.service.ts
+25 0 Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.module.ts
+58 0 Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.service.ts
+108 0 Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html
+154 0 Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts
+44 0 Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html
+79 0 Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.ts
+60 0 Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
+98 0 Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.ts
+99 0 Open-ILS/src/eg2/src/app/staff/share/holds/detail.component.html
+67 0 Open-ILS/src/eg2/src/app/staff/share/holds/detail.component.ts
+244 0 Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
+366 0 Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
+41 0 Open-ILS/src/eg2/src/app/staff/share/holds/holds.module.ts
+169 0 Open-ILS/src/eg2/src/app/staff/share/holds/holds.service.ts
+18 0 Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html
+34 0 Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.ts
+270 0 Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html
+144 0 Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.ts
+41 0 Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html
+80 0 Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.ts
+43 0 Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html
+87 0 Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts
+27 0 Open-ILS/src/eg2/src/styles.css
+ delete mode 100644 Open-ILS/src/eg2/src/app/staff/share/hold.service.ts
+ delete mode 100644 Open-ILS/src/eg2/src/app/staff/share/holdings.service.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.module.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.service.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/detail.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/detail.component.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/holds.module.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/holds.service.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.ts
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html
+ create mode 100644 Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts
+
+commit 192d24f83120e2495ff7e08ae2c617b7c71c490f
+Author: Dan Scott <dan at coffeecode.net>
+Date: Thu Apr 11 23:17:10 2019 -0400
+
+ Docs: fix uneven lengths of code delimiter blocks
+
+ The lengths of the starting and ending sets of hyphens are supposed to be the
+ same. Asciidoc tools like asciidoctor can be less forgiving than the original
+ asciidoc processor, with less than hilarious results.
+
+ It would probably make sense to try to standardize on something like 60 hyphens
+ to easily flag this problem for deviations from the norm, but for now here's
+ the result of running the docs through asciidoctor and manually adjusting the
+ output.
+
+ Signed-off-by: Dan Scott <dan at coffeecode.net>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 docs/admin/booking-admin.adoc
+1 1 docs/cataloging/batch_importing_MARC.adoc
+1 1 docs/circulation/basic_holds.adoc
+2 2 docs/circulation/circulating_items_web_client.adoc
+6 6 docs/installation/server_upgrade.adoc
+4 4 docs/reports/reporter_add_data_source.adoc
+1 1 docs/reports/reporter_daemon.adoc
+
+commit 0c311b5a410d8af89a7210e582397c608d8b9e1e
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Thu Mar 21 09:11:51 2019 -0700
+
+ LP1821196: Remove arrow function from item status
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+3 1 Open-ILS/web/js/ui/default/staff/cat/item/app.js
+
+commit b37608b69da33a3c238c4be88ae1c3f0f1c16ace
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Apr 11 15:55:08 2019 -0400
+
+ Forward port 3.3.0 upgrade script
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1341 0 Open-ILS/src/sql/Pg/version-upgrade/3.2.5-3.3.0-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/3.2.5-3.3.0-upgrade-db.sql
+
+commit 673cf465aecfc5380d9314f44b1053fe0d50f792
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Sun May 20 09:00:48 2018 -0700
+
+ LP1744386: Alphabetize stat cats in volcopy attr editor
+
+ To test:
+ 1. Go to the volume copy editor. Confirm that the stat
+ cats do not display in order of owning library or stat cat
+ name.
+ 2. Apply this commit.
+ 3. Go to the volume copy editor. Confirm that the stat
+ cats now display in alphabetical order by owning library,
+ then stat cat name.
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+ Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>
+
+1 1 Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+
+commit 87667fef65eaf0439a75b82d63c53953bf2eacaa
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Thu Apr 11 14:40:31 2019 -0400
+
+ Docs: Point to release notes for new version 3.3
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+1 1 docs/root.adoc
+
+commit 12f53dda91af8cda5f19f2cec00716768c6413c6
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Mar 28 17:03:38 2019 -0400
+
+ Forward-port 3.1.11 upgrade script
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+231 0 Open-ILS/src/sql/Pg/version-upgrade/3.1.10-3.1.11-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/3.1.10-3.1.11-upgrade-db.sql
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216454..d6bcd4fda3 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 "3-3-1";
}
__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 93f7ea78e1..f7650e280c 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -93,6 +93,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 ('1163', :eg_version); -- JBoyer/Dyrcona/bshum/JBoyer
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.3.1', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.3.0-3.3.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.3.0-3.3.1-upgrade-db.sql
new file mode 100644
index 0000000000..68140cecfa
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/3.3.0-3.3.1-upgrade-db.sql
@@ -0,0 +1,97 @@
+--Upgrade Script for 3.3.0 to 3.3.1
+\set eg_version '''3.3.1'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.3.1', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('1160', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+ 'catalog.record.holds.prefetch', 'cat', 'bool',
+ oils_i18n_gettext(
+ 'catalog.record.holds.prefetch',
+ 'Pre-Fetch Record Holds',
+ 'cwst', 'label'
+ )
+);
+
+SELECT evergreen.upgrade_deps_block_check('1162', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+ 'eg.print.config.default', 'gui', 'object',
+ oils_i18n_gettext (
+ 'eg.print.config.default',
+ 'Print config for default context',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.print.config.receipt', 'gui', 'object',
+ oils_i18n_gettext (
+ 'eg.print.config.receipt',
+ 'Print config for receipt context',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.print.config.label', 'gui', 'object',
+ oils_i18n_gettext (
+ 'eg.print.config.label',
+ 'Print config for label context',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.print.config.mail', 'gui', 'object',
+ oils_i18n_gettext (
+ 'eg.print.config.mail',
+ 'Print config for mail context',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.print.config.offline', 'gui', 'object',
+ oils_i18n_gettext (
+ 'eg.print.config.offline',
+ 'Print config for offline context',
+ 'cwst', 'label'
+ )
+);
+
+
+SELECT evergreen.upgrade_deps_block_check('1163', :eg_version); -- JBoyer/Dyrcona/bshum/JBoyer
+
+CREATE OR REPLACE FUNCTION vandelay.flatten_marc_hstore(
+ record_xml TEXT
+) RETURNS HSTORE AS $func$
+BEGIN
+ RETURN (SELECT
+ HSTORE(
+ ARRAY_AGG(tag || (COALESCE(subfield, ''))),
+ ARRAY_AGG(value)
+ )
+ FROM (
+ SELECT tag, subfield, ARRAY_AGG(value)::TEXT AS value
+ FROM (SELECT tag,
+ subfield,
+ CASE WHEN tag = '020' THEN -- caseless -- isbn
+ LOWER((SELECT REGEXP_MATCHES(value,$$^(\S{10,17})$$))[1] || '%')
+ WHEN tag = '022' THEN -- caseless -- issn
+ LOWER((SELECT REGEXP_MATCHES(value,$$^(\S{4}[- ]?\S{4})$$))[1] || '%')
+ WHEN tag = '024' THEN -- caseless -- upc (other)
+ LOWER(value || '%')
+ ELSE
+ value
+ END AS value
+ FROM vandelay.flatten_marc(record_xml)) x
+ GROUP BY tag, subfield ORDER BY tag, subfield
+ ) subquery
+ );
+END;
+$func$ LANGUAGE PLPGSQL;
+
+COMMIT;
+
+-- No transaction needed. This can be run on a live, production server.
+SELECT evergreen.upgrade_deps_block_check('1161', :eg_version); -- jboyer/stompro/gmcharlt
+
+CREATE INDEX CONCURRENTLY atev_template_output ON action_trigger.event (template_output);
+CREATE INDEX CONCURRENTLY atev_async_output ON action_trigger.event (async_output);
+CREATE INDEX CONCURRENTLY atev_error_output ON action_trigger.event (error_output);
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 b2b87b683f..6e62a87705 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_3_3_1</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 0613a13ddf..c8e2690353 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_3_3_1");
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 a9543579a8..a399d5b8b9 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 "3.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 1ee2103e6f..0000000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.adoc
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000000..0502a14511
--- /dev/null
+++ b/README
@@ -0,0 +1,641 @@
+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 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**: The minimum supported version is 9.4.
+ * **Linux**: Evergreen has been tested on
+ Debian Stretch (9),
+ Debian Jessie (8),
+ Ubuntu Bionic Beaver (18.04),
+ and Ubuntu Xenial Xerus (16.04).
+ 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 or Ubuntu websites.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 3.0.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 (3.0.0 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
++
+2. Issue the following commands as the *root* Linux account to install
+ prerequisites using the `Makefile.install` prerequisite installer,
+ substituting `debian-stretch`,`debian-jessie`,`ubuntu-bionic`, or
+ `ubuntu-xenial` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+[[optional_developer_additions]]
+3. 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 retrieving and managing web dependencies,
+ use the <osname>-developer Makefile.install target. Currently,
+ this is only needed for building and installing the web
+ staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen translations, use
+ the <osname>-translator Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-translator
+------------------------------------------------------------------------------
++
+ * 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
+------------------------------------------------------------------------------
+
+Extra steps for web staff client
+--------------------------------
+
+[NOTE]
+Skip this entire section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+Install dependencies for web staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+[NOTE]
+You may skip this section if you have installed the
+<<optional_developer_additions,optional developer additions>>. You will still need to do the following
+steps in <<install_files_for_web_staff_client,Install files for web staff client>>.
+
+1. Install the long-term stability (LTS) release of
+https://nodejs.org[Node.js]. Add the Node.js `/bin` directory to your
+environment variable `PATH`.
+
+[[install_files_for_web_staff_client]]
+Install AngularJS files for web 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 JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build, run tests, concat+minify
+npm run build-prod
+npm run test
+------------------------------------------------------------------------------
+
+[[install_files_for_angular_web_staff_client]]
+Install Angular files for web staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Building, Testing, Minification: The remaining steps all take place within
+ the Angular staff root:
++
+[source,sh]
+------------------------------------------------------------------------------
+cd $EVERGREEN_ROOT/Open-ILS/src/eg2/
+------------------------------------------------------------------------------
++
+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 JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build and run tests
+ng build --prod
+npm run test
+------------------------------------------------------------------------------
+
+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 and copy
+ example configuration files to `/openils/conf`.
++
+[source, bash]
+------------------------------------------------------------------------------
+make install
+------------------------------------------------------------------------------
+
+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
+------------------------------------------------------------------------------
+
+Run ldconfig
+------------
+
+On Debian Stretch, run the following command as the root user:
+
+[source, bash]
+------------------------------------------------------------------------------
+ldconfig
+------------------------------------------------------------------------------
+
+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
+-------------------------------
+
+. Use the example configuration files to configure your Web server for
+the Evergreen catalog, web staff client, Web services, and administration
+interfaces. Issue the following commands as the *root* Linux account:
++
+[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_24/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+. 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
+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
+------------------------------------------------------------------------------
++
+. 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):
+ * Replace `Require host 10.0.0.0/8` with `Require all granted`
+. Change the user for the Apache server.
+ * As the *root* Linux account, edit
+ `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to
+ `export APACHE_RUN_USER=opensrf`.
+. As the *root* Linux account, configure Apache with KeepAlive settings
+ appropriate for Evergreen. Higher values can improve the performance of a
+ single client by allowing multiple requests to be sent over the same TCP
+ connection, but increase the risk of using up all available Apache child
+ processes and memory.
+ * Edit `/etc/apache2/apache2.conf`.
+ a. Change `KeepAliveTimeout` to `1`.
+ b. Change `MaxKeepAliveRequests` to `100`.
+. As the *root* Linux account, configure the prefork module to start and keep
+ enough Apache servers available to provide quick responses to clients without
+ running out of memory. The following settings are a good starting point for a
+ site that exposes the default Evergreen catalogue to the web:
++
+.`/etc/apache2/mods-available/mpm_prefork.conf`
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxRequestWorkers 75
+ MaxConnectionsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+. As the *root* user, enable the mpm_prefork module:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+. As the *root* Linux account, enable the Evergreen site:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+. 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
+------------------------------------------------------------------------------
+
+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 <<_creating_the_evergreen_database,Creating the Evergreen
+database>>, sets the database connection information in `opensrf.xml` for you.
+
+Configure action triggers for the Evergreen application
+-------------------------------------------------------
+_Action Triggers_ provide hooks for the system to perform actions when a given
+event occurs; for example, to generate reminder or overdue notices, the
+`checkout.due` hook is processed and events are triggered for potential actions
+if there is no checkin time.
+
+To enable the default set of hooks, issue the following command as the
+*opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json
+------------------------------------------------------------------------------
+
+For more information about configuring and running action triggers, see
+<<_processing_action_triggers,Notifications / Action Triggers>>.
+
+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:
+
+. 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-stretch
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-bionic
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Debian and Ubuntu)
+No extra modules required for these distributions.
+
+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.
+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.4 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.4 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 web 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 web 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 dacb5a36b7..3b4c4f8883 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, 3.3.1, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [3.3.1])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
commit 9080c8f1a61f0b5956de96424b4fa53c343cc44a
Author: Dan Wells <dbw2 at calvin.edu>
Date: Thu Feb 28 16:31:37 2019 -0500
Customize upgrade notes for 3.3.1
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/docs/installation/server_upgrade.adoc b/docs/installation/server_upgrade.adoc
index 9554a9984c..1078a84e27 100644
--- a/docs/installation/server_upgrade.adoc
+++ b/docs/installation/server_upgrade.adoc
@@ -7,7 +7,7 @@ Software Prerequisites
~~~~~~~~~~~~~~~~~~~~~~
* **PostgreSQL**: The minimum supported version is 9.4.
- * **Linux**: Evergreen 2.12.0 has been tested on Debian Stretch (9.0),
+ * **Linux**: Evergreen 3.3.1 has been tested on Debian Stretch (9.0),
Debian Jessie (8.0), Ubuntu Xenial Xerus (16.04), and Ubuntu Bionic Beaver (18.04).
If you are running an older version of these distributions, you may want
to upgrade before upgrading Evergreen. For instructions on upgrading these
@@ -42,12 +42,12 @@ osrf_control --localhost --stop-all
.. Back up the /openils directory.
. Upgrade OpenSRF. Download and install the latest version of OpenSRF from
the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
-. As the *opensrf* user, download and extract Evergreen 2.12.0:
+. As the *opensrf* user, download and extract Evergreen 3.3.1:
+
[source, bash]
-----------------------------------------------
-wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.12.0.tar.gz
-tar xzf Evergreen-ILS-2.12.0.tar.gz
+wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.3.1.tar.gz
+tar xzf Evergreen-ILS-3.3.1.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -57,7 +57,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl
+
[source, bash]
---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
+cd /home/opensrf/Evergreen-ILS-3.3.1
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -80,7 +80,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
+cd /home/opensrf/Evergreen-ILS-3.3.1
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -91,7 +91,7 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
+cd /home/opensrf/Evergreen-ILS-3.3.1
make install
------------------------------------------------------------
+
@@ -102,8 +102,8 @@ can supply `STAFF_CLIENT_STAMP` during the `make install` step like this:
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
-make STAFF_CLIENT_STAMP_ID=rel_2_12_rc install
+cd /home/opensrf/Evergreen-ILS-3.3.1
+make STAFF_CLIENT_STAMP_ID=rel_3_3_1 install
------------------------------------------------------------
+
. As the *root* user, change all files to be owned by the opensrf user and group:
@@ -120,7 +120,7 @@ chown -R opensrf:opensrf /openils
------------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -sf rel_2_12_rc/server server
+ln -sf rel_3_3_1/server server
------------------------------------------------------------
+
. As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -140,7 +140,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
+cd /home/opensrf/Evergreen-ILS-3.3.1
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -164,21 +164,21 @@ The diff command can be used to show the differences between the distribution ve
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-3.3.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
----------------------------------------------------------
+
.. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-3.3.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
----------------------------------------------------------
+
.. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-3.3.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -201,28 +201,13 @@ anything goes wrong during the upgrade.
=============
Evergreen provides incremental upgrade scripts that allow you to upgrade
from one minor version to the next until you have the current version of
-the schema. For example, if you want to upgrade from 2.5.1 to 2.12.0, you
+the schema. For example, if you want to upgrade from 2.9.0 to 2.12.0, you
would run the following upgrade scripts:
-- 2.5.1-2.5.2-upgrade-db.sql
-- 2.5.2-2.5.3-upgrade-db.sql
-- 2.5.3-2.6.0-upgrade-db.sql (this is a major version upgrade)
-- 2.6.2-2.6.3-upgrade-db.sql
-- 2.6.3-2.7.0-upgrade-db.sql (this is a major version upgrade)
-- 2.7.0-2.7.1-upgrade-db.sql
-- 2.7.1-2.7.2-upgrade-db.sql
-- 2.7.2-2.7.3-upgrade-db.sql
-- 2.7.3-2.7.4-upgrade-db.sql
-- 2.7.4-2.8.0-upgrade-db.sql (this is a major version upgrade)
-- 2.8.0-2.8.1-upgrade-db.sql
-- 2.8.1-2.8.2-upgrade-db.sql
-- 2.8.2-2.8.3-upgrade-db.sql
-- 2.8.3-2.8.4-upgrade-db.sql
-- 2.8.4-2.9.0-upgrade-db.sql (this is a major version upgrade)
- 2.9.0-2.9.1-upgrade-db.sql
- 2.9.1-2.9.2-upgrade-db.sql
- 2.9.2-2.9.3-upgrade-db.sql
-- 2.9.3-2.10.0-upgrade-db.sql
+- 2.9.3-2.10.0-upgrade-db.sql (this is a major version upgrade)
- 2.10.0-2.10.1-upgrade-db.sql
- 2.10.1-2.10.2-upgrade-db.sql
- 2.10.2-2.10.3-upgrade-db.sql
@@ -236,49 +221,26 @@ would run the following upgrade scripts:
- 2.11.2-2.11.3-upgrade-db.sql
- 2.11.3-2.12.0-upgrade-db.sql (this is a major version upgrade)
-Note that you do *not* want to run additional 2.5 scripts to upgrade to the
-newest version of 2.5, since currently there is no automated way to upgrade
-from 2.5.4+ to 2.6. Only upgrade as far as necessary to reach the major
-version upgrade script (in this example, as far as 2.5.3).
-
-To upgrade across multiple major versions (e.g. from 2.3.0 to 2.12.0), use
-the same logic to utilize the provided major version upgrade scripts. For
-example:
-
-- 2.3-2.4.0-upgrade-db.sql
-- 2.3-2.4-supplemental.sh
-- (run all incremental scripts from 2.4.0 to 2.4.3)
-- 2.4.3-2.5.0-upgrade-db.sql
-- (run all incremental scripts from 2.5.0 to 2.5.3)
-- 2.5.3-2.6.0-upgrade-db.sql
-- (run all incremental scripts from 2.6.0 to 2.6.3)
-- 2.6.3-2.7.0-upgrade-db.sql
-- (run all incremental scripts from 2.7.0 to 2.7.4)
-- 2.7.4-2.8.0-upgrade-db.sql
-- (run all incremental scripts from 2.8.0 to 2.8.4)
-- 2.8.4-2.9.0-upgrade-db.sql
-- (run all incremental scripts from 2.9.0 to 2.9.3)
-- 2.9.3-2.10.0-upgrade-db.sql
-- (run all incremental scripts from 2.10.0 to 2.10.7)
-- 2.10.7-2.11.0-upgrade-db.sql
-- (run all incremental scripts from 2.11.0 to 2.11.3)
-- 2.11.3-2.12.0-upgrade-db.sql
+Note that you do *not* want to run additional 2.9 scripts to upgrade to the
+newest version of 2.9, since currently there is no automated way to upgrade
+from 2.9.4+ to 2.10. Only upgrade as far as necessary to reach the major
+version upgrade script (in this example, as far as 2.9.3).
=============
[CAUTION]
-Pay attention to error output as you run the upgrade scripts. If you encounter errors
-that you cannot resolve yourself through additional troubleshooting, please
-report the errors to the https://evergreen-ils.org/communicate/mailing-lists/[Evergreen
-Technical Discussion List].
+Pay attention to error output as you run the upgrade scripts. If you encounter
+errors that you cannot resolve yourself through additional troubleshooting,
+please report the errors to the
+https://evergreen-ils.org/communicate/mailing-lists/[Evergreen Technical Discussion List].
Run the following steps (including other upgrade scripts, as noted above)
as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.11.3-2.12.0-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-3.3.1/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/3.3.0-3.3.1-upgrade-db.sql evergreen
----------------------------------------------------------
[TIP]
commit 7decd0a4f9c9477cb083f060dfa583bd38e2d440
Author: Dan Wells <dbw2 at calvin.edu>
Date: Mon May 20 10:34:14 2019 -0400
Bump OpenILS.pm version
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index d7235ce61a..43fc0838db 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS.pm
@@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system
=cut
-our $VERSION = '2.4';
+our $VERSION = '3.0301';
1;
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list