Koha/catalogue
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
..
cardview.pl Bug 4330 : Adding some copyright BibLibre statements 2011-03-21 10:57:20 +13:00
detail.pl Bug 5549: Formatting duedates in catalogue scripts 2012-03-20 12:35:57 +13:00
detailprint.pl Bug 6050 Make calls to GetItemsInfo consistent 2011-06-14 14:12:02 +12:00
export.pl Bug 7345: Enable exporting records sans private fields 2012-02-13 11:32:18 +01:00
image.pl Bug 7600: Return a single-pixel GIF when no local cover image exists 2012-03-20 16:54:31 +01:00
imageviewer.pl Bug 1633: QA follow-up 2012-01-24 11:16:10 +01:00
ISBDdetail.pl Bug 5729 - Add CoinS to intranet 2011-12-27 18:37:20 +01:00
issuehistory.pl Bug 5549 : Fix a couple of date issues from testing 2012-03-20 13:22:12 +13:00
labeledMARCdetail.pl Bug 5791 - Robust handling of deleted/non-existent biblios and authority records 2011-04-20 12:03:59 +12:00
MARCdetail.pl Bug 5729 - Add CoinS to intranet 2011-12-27 18:37:20 +01:00
moredetail.pl Merge remote-tracking branch 'kc/master' into merged_5549 2012-03-22 09:36:55 +13:00
search.pl Bug 7310: Code changes for Improving list permissions 2012-03-21 16:46:40 +01:00
showmarc.pl Merge remote-tracking branch 'origin/master' into new/bug_6679 2011-12-08 10:08:44 +01:00
updateitem.pl Bug 6296: allow users to be authenticated by SSL client certs 2012-03-19 17:02:44 +01:00