Koha/admin
Chris Cormack 0c40ff9f98 Merge remote-tracking branch 'kc/master' into merged_5549
Fixed conflicts

Conflicts:
	catalogue/moredetail.pl
	installer/data/mysql/updatedatabase.pl
	koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
2012-03-22 09:36:55 +13:00
..
admin-home.pl
aqbudget_owner_search.pl bug_6253: Unified member Search() 2011-10-19 16:23:02 +13:00
aqbudgetperiods.pl Bug 6943: Added ability to duplicate a budget tree (from the edit sub menu) 2012-02-03 17:53:59 +01:00
aqbudgets.pl Bug 6834 : Removing last of the $template->{param_map} 2011-09-03 06:37:50 +12:00
aqcontract.pl Bug 7113: Standardize vendor id name in templates and scripts 2012-02-17 19:04:00 +01:00
aqplan.pl Bug 6752: Be stricter with utf-8 encoding of output 2012-01-27 12:11:06 +01:00
auth_subfields_structure.pl
auth_tag_structure.pl
authorised_values.pl bug 7450 small follow-up, removing warn 2012-02-03 12:09:24 +01:00
authtypes.pl
biblio_framework.pl
branch_transfer_limits.pl Bug 6842 FU : library transfer limits edits not stored 2012-02-01 22:47:56 +01:00
branches.pl Fix for Bug 6458 - incorrect parsing result in translation processing / branches 2011-09-14 10:08:47 +12:00
categorie.pl Fix for Bug 6872 - Can't set default SMS messaging options for patron category 2011-09-27 21:35:41 +13:00
check_budget_parent.pl
check_parent_total.pl
checkmarc.pl
cities.pl
classsources.pl
clone-rules.pl
currency.pl
env_tz_test.pl
fieldmapping.pl
import_export_framework.pl
item_circulation_alerts.pl
itemtypes.pl
koha2marclinks.pl
marc_subfields_structure.pl Bug 6475 - Edit it's not possible in subfield "0" in MARC framework 2011-11-18 22:32:35 +01:00
marctagstructure.pl
matching-rules.pl Bug 6713, editing matching rules broken 2011-08-13 20:06:41 +12:00
oai_set_mappings.pl Bug 6440: Implement OAI-PMH Sets 2012-03-20 11:38:26 +01:00
oai_sets.pl Bug 6440: Implement OAI-PMH Sets 2012-03-20 11:38:26 +01:00
patron-attr-types.pl Fix for Bug 5436 - Extended patron attributes display improvements 2011-09-23 15:35:54 +12:00
preferences.pl Bug 7330 - System preferences editor generates errors in the log with each search 2011-12-15 17:24:44 +01:00
printers.pl
roadtype.pl
smart-rules.pl Merge remote-tracking branch 'kc/master' into merged_5549 2012-03-22 09:36:55 +13:00
stopwords.pl
systempreferences.pl Bug 6190: BorrowerUnwantedField syspref and removing fields from the patron entry 2012-01-06 17:30:25 +01:00
z3950servers.pl Bug 7582 - When adding a Z39.50 server the "checked" option should use a checkbox 2012-02-27 18:33:12 +01:00