Koha/installer/data/mysql/atomicupdate
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
..
0001-bug_2929-permit_to_define_fine_days_in_issuing_rules.pl Merge fixes and removing warnings 2009-09-30 11:30:40 +02:00
0004-Add_Some_Missing_fields_to_suggestions.pl Fix file permissions: if it is not a script, it should not be executable. 2010-04-16 00:40:34 -04:00
0005-Add_CAS_Configuration.pl Fix file permissions: if it is not a script, it should not be executable. 2010-04-16 00:40:34 -04:00
0007-Opac-search-history.pl Fix file permissions: if it is not a script, it should not be executable. 2010-04-16 00:40:34 -04:00
0008-opac-description-for-authorised-values.pl
0009-patron-attr-display-checkout.pl Fix for Bug 5436 - Extended patron attributes display improvements 2011-09-23 15:35:54 +12:00
bug_6843_Renew_membership_from_expiry_or_current_date.pl Renew membership from expiry date or from current date based on a syspref 2012-02-01 22:53:40 +01:00
bug_7144-add-returnbranch-to-branch-item-issuing-rules.pl Enhancement 7144: Floating Collections (per branch/itemtype) 2012-03-21 10:28:26 +01:00
bug_7284_authority_linking_pt1 signed off Bug 7284: Authority matching improvements 2012-03-07 17:34:11 +01:00
bug_7284_authority_linking_pt2 signed off Bug 7284: Authority matching improvements 2012-03-07 17:34:11 +01:00
hourlyloans.sql Bug 5549 : Allow hourly loans to be indicated in the loan rules 2012-03-20 12:07:19 +13:00
issuedate_times.pl Bug 5549 : Add script to convert issue_dates 2012-03-20 13:21:33 +13:00
local_cover_images.pl Bug 1633: QA follow-up 2012-01-24 11:16:10 +01:00
oai_sets.sql Bug 6440: Implement OAI-PMH Sets 2012-03-20 11:38:26 +01:00
subscription_add_enddate.pl Bug 2505 - Add commented use warnings where missing in the installer/ directory 2010-04-21 20:26:28 +12:00