KMAIN-1235 Red Highlighting of fines on titles still checked out missing after update

    Cross-port: ff07a88

KMAIN-1236-After Aug 5 prod update, CKO screen "done" button printing empty receipts

    Cross-port: 35e48ce

Conflicts:
Open-ILS/xul/staff_client/server/circ/checkout.js

KMAIN-905 - Client speed impacted by error when viewing patron 'grid' displays

    Cross-port: b58ebe2

Integrate patches from launchpad bug 1086458 related to staff client memory leak.

    Cross-port: f1aee81

Conflicts:
Open-ILS/xul/staff_client/server/circ/checkout.js

All cataloging date commits in one as of  2014-06-26

    Cross-port: 3f22bff

Conflicts:
Open-ILS/xul/staff_client/server/cat/marcedit.js

Conflicts:
Open-ILS/web/opac/locale/en-US/lang.dtd

KMAIN-879 - Patron Holds not Sorting

    Cross-port: 5818227

Conflicts:
Open-ILS/xul/staff_client/server/cat/copy_browser.js

Holding_Maintenance Attempts to fix refresh issue on pgpooled dbs

    Cross-port: 231f1bb

Conflicts:
Open-ILS/xul/staff_client/server/cat/copy_browser.js

Adding in a change to zips.txt at Brad's request

    Cross-port: 7e31277

Made change to the function volatility as requested by Nierman

    Cross-port: 6fec585

KMAIN-848 - Holding Maintenance - Volumes altered in 'Raplace Barcode' dialo don't work correctly

    Cross-port: 8370533

Conflicts:
Open-ILS/xul/staff_client/server/cat/copy_browser.js

Holding_maintenance - SQL update to exclude deleted volumes

    Cross-port: b1b43f2

All Holdings Maintenance Code Smashed Together (2014.03.20)

    Cross-port: 115c74a

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
Open-ILS/xul/staff_client/server/cat/copy_browser.js

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
Open-ILS/xul/staff_client/chrome/content/main/constants.js

KMAIN-722: Correct Sort order for Patron Standard Messages

    Cross-port: f38c379

Change wording slightly to work around submit button wording change. (cherry picked from commit dd5deafe19e47a4604655266b60aba19a6b862dd)

    Cross-port: 3637de9

change multiple_penalties border color to light blue (same as single penalty) (cherry picked from commit 6fb978ac33b9133ffc42b73413c2ae8749fc9fd4)

    Cross-port: 8f3ea0f

Update zips.txt file to include more recent info (cherry picked from commit b24ddac2247894052e7470c64e9cf0492371b97b)

    Cross-port: a2a97c1

KMAIN-718: Hide display of Fines information

    Cross-port: cc5bea8

KMAIN-733: Part 2: KCLS local changes (Feb 04 2014)

    Cross-port: 66f6944

KMAIN-733: KCLS local changes (Feb 04 2014)

    Cross-port: a0e0fd6

KMAIN-695: Batch record modification to update last edit date

    Cross-port: 4bf867d

reinstate "Mark Received" and "Un-Receive" options to individual line items. This feature was removed in 2.4 but staff requested it to be added back.

    Cross-port: 1defb6b

ISBN Picker enhancements to show picked and add "Apply All" (cherry picked from commit e37c412e7b9156639bb51021a06893cfee5e4d40)

    Cross-port: b19ece3

KMAIN-645: Commit Chilifresh removal

    Cross-port: edae1dc

Fixed "scan as missing pieces" wizard to print slip to receipt printer context. (cherry picked from commit 889abb36d1797f543429c76a3fb196ef14e0babe)

    Cross-port: f69af00

Hides billing types and credit amount from bills2.xul screen (cherry picked from commit c2dc23de2385e22a17e67efef1d43f306a445e1c)

    Cross-port: c75b210

KMAIN-599: Remove/hide feature from KMAIN-332

    Cross-port: 3f7ba2b

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