merge r18687 from trunk for cookie library changes
authorphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 12 Nov 2010 18:00:08 +0000 (18:00 +0000)
committerphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 12 Nov 2010 18:00:08 +0000 (18:00 +0000)
commitc34773663f5708941e58c06e43251fcc3c30e271
treef0cc470fce87cf88fb246f0cc8955929aabd357d
parentc280cb5b36fe46b383425dae862ef0fc6446293f
merge r18687 from trunk for cookie library changes

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18713 dcc99617-32d9-48b4-a31d-7c20da2025e4
36 files changed:
Open-ILS/web/conify/global/actor/org_unit.html
Open-ILS/web/conify/global/actor/org_unit.js
Open-ILS/web/conify/global/actor/org_unit_type.html
Open-ILS/web/conify/global/actor/org_unit_type.js
Open-ILS/web/conify/global/config/copy_status.html
Open-ILS/web/conify/global/config/copy_status.js
Open-ILS/web/conify/global/config/marc_code_maps.html
Open-ILS/web/conify/global/permission/grp_tree.html
Open-ILS/web/conify/global/permission/grp_tree.js
Open-ILS/web/conify/global/permission/perm_list.html
Open-ILS/web/conify/global/permission/perm_list.js
Open-ILS/web/js/ui/base.js
Open-ILS/web/opac/common/js/RemoteRequest.js
Open-ILS/web/opac/common/js/opac_utils.js
Open-ILS/web/opac/extras/bbags.xml
Open-ILS/web/opac/extras/circ/alt_holds_print.html
Open-ILS/web/opac/extras/selfcheck/selfcheck.js
Open-ILS/web/opac/extras/selfcheck/selfcheck.xml
Open-ILS/web/opac/skin/craftsman/js/sidebar.js
Open-ILS/web/opac/skin/default/js/adv_global.js
Open-ILS/web/opac/skin/default/js/mresult.js
Open-ILS/web/opac/skin/default/js/rresult.js
Open-ILS/web/opac/skin/default/js/sidebar.js
Open-ILS/web/opac/skin/default/xml/common/js_common.xml
Open-ILS/web/reports/oils_rpt.js
Open-ILS/web/reports/oils_rpt_common.xhtml
Open-ILS/web/reports/xul/template_builder.xul
Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
Open-ILS/xul/staff_client/server/main/data.xul
Open-ILS/xul/staff_client/server/patron/ue.xhtml