version 7.1.35
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master # Conflicts: # VERSIONS # cosmogramme/php/_init.php # cosmogramme/sql/patch/patch_237.php # library/Class/Systeme/PergameService.php # library/Class/Users.php # library/startup.php # tests/library/Class/ModelTestCase.php # tests/library/Class/Systeme/PergameServiceTest.php
Showing
- VERSIONS 14 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/23826 0 additions, 1 deletionVERSIONS_HOTLINE/23826
- application/modules/opac/views/scripts/head.phtml 2 additions, 2 deletionsapplication/modules/opac/views/scripts/head.phtml
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_237.php 1 addition, 1 deletioncosmogramme/sql/patch/patch_237.php
- cosmogramme/sql/patch/patch_257.php 5 additions, 0 deletionscosmogramme/sql/patch/patch_257.php
- library/Class/Batch/SendNewsletters.php 77 additions, 7 deletionslibrary/Class/Batch/SendNewsletters.php
- library/Class/Cosmogramme/Integration/Transaction.php 2 additions, 2 deletionslibrary/Class/Cosmogramme/Integration/Transaction.php
- library/Class/Newsletter.php 14 additions, 33 deletionslibrary/Class/Newsletter.php
- library/Class/NewsletterSubscription.php 12 additions, 11 deletionslibrary/Class/NewsletterSubscription.php
- library/Class/Profil.php 3 additions, 2 deletionslibrary/Class/Profil.php
- library/Class/Reservation.php 44 additions, 10 deletionslibrary/Class/Reservation.php
- library/Class/StatsNotices.php 5 additions, 5 deletionslibrary/Class/StatsNotices.php
- library/Class/Systeme/PergameService.php 17 additions, 20 deletionslibrary/Class/Systeme/PergameService.php
- library/Class/Users.php 5 additions, 4 deletionslibrary/Class/Users.php
- library/Class/WebService/SIGB/Pergame/Service.php 2 additions, 2 deletionslibrary/Class/WebService/SIGB/Pergame/Service.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php 7 additions, 0 deletions...ry/Class/Cosmogramme/Integration/PhaseReservationTest.php
- tests/library/Class/MockMailTransport.php 8 additions, 8 deletionstests/library/Class/MockMailTransport.php
- tests/library/Class/ModelTestCase.php 22 additions, 11 deletionstests/library/Class/ModelTestCase.php
Please register or sign in to comment