2007-07-25  erickson

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm:
	  backporting callnumber sort: svn merge -r7577:7578
	  svn://svn.open-ils.org/ILS/trunk

	* branches/rel_1_2/Open-ILS/web/opac/skin/default/js/rdetail.js:
	  backporting callnumber sort fix: svn merge -r7579:7580
	  svn://svn.open-ils.org/ILS/trunk

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm:
	  backporting xact-reopen logic to set-lost: svn merge -r7581:7582
	  svn://svn.open-ils.org/ILS/trunk

2007-07-31  erickson

	* branches/rel_1_2/Evergreen/xul/staff_client/server/patron/ue_config.js:
	  back-porting less restrictive phone regex

2007-08-01  miker

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm:
	  backporting from 1.3: result filtering based on copy circ_lib
	  instead of cn owning_lib

2007-08-02  miker

	* branches/rel_1_2/Open-ILS/examples/fm_IDL.xml: typo found by Bill
	  in an IDL reporting view description

2007-08-15  miker

	* branches/rel_1_2/Open-ILS/examples/fm_IDL.xml,
	  branches/rel_1_2/Open-ILS/examples/opensrf.xml.example,
	  branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/actor.pm,
	  branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm,
	  branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm,
	  branches/rel_1_2/Open-ILS/src/sql/Pg/005.schema.actors.sql:
	  settings server controlled opt-in functionallity for non-home_ou
	  transactions

	* branches/rel_1_2/Open-ILS/examples/fm_IDL.xml: cut-n-paste error;
	  fixing array position

2007-08-15  phasefx

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/bills.js:
	  fixes bug 569 : shove patron data into bill payment receipts for
	  template use, so %PATRON_BARCODE% works in bill_payment template

2007-08-15  erickson

	* branches/rel_1_2/Open-ILS/src/extras/ils_events.xml,
	  branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm:
	  backporting opt-in and patron search org/depth handling: svn
	  merge -r7667:7669 svn://svn.open-ils.org/ILS/trunk

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm:
	  backporting barcode exists returns user id: svn merge -r7677:7678
	  svn://svn.open-ils.org/ILS/trunk

2007-08-15  miker

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/money.pm:
	  collections API for "users owning me money"

2007-08-15  phasefx

	* branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/main/constants.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul:
	  backporting UI for user-lib-opt-in functionality

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/search_form.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/search_result.js:
	  UI for patron search range/depth selection

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/bills.js:
	  oopsie

	* branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/main/main.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/copy_browser.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/copy_editor.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/copy_status.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js:
	  backport filepicker bug fix, and for Item Status interface,
	  handle VOLUME_LABEL_EXISTS event on callnumber edit

2007-08-16  erickson

	* branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/common/holds.xml:
	  svn merge -r7687:7688
	  svn://svn.open-ils.org/ILS/trunk/Open-ILS/web/opac/skin/default/xml/common/holds.xml

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm:
	  cut out unnecessary call

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm:
	  svn merge -r7692:7693 svn://svn.open-ils.org/ILS/trunk/

2007-08-16  miker

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm,
	  branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul:
	  fixing weird edge case of pushing out the due date after fines
	  start to acrue

	* branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul:
	  rolling back accidental commit

2007-08-17  miker

	* branches/rel_1_2/Open-ILS/src/extras/import/marc2are.pl,
	  branches/rel_1_2/Open-ILS/src/extras/import/marc2bre.pl,
	  branches/rel_1_2/Open-ILS/src/extras/marc2html: removing control
	  characters from XML with reckless abandon

2007-08-21  erickson

	* branches/rel_1_2/Open-ILS/admin/ils_admin/setup/ils_data/models.py:
	  backporting some model fixes from trunk, in particular the
	  format_id xmltransform fix and replacing a raw string with the
	  django i18n wrapper

2007-08-21  miker

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm:
	  backporting hold stalling support to 1.2

2007-08-23  phasefx

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/copy_browser.js:
	  backport twisty fix for holdings maintenance to rel_1_2

2007-08-26  phasefx

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/items.js:
	  backport a row-refresh bug for Items Out to rel_1_2

	* branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/util/list.js:
	  backport to 1.2 a fix for single-row refresh and on_all_fleshed
	  callback

2007-08-26  erickson

	* branches/rel_1_2/Evergreen/conf/lib_ips.txt: adding some more lib
	  IP ranges for PINES

2007-08-27  phasefx

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/items.js:
	  backport to rel_1_2 a fix for renewals in patron Items Out

2007-08-28  miker

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm:
	  crazy thinko ... dead code removed

2007-08-28  phasefx

	* branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul:
	  hotkey for reprint last receipt

2007-08-29  phasefx

	* branches/rel_1_2/Open-ILS/xul/staff_client/application.ini: let's
	  do dbs' suggested update of the vendor string, app version and id
	  for rel_1_2

	* branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.pl,
	  branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.sh:
	  some more dbs fixes ported to rel_1_2

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/main/ws_info.xul:
	  backport workstation registration bugfix so that an incorrect org
	  doesn't show up selected in the list by happenstance

	* branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul:
	  let's silence some debugging output, add in a global convenience
	  function, and correct some debug/trace output

	* branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/main/constants.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/main/menu.js,
	  branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul,
	  branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/user_buckets.xul:
	  Since we intend to push out a 1.2 staff client, I want to stub
	  out Volume and User buckets in the chrome so we can add them
	  later with a server-side xul upgrade, in case those get added in
	  a 1.2.x release

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/checkout.js:
	  fix for the bug in the prevent-redundant-barcode-scan feature
	  during checkout, where a failed attempt at a checkout will not
	  allow a re-attempt

2007-09-05  phasefx

	* branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/copy_editor.js:
	  backport to 1.2 the item editor Owning Lib/Pre-cat bugfix

2007-09-05  erickson

	* branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm:
	  backporting: svn merge -r7758:7759
	  svn://svn.open-ils.org/ILS/trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm

2007-09-06  miker

	* .: tagging RC3 of 1.2 -- some bug fixes and exposing a little
	  extra functionality.