added changes made by bradley for BC

    Cross-port: 675309f

removed message saying the online payments are down

    Cross-port: af82c6b

KMAIN-602: Add Logout link to E-Com

    Cross-port: 0dcbd0c

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm

KMAIN-593: Move all BiblioCommons related files to opac/biblio/

    Cross-port: 67a95ba

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm

ISBN Picker bug workaround (cherry picked from commit 665b372fd4565a22f2d500c8e8d91a50728156b3)

    Cross-port: 15dcea0

Updates to homesearch.tt2, updating images - Bradley Change 2013.12.11

    Cross-port: 1ecb295

KMAIN-582 : BiblioCommons E-Commerce Receipt Screen

    Cross-port: 5edb7ab

KMAIN-570 part 2 : Ecom Bibliocommons

    Cross-port: 7597ac6

KMAIN-570 : Update Bibliocommons ecom screens

    Cross-port: 06162e8

kmain-331_all_bibliocommons_ecommerce_functionality

    Cross-port: f8c3c9e

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm

KMAIN-583 : OPAC My Account screen - holds tab only showing 15 items max

    Cross-port: 92fb51a

Adds the banner message for catalog, database, and ebooks down during upgrade

    Cross-port: 359dd8b

Manual Changes Bradley Pushed After Go Live 12/9/2013

    Cross-port: 4697a49

Updated the linking config files.

    Cross-port: c10583c

Correct spelling error for opac.patron.auto_overide_hold_events to opac.patron.auto_override_hold_events

    Cross-port: 9c652bc

KOSU-9

    Cross-port: 12d4253

KOSU-8_printer_context_failed

    Cross-port: 22e524d

KCLS custom multiclass query scrubbing (squashed legacy commits)

kmain-363_fixed_contains_phrase_all_punctuation
    Cross-port: 1d8ee0c
Puncuation_search_edge_cases
    Cross-port: 8ed3232
KMAIN 115 - Matches exactly exactly searches not working with parenthases
    Cross-port: 45dd9f2
kmain-422_sorting_returning_null
    Cross-port: 2d6f4eb
Punctuation-Search_Fixed-keyword-contains-phrase
    Cross-port: da1f967
Punctuation keyword exact match
    Cross-port: bcbbe3b

Setting the self-checkout timer back to 60 after it was changed for development.

    Cross-port: 53f8673

KMAIN-254: TCN display in search results list

    Cross-port: 8c81b2f

KMAIN-418: Hide "Prefix/Title" field from patron reg screen

    Cross-port: fea6b1b

KMAIN-413 - View Checked Out Details link not updating count - self checkout

    Cross-port: 362014f

KMAIN-205: SCK message if multiple barcode scans

    Cross-port: 435f3ee

KMAIN-421: Staging missing local KCLS changes

    Cross-port: eca548e

KMAIN-136: Patron Reg form to match KCLS prod

    Cross-port: 7369cab

Conflicts:
Open-ILS/web/css/skin/default/register.css

kmain-163_#_search_again

    Cross-port: 4adf71d

kmain-331_fixed-circ-fine-issue

    Cross-port: b1124f6

KMAIN-392 - Updating my lists

    Cross-port: 02a9b2c

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm

kmain-396 exact search modified:   usr/lib/perl5/site_perl/5.8.8/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm (cherry picked from commit f56f3d61499fc8beac376256117bf22eb9adefc1)

    Cross-port: 97d8914

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm

kmain151_replace_dash_with_space

    Cross-port: 3b95587

kmain-74_self_checkout_menus_work

    Cross-port: e95b677

KMAIN-3: Autopopulate barcode from patron holds tab on staff place hold

    Cross-port: 09a9561

kmain163_contains_phrase_#_works

    Cross-port: a3cf362

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm

KMAIN-404 - Context switch after placing a hold

    Cross-port: 61423b4

kmain-331_ecommerce_for_bibliocommons

    Cross-port: e3aa6e7

KMAIN-46 - Edit Remove Alert

    Cross-port: ff9bc1a

kmain-46 - Defaul message dropdown

    Cross-port: 776a43f

KMAIN-143 - Change publisher weight, add publisher index to dropdown options

    Cross-port: fcf87f0

kmain-151 - Hyphens are ignored in search.

    Cross-port: 9ff8534

KMAIN-403 - Mockups for bib record links in manage authorities

    Cross-port: eb75b2c

KMAIN-383 - Added link to bib record

    Cross-port: 9982f43

KMAIN-227 - Enhance the Manage Authorities interface

    Cross-port: 2b214f4

kmain227_Authority_browse_interface

    Cross-port: 590666f

kmain-9 additional changes to openils/var/templates_kcls/opac/parts/record/summary.tt2 modified:   openils/var/templates_kcls/opac/parts/record/summary.tt2

    Cross-port: 1f6c0a6

KMAIN-110 KCLS-98 Title matches exactly

    Cross-port: a217a39

KMAIN-181 Item Status [Addendum]

    Cross-port: 57e264a

KMAIN-383 - Manage Authorities Interface - Search ID Enhancement

    Cross-port: 046a96d

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm

kmain-384_matches_exactly_dollar_sign

    Cross-port: b82547b

KMAIN-11: Default Dropdown for patron messages

    Cross-port: 84acdf5

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm

Conflicts:
Open-ILS/xul/staff_client/chrome/content/main/constants.js

KMAIN-385: Standard Patron Messages

    Cross-port: a5efc1a

Conflicts:
Open-ILS/xul/staff_client/chrome/content/main/about.html

kmain-315 - Sort patron messages in chronological order. NOTE: This solution uses javascript; kmain-319 asks for sort using fieldmapper. modified:   openils/var/web/xul/rel_2_4_1/server/patron/standing_penalties.js (cherry picked from commit bb615f7e3b92df02d7430298f22109257e5cd4e7)

    Cross-port: e32ac57

kmain-9 xul fix kmain-9 tt2 fix hash: 0abd8a19eac0fd93a0e4b5643f4cebe27d7ac860 Signed-off-by: David Boyle <dboyle@catalystitservices.com>

    Cross-port: 2dd0f59

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm

kmain-9. Partial fix - still needs fix to xul <End> button modified:   openils/var/templates_kcls/opac/parts/record/extras.tt2 modified:   openils/var/templates_kcls/opac/parts/record/summary.tt2 modified:   openils/var/templates_kcls/opac/parts/result/paginate.tt2 modified:   openils/var/templates_kcls/opac/results.tt2 (cherry picked from commit 0abd8a19eac0fd93a0e4b5643f4cebe27d7ac860)

    Cross-port: 57123d4

KMAIN227 - part uno fix

    Cross-port: 1c49b88

kmain-227-part-uno

    Cross-port: 08980d6

KMAIN 332 - commit 2

    Cross-port: 909da68

KMAIN-332 Staff can toggle circ history

    Cross-port: 1178b73

Updated authority files. Added files for import of bibs Getting ready for demo.

    Cross-port: 5984783

KMAIN-318 Holds count fix

    Cross-port: ffb13a0

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm

Moved custom rec_hold_count() code to a new rec_hold_count_kcls()
to reduce merge conflicts going forward function.

KMAIN-330 - Research MVLC implementation of Authority Control

    Cross-port: e8b8026

KMAIN-160: Shelf Expire Timestamp

    Cross-port: d73e70c

KMAIN-141: OPAC display of ebook CN

    Cross-port: 2a71c1a

KMAIN-348 - Add Page Number Navigation to My Lists

    Cross-port: 6e75f1b

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm

kmain-10. Default staff client page from 2.2 modified:

openils/var/web/xul/rel_2_4_1/server/index.xhtml (cherry picked from commit 2c8568b142902b7f2e9b1ae503219bfe10519c8d)

    Cross-port: 96d66b3

Conflicts:
Open-ILS/xul/staff_client/server/index.xhtml

Conflicts:
Open-ILS/xul/staff_client/server/index.xhtml

kmain-310. Additional language search Searches MARC 041 for additional language codes.

SQL scripts add new metabib.language_filter table and associated
trigger/scripts
new file:   sql/kmain-310/kclsupgrad34.rollback.sql
new file:   sql/kmain-310/kclsupgrad34.sql
modified:   usr/lib/perl5/site_perl/5.8.8/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
(cherry picked from commit baf328d0c8a9ffb10eeb243db2fe4278ff1adcec)

    Cross-port: 7952a80

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm

KMAIN-328 - single copy count when searching by lib

    Cross-port: b922cca

KMAIN153 - Default Search Library (Dan Scott Fix)

    Cross-port: 0b50aa9

KMAIN-201 - Karen: Remove Default Phone # from Patron Registration screen under USER SETTINGS

    Cross-port: f186103

KMAIN203 - KCLSUPGRAD95 - KCLSUPGRAD30 - Remove Checkbox for Exempt Collections

    Cross-port: f2730b1

KMAIN326 - Do Not Allow Creation of a List Without a Title.

    Cross-port: e9c7422

Sort results descending was not working properly. Fixed.

    Cross-port: 704f279

Fixed a issue with a label not showing up on the Patron Search Screen.

    Cross-port: b8f7788

KMAIN-324 Fixes bug: Copy and Hold count were not displaying properly

    Cross-port: 77f6b0d

KMAIN-49 KCM-3 overwrite old transit info

    Cross-port: ad52384

KMIG-72 KCLSUPGRAD-27 Record Summary scroll bar

    Cross-port: 4f73c3e

KMIG-52-KCLSUPGRAD-98-user_activity_tracking_feature

    Cross-port: e774e36

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm

  Search Templates (kmig 123)

    Cross-port: 5f1f13e

kmain-168 - sort checked out items original ticket KCM-17 modified:   openils/conf/fm_IDL.xml (cherry picked from commit b4f413dcf9592c321cadc024c427e5c931645c28)

    Cross-port: 0811348

Conflicts:
Open-ILS/examples/fm_IDL.xml

KMAIN154 - KMIG45 - KCLSUPGRAD12 - Backdating Lost Item

    Cross-port: ec196ab

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm

kmain-27 changes to slider (READometer slide change). jpg from 2.2 Collections.pm is 2.4 version modified:   openils/var/templates_kcls/opac/parts/homesearch.tt2 (cherry picked from commit 049c548b309052689d25b0d7d7068c5dbb0f753f)

    Cross-port: 00ef5ef

KMAIN-85: Holds Pull List - add an indicator for copy-specify item

    Cross-port: 7b8f6f6

KMIG43 and KMIG250 - KMAIN117 and KMAIN12 - KCLSUPGRAD10 and KCLSUPGRAD15

    Cross-port: 85738f7

Ports Marc Edit Tiles (KMIG-99,103,111)

    Cross-port: 2b9072c

Copied 2.4.1 staff client build folder into repo

    Cross-port: 958d2a0

KMIG49 - KCLSUPGRAD19 - Uncancel Hold Feature - Not Observing Hold Polices

    Cross-port: 2f9c839

KMIG-53 : KCLSUPGRAD-28 : Patron search by record number missing

    Cross-port: 518726b

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm

KMIG-57 : KCLSUPGRAD-33: Set all patron's Default Search Location to KCLS

    Cross-port: f194b73

KMIG-187: Hold Queue Position

    Cross-port: bba2c05

kmig-214 - email request from KCLS/Bradley for production changes homesearch.tt2 was changed via kmig-217 modified:   openils/var/templates_kcls/opac/parts/homesearch.tt2 modified:   openils/var/web/css/skin/default/opac/style.css (cherry picked from commit 3c45a198065faabff08fde6f93f1048c4631d4af)

    Cross-port: 006f8ae

kmig-225 - additional marc templates requested in 07/29/2013 email from Bradley new file:   openils/var/templates/marc/k_Book_on_CD.xml new file:   openils/var/templates/marc/k_Book_revised.xml new file:   openils/var/templates/marc/k_DVD.xml new file:   openils/var/templates/marc/k_Large_Print.xml new file:   openils/var/templates/marc/k_Music_CD.xml new file:   openils/var/templates/marc/k_Player.xml (cherry picked from commit e3c65708993725528f6472d23cad3ab03379afaa)

    Cross-port: 641ffcf

KMIG-71: KCLSUPGRAD-39: Cancel button in staff client Place Hold does not work

    Cross-port: 246a5bd

Fixes context with new tab!

    Cross-port: f0c436b

kmig-149 change username text on patron registration page Requested by Bradley in email 04/22/2013 modified:   openils/conf/fm_IDL.xml

    Cross-port: cd87eea

kmig-147 - 3fab37   Added SQL changes per Matt's email of 04/29/2013 new file:   sql/kmig-147.sql (cherry picked from commit 6c3aaf53653b859ac8ed838ce5377ce6fd545dd4)

    Cross-port: 354d61d

Forward ported changes for KCM-8

    Cross-port: bbf5fe0

Ports KCLSUPGRAD-6 - Creating PO from Acq brief record

    Cross-port: 219b41c

Upgraded stock EG code to tag 2_4_1

    Cross-port: 4de67518bad776e9b2ea2e55169efd016a16b17d

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm
Open-ILS/web/css/skin/default/acq.css
Open-ILS/web/css/skin/default/opac/semiauto.css

LP1776736 Record merge marc edit repairs

1. Fixes issues where edits to MARC records would fail to save during
   merge.

2. Provide options to select flat or non-flat text editor in edit mode
   for record merges.

3. Allow record editor action buttons/selectors to flow down
   horizontally when they don't fit in a narrow space.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>

LP1749502 - Holds Pull List Print Order

- Expose call number affix sortkey data.
- Use sortkey data to sort default pull list template.
- Combine all call number info into one field in default pull list template.
- Sorty by shelf location position if it exists, then by shelf location name if it doesn't
- Only grab copy info if copy is assigned, to not break patron holds grid.
- Remove some web console logging only needed for testing.

Signed-off-by: Josh Stompro <stompro@stompro.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: John Amundson <jamundson@cwmars.org>

LP 1749502: Add Call Number Prefix & Suffix to pull list print template.

We add the call number prefix and suffix as separate columns to the
holds pull list print template.  We also add the suffix to the end of
the orderBy so that we also sort by the suffix.

Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Josh Stompro <stompro@stompro.org>
Signed-off-by: John Amundson <jamundson@cwmars.org>