git.rot13.org Git - koha.git/commit

author	Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
	Fri, 10 Jul 2009 07:33:36 +0000 (09:33 +0200)
committer	Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
	Mon, 13 Jul 2009 10:49:00 +0000 (12:49 +0200)
commit	b03648dc1965c6996da87ac94af73c1f941c45c3
tree	3e36c88d5995d4cc6376ad1da2b225fba4d4079d	tree \| snapshot
parent	3c3dcf8fd9d440be560eb1b6025c0a129e7c5473	commit \| diff

Merge am123_dev sur Biblibre_head

fusionne les 2 branches de développement

152 files changed:

C4/Auth.pm		diff \| blob \| history
C4/Auth_with_cas.pm	[new file with mode: 0644]	blob
C4/AuthoritiesMarc.pm		diff \| blob \| history
C4/Biblio.pm		diff \| blob \| history
C4/Boolean.pm		diff \| blob \| history
C4/Charset.pm		diff \| blob \| history
C4/Circulation.pm		diff \| blob \| history
C4/Context.pm		diff \| blob \| history
C4/External/Syndetics.pm		diff \| blob \| history
C4/Items.pm		diff \| blob \| history
C4/Koha.pm		diff \| blob \| history
C4/Labels.pm		diff \| blob \| history
C4/Letters.pm		diff \| blob \| history
C4/Members.pm		diff \| blob \| history
C4/Output.pm		diff \| blob \| history
C4/Record.pm		diff \| blob \| history
C4/Reports/Guided.pm		diff \| blob \| history
C4/Reserves.pm		diff \| blob \| history
C4/Ris.pm	[new file with mode: 0644]	blob
C4/SIP/ILS/Item.pm		diff \| blob \| history
C4/SIP/ILS/Patron.pm		diff \| blob \| history
C4/SIP/ILS/Transaction/Hold.pm		diff \| blob \| history
C4/Search.pm		diff \| blob \| history
C4/Serials.pm		diff \| blob \| history
C4/Suggestions.pm		diff \| blob \| history
C4/VirtualShelves.pm		diff \| blob \| history
C4/VirtualShelves/Page.pm		diff \| blob \| history
C4/XSLT.pm		diff \| blob \| history
Makefile.PL		diff \| blob \| history
about.pl		diff \| blob \| history
acqui/acqui-home.pl		diff \| blob \| history
acqui/addorder.pl		diff \| blob \| history
acqui/neworderempty.pl		diff \| blob \| history
acqui/newordersuggestion.pl		diff \| blob \| history
admin/authorised_values.pl		diff \| blob \| history
admin/marctagstructure.pl		diff \| blob \| history
admin/smart-rules.pl		diff \| blob \| history
admin/systempreferences.pl		diff \| blob \| history
catalogue/search.pl		diff \| blob \| history
cataloguing/moveitem.pl	[new file with mode: 0755]	blob
cataloguing/z3950_search.pl		diff \| blob \| history
circ/circulation.pl		diff \| blob \| history
circ/returns.pl		diff \| blob \| history
installer/data/mysql/atomicupdate/0001-bug_2929-permit_to_define_fine_days_in_issuing_rules.pl	[new file with mode: 0755]	blob
installer/data/mysql/atomicupdate/0002-bug_3020-add_a_grace_period_to_subscriptions.pl	[new file with mode: 0755]	blob
installer/data/mysql/atomicupdate/0003-bug_2893-Allow_to_override_notforloan.pl	[new file with mode: 0644]	blob
installer/data/mysql/atomicupdate/0004-Add_Some_Missing_fields_to_suggestions.pl	[new file with mode: 0644]	blob
installer/data/mysql/atomicupdate/0005-Add_CAS_Configuration.pl	[new file with mode: 0644]	blob
installer/data/mysql/atomicupdate/0006-Add_default_tab_for_serials.pl	[new file with mode: 0644]	blob
installer/data/mysql/atomicupdate/0007-Opac-search-history.pl	[new file with mode: 0644]	blob
installer/data/mysql/atomicupdate/subscription_add_location_and_enddate.pl	[new file with mode: 0644]	blob
installer/data/mysql/en/mandatory/sysprefs.sql		diff \| blob \| history
installer/data/mysql/en/mandatory/userpermissions.sql		diff \| blob \| history
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql		diff \| blob \| history
installer/data/mysql/kohastructure.sql		diff \| blob \| history
installer/data/mysql/updatedatabase.pl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves/merge/selection.tmpl	[new file with mode: 0644]	blob
koha-tmpl/intranet-tmpl/prog/en/js/basket.js	[new symlink]	blob
koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.hoverIntent.minified.js	[new file with mode: 0644]	blob
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tmpl	[new file with mode: 0644]	blob
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/labels/pcard-members-search.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tmpl	[new file with mode: 0644]	blob
koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl	[new file with mode: 0755]	blob
koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl	[new file with mode: 0644]	blob
koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/css/opac.css		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/css/print.css		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/js/basket.js		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl	[new file with mode: 0644]	blob
koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl	[new file with mode: 0644]	blob
koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl	[new file with mode: 0644]	blob
koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl		diff \| blob \| history
members/boraccount.pl		diff \| blob \| history
members/borrowers_details.pl		diff \| blob \| history
members/deletemem.pl		diff \| blob \| history
members/mancredit.pl		diff \| blob \| history
members/maninvoice.pl		diff \| blob \| history
members/member-password.pl		diff \| blob \| history
members/memberentry.pl		diff \| blob \| history
members/messaging.pl		diff \| blob \| history
members/moremember.pl		diff \| blob \| history
members/notices.pl	[new file with mode: 0755]	blob
members/readingrec.pl		diff \| blob \| history
members/update-child.pl		diff \| blob \| history
misc/batchRebuildBiblioTables.pl		diff \| blob \| history
misc/cronjobs/clean_authorities.pl	[new file with mode: 0644]	blob
misc/cronjobs/holds/build_holds_queue.pl		diff \| blob \| history
misc/cronjobs/overdue_notices.pl		diff \| blob \| history
misc/migration_tools/22_to_30/rebuild_unimarc_100.pl		diff \| blob \| history
misc/migration_tools/bulkmarcimport.pl		diff \| blob \| history
misc/migration_tools/rebuild_zebra.pl		diff \| blob \| history
offline_circ/process_koc.pl		diff \| blob \| history
opac/oai.pl		diff \| blob \| history
opac/opac-ISBDdetail.pl		diff \| blob \| history
opac/opac-detail.pl		diff \| blob \| history
opac/opac-downloadcart.pl	[new file with mode: 0755]	blob
opac/opac-downloadshelf.pl	[new file with mode: 0755]	blob
opac/opac-export.pl		diff \| blob \| history
opac/opac-main.pl		diff \| blob \| history
opac/opac-rss.pl	[new file with mode: 0755]	blob
opac/opac-search-history.pl	[new file with mode: 0755]	blob
opac/opac-search.pl		diff \| blob \| history
opac/opac-suggestions.pl		diff \| blob \| history
opac/opac-user.pl		diff \| blob \| history
reports/serials_stats.pl		diff \| blob \| history
reserve/placerequest.pl		diff \| blob \| history
reviews/reviewswaiting.pl		diff \| blob \| history
serials/claims.pl		diff \| blob \| history
serials/lateissues-excel.pl		diff \| blob \| history
serials/routing-preview.pl		diff \| blob \| history
serials/routing.pl		diff \| blob \| history
serials/subscription-add.pl		diff \| blob \| history
serials/subscription-detail.pl		diff \| blob \| history
suggestion/acceptorreject.pl		diff \| blob \| history
suggestion/suggestion.pl	[new file with mode: 0755]	blob
t/lib/KohaTest/Suggestions.pm		diff \| blob \| history
tools/batchMod.pl	[new file with mode: 0755]	blob
tools/exceptionHolidays.pl		diff \| blob \| history
tools/export.pl		diff \| blob \| history
tools/import_borrowers.pl		diff \| blob \| history
tools/inventory.pl		diff \| blob \| history
tools/viewlog.pl		diff \| blob \| history
virtualshelves/addbybiblionumber.pl		diff \| blob \| history

Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git

RSS Atom