This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The annotated tag, am123_pprod_110728 has been created
at 96b2eea03eb95af3b42ea7e957528f208477573d (tag)
tagging 8d42eb8070abea2c2518d9134c687f25791ea764 (commit)
replaces am123_prod_110704
tagged by Claire Hernandez
on Thu Jul 28 10:39:21 2011 +0200
- Log -----------------------------------------------------------------
Livraison mensuelle Aix Marseille
- mise à jour avec les derniers patchs de master (dont le 7184)
- 7239
- 7249
Détail des patchs:
$ git show-branch --sha1-name am123_prod_110704 origin/am123/wsapogeeharpege
! [am123_prod_110704] Merge remote branch 'origin/master' into prod/am123
! [origin/am123/wsapogeeharpege] MT7249: Use budget_expend and budget_encumb
--
+ [8d42eb8] MT7249: Use budget_expend and budget_encumb
+ [d2e970c] MT7249 Warn if an order will exceed allowed budget (cherry picked from commit df146e13756b390715085e1fd482ac25e29976ee)
+ [790051d] (MT #7184) Some bugs in readingrecord
+ [41bcbcf] (MT #4843) add C4::Dates->datefortablesorter function to define a correct tablesorter sort date type
+ [d27820e] (MT #6413) add syspref SubfieldsToDiscardWhenPrefill
+ [8c8b812] (MT #6760) add location_description support on opac-basket
+ [a0d15ad] MT6918: followup suggestions were displayed 3 times
+ [792ee73] (MT #6918) Fix broken moremember page due to a lack of a closing tag
+ [a7232d1] MT6342 : longoverdue.pl is limited to 366 days range.
+ [d87d65a] (MT #5826) Holds not allowed
+ [0f4b749] MT6409 View logs does not display logs even if it is activated
+ [863ae05] MT6480 comment in updatedatabase does not match action taken
+ [6349c7e] MT5399 follow-up Removing debug warnings
+ [b27bbe0] MT5399 In Overdue letters, code streettype is displais instead of label
+ [e2d3a51] (MT #5680)debug saving choices on addbiblio.pl
+ [e813c0c] (MT #6033)Add OpacHighlightedWords support on opac results using xslt
+ [da7a0ea] (MT #5121) Lack of street type in opac-userupdate.pl
+ [49ab385] (MT #5393) New filter and sorting in booksellers.pl
+ [bf3ccec] (MT #5066) Some troubles on reports.pl
+ [a33af97] MT7259: items count was missing, preventing from deleting all items
-- [3193280] Merge remote branch 'origin/master' into prod/am123
Christophe Croullebois (6):
(MT #5066) Some troubles on reports.pl
(MT #5393) New filter and sorting in booksellers.pl
(MT #5121) Lack of street type in opac-userupdate.pl
(MT #5826) Holds not allowed
(MT #7184) Some bugs in readingrecord
(MT #6918) Fix broken moremember page due to a lack of a closing tag
Claire Hernandez (3):
Merge remote branch 'remotes/origin/bug/MIN/MT7184'
Merge remote branch 'origin/master' into am123/wsapogeeharpege
MT7249 Warn if an order will exceed allowed budget
Henri-Damien LAURENT (1):
MT6918: followup suggestions were displayed 3 times
Julian Maurice (1):
MT7249: Use budget_expend and budget_encumb
Matthias Meusburger (1):
MT7259: items count was missing, preventing from deleting all items
Paul Poulain (1):
Merge remote-tracking branch 'origin/bug/MIN/MT6413'
Sophie Meynieux (11):
Merge branch 'MT5066'
Merge branch 'MT5393'
Merge branch 'MT5121'
Merge branch 'MT6033'
Merge branch 'MT5680'
MT5399 In Overdue letters, code streettype is displais instead of label
MT5399 follow-up Removing debug warnings
MT6480 comment in updatedatabase does not match action taken
MT6409 View logs does not display logs even if it is activated
Merge branch 'MT5826'
MT6342 : longoverdue.pl is limited to 366 days range.
Stéphane Delaune (5):
(MT #6033)Add OpacHighlightedWords support on opac results using xslt
(MT #5680)debug saving choices on addbiblio.pl
(MT #6413) add syspref SubfieldsToDiscardWhenPrefill
(MT #6760) add location_description support on opac-basket
(MT #4843) add C4::Dates->datefortablesorter function to define a correct tablesorter sort date type
-----------------------------------------------------------------------
hooks/post-receive
--
main Koha release repository