Merge branch 'github_master'
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 6 Oct 2011 18:08:41 +0000 (14:08 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 6 Oct 2011 18:08:41 +0000 (14:08 -0400)
Conflicts:
admin/AdminMisc.xml
admin/Upgrading-Evergreen-2.0.xml
admin/acquisitions_admin_functions.xml
admin/actiontriggers.xml
admin/admin-booking.xml
admin/admin-lsa_2.0.xml
admin/localization.xml
admin/migratingdata_2.0.xml
admin/serversideinstallation_2.0.xml
admin/sip.xml
admin/staffclientinstallation.xml
admin/troubleshooting.xml
admin/z3950.xml
appendices/installchecklist.xml
appendices/schema.xml.bk
development/OpenSRF_intro.xml
development/customize_opac.xml
development/customizingstaffclient.xml
development/datamodelsandaccess.xml
development/directoriesandFiles.xml
development/installchecklist.xml
development/introduction_to_sql.xml
development/json.xml
development/supercat.xml
intro/releasenotes.xml
media/acq__marc_search.png
media/acq_activate.png
media/acq_apply_claim_policy.png
media/acq_brief_record-2.png
media/acq_brief_record.png
media/acq_cancel_copy.png
media/acq_cancel_line_items.png
media/acq_cancel_order.png
media/acq_claim_item-2.png
media/acq_claim_item-3.png
media/acq_claim_item-4.png
media/acq_claim_item-5.png
media/acq_claim_item.png
media/acq_export_list.png
media/acq_funds-2.png
media/acq_funds.png
media/acq_invoice_blanket.png
media/acq_invoice_line_items.png
media/acq_invoice_link.png
media/acq_invoice_purchase_order.png
media/acq_invoice_view-2.png
media/acq_invoice_view.png
media/acq_line_items_add_copies-2.png
media/acq_line_items_add_copies-3.png
media/acq_line_items_add_copies.png
media/acq_line_items_add_notes.png
media/acq_line_items_alerts-2.png
media/acq_line_items_alerts.png
media/acq_line_items_link-2.png
media/acq_line_items_link.png
media/acq_line_items_update_barcodes.png
media/acq_line_items_view_history.png
media/acq_line_items_worksheet-2.png
media/acq_line_items_worksheet.png
media/acq_load_marc_records.png
media/acq_load_records.png
media/acq_marc_search-2.png
media/acq_marc_search.png
media/acq_purchase_order_add_charges.png
media/acq_purchase_order_add_note.png
media/acq_purchase_order_create.png
media/acq_purchase_order_history.png
media/acq_purchase_order_name.png
media/acq_purchase_order_print.png
media/acq_purchase_order_split-2.png
media/acq_purchase_order_split.png
media/acq_purchase_order_view-2.png
media/acq_purchase_order_view.png
media/acq_search.png
media/acq_selection_clone.png
media/acq_selection_create.png
media/acq_selection_mark_ready-2.png
media/acq_selection_mark_ready.png
media/acq_selection_merge.png
media/batch-receive-apply.png
media/batch-receive-autogen-1.png
media/batch-receive-autogen-2.png
media/batch-receive-choose-iss.png
media/batch-receive-partial.png
media/batch-receive-print-routing.png
media/batch-receive-receive.png
media/batch-receive-received.png
media/batch-receive-simple.png
media/create-copy-template.png
media/create-distrib.png
media/create-iss-1.png
media/create-iss-2.png
media/create-many-streams.png
media/create-sub.png
media/create-template-1.png
media/create-template-10.png
media/create-template-11.png
media/create-template-12.png
media/create-template-13.png
media/create-template-15.png
media/create-template-16.png
media/create-template-17.png
media/create-template-19.png
media/create-template-2.png
media/create-template-20.png
media/create-template-21.png
media/create-template-22.png
media/create-template-23.png
media/create-template-24.png
media/create-template-25.png
media/create-template-26.png
media/create-template-27.png
media/create-template-28.png
media/create-template-29.png
media/create-template-3.png
media/create-template-30.png
media/create-template-31.png
media/create-template-32.png
media/create-template-33.png
media/create-template-34.png
media/create-template-35.png
media/create-template-4.png
media/create-template-5.png
media/create-template-6.png
media/create-template-7.png
media/create-template-8.png
media/create-template-9.png
media/create_an_issuance1.png
media/create_an_issuance2.png
media/create_an_issuance3.png
media/create_an_issuance4.png
media/create_an_issuance5.png
media/distribs-to-streams.png
media/find-copy-template-menu.png
media/folder-1.png
media/folder-10.png
media/folder-11.png
media/folder-12.png
media/folder-13.png
media/folder-14.png
media/folder-7a.png
media/generate-report-1.png
media/generate-report-10.png
media/generate-report-14.png
media/generate-report-2.png
media/generate-report-3.png
media/generate-report-8.png
media/generate-report-9.png
media/generate_item_predictions1.png
media/generate_item_predictions2.png
media/generate_item_predictions3.png
media/generated-iss-delete-dummy.png
media/lsa-1.png
media/lsa-10.jpg
media/lsa-11.jpg
media/lsa-12.jpg
media/lsa-14.jpg
media/lsa-16.jpg
media/lsa-17.jpg
media/lsa-18.jpg
media/lsa-2.jpg
media/lsa-22.png
media/lsa-23.jpg
media/lsa-25.jpg
media/lsa-26.jpg
media/lsa-27.jpg
media/lsa-28.jpg
media/lsa-32.jpg
media/lsa-33.jpg
media/lsa-4.jpg
media/lsa-5.jpg
media/lsa-7.jpg
media/lsa-8.jpg
media/lsa-closed-mountain-1.png
media/lsa-closed-mountain-2.png
media/lsa-group-0.png
media/lsa-group-1.png
media/lsa-group-1a.png
media/lsa-group-2.png
media/lsa-group-3.png
media/lsa-group-4.png
media/lsa-group-5.png
media/lsa-group-6.png
media/new-stream.png
media/predict-how-many.png
media/receipt-10.jpg
media/receipt-11.jpg
media/receipt-12.jpg
media/receipt-13.jpg
media/receipt-14.jpg
media/receipt-15.jpg
media/receipt-16.png
media/receipt-17.jpg
media/receipt-18.jpg
media/receipt-19.jpg
media/receipt-2.jpg
media/receipt-20.jpg
media/receipt-21.jpg
media/receipt-22.jpg
media/receipt-23.jpg
media/receipt-24.jpg
media/receipt-3.jpg
media/receipt-4.jpg
media/receipt-5.jpg
media/receipt-6.jpg
media/receipt-7.jpg
media/receipt-8.jpg
media/receipt-9.jpg
media/received-items-in-catalog.png
media/routing-list-add.png
media/routing-list-drag.png
media/routing-list-manage.png
media/save-scap.png
media/scap-wiz-page-1.png
media/scap-wiz-page-2.png
media/scap-wiz-page-3.png
media/scap-wiz-page-4.png
media/schema_diagram_acq_claiming.png
media/schema_diagram_acq_currency.png
media/schema_diagram_acq_distribution_formula.png
media/schema_diagram_acq_funds.png
media/schema_diagram_acq_invoice.png
media/schema_diagram_acq_line_Item_attributes.png
media/schema_diagram_acq_line_ltems.png
media/schema_diagram_acq_provider.png
media/schema_diagram_acq_user_request.png
media/schema_diagram_action_holds.png
media/schema_diagram_action_survey.png
media/schema_diagram_action_trigger.png
media/schema_diagram_actor.png
media/schema_diagram_asset.png
media/schema_diagram_authority.png
media/schema_diagram_biblio.png
media/schema_diagram_booking.png
media/schema_diagram_circ_matrix.png
media/schema_diagram_circulation.png
media/schema_diagram_config.png
media/schema_diagram_container.png
media/schema_diagram_hold_matrix.png
media/schema_diagram_metabib.png
media/schema_diagram_money.png
media/schema_diagram_offline.png
media/schema_diagram_permissions.png
media/schema_diagram_query.png
media/schema_diagram_reporter.png
media/schema_diagram_search.png
media/schema_diagram_serials_tables.png
media/schema_diagram_staging.png
media/schema_diagram_vandelay.png
media/serial_special_issue1.png
media/serial_special_issue2.png
media/serversideinstallation-staffclient-running-1.png
media/serversideinstallation-staffclient-running-2.png
media/serversideinstallation-staffclient-running-3.png
media/serversideinstallation-staffclient-running-4.png
media/serversideinstallation-testing-1.png
media/serversideinstallation-testing-2.png
media/serversideinstallation-virtual-vbox-install-1.png
media/serversideinstallation-virtual-vbox-install-2.png
media/serversideinstallation-virtual-vbox-install-3.png
media/serversideinstallation-virtual-vbox-install-4.png
media/serversideinstallation-virtual-vbox-install-5.png
media/serversideinstallation-virtual-vm-install-1.png
media/serversideinstallation-virtual-vm-install-10.png
media/serversideinstallation-virtual-vm-install-11.png
media/serversideinstallation-virtual-vm-install-12.png
media/serversideinstallation-virtual-vm-install-13.png
media/serversideinstallation-virtual-vm-install-14.png
media/serversideinstallation-virtual-vm-install-15.png
media/serversideinstallation-virtual-vm-install-16.png
media/serversideinstallation-virtual-vm-install-17.png
media/serversideinstallation-virtual-vm-install-18.png
media/serversideinstallation-virtual-vm-install-19.png
media/serversideinstallation-virtual-vm-install-2.png
media/serversideinstallation-virtual-vm-install-20.png
media/serversideinstallation-virtual-vm-install-21.png
media/serversideinstallation-virtual-vm-install-3.png
media/serversideinstallation-virtual-vm-install-4.png
media/serversideinstallation-virtual-vm-install-5.png
media/serversideinstallation-virtual-vm-install-6.png
media/serversideinstallation-virtual-vm-install-7.png
media/serversideinstallation-virtual-vm-install-8.png
media/serversideinstallation-virtual-vm-install-9.png
media/shared-template-6.png
media/shared-template-7.png
media/shared-template-9.png
media/staffclientinstallation-staffclient-1.png
media/staffclientinstallation-staffclient-2.png
media/start-from-catalog.png
media/sub-details.png
media/subscription-manage.png
media/survey-1.png
media/survey-10.png
media/survey-2.png
media/survey-3.png
media/survey-4.png
media/survey-5.png
media/survey-6.png
media/survey-7.png
media/survey-8.png
media/survey-9.png
media/view-output-1.png
media/view-output-2.png
media/view-output-3.png
media/view-output-4.png
media/view-output-5.png
reports/report-add-data-source.xml
reports/report-create-template.xml
reports/report-exporting-report-templates-using-phppgadmin.xml
reports/report-folder.xml
reports/report-generate-report.xml
reports/report-recurring-report.xml
reports/report-report-introduction.xml
reports/report-shared-template.xml
reports/report-startingreporter.xml
reports/report-template-terminology.xml
reports/report-view-output.xml
reports/report.diffs
stafftasks/acquisitions.xml
stafftasks/acquisitions_module-GPLS.xml
stafftasks/alternate_serial_control.xml
stafftasks/booking.xml
stafftasks/cataloging.xml
stafftasks/kcls_acquisitions.xml
stafftasks/serials-gpls.xml
stafftasks/stafftasks_intro.xml

1  2 
media/caption-pattern-tab.png
stafftasks/README

diff --combined media/caption-pattern-tab.png
index bc7e27b,bc7e27b..0000000
deleted file mode 100755,100755
Binary files differ
diff --combined stafftasks/README
index 0000000,0000000..e69de29
new file mode 100644 (file)
--- /dev/null
--- /dev/null