version 7.1.44
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master # Conflicts: # VERSIONS # application/modules/admin/controllers/AccueilController.php # application/modules/admin/controllers/SystemeController.php # library/Class/AvisNotice.php # library/Class/Systeme/ModulesAccueil/Kiosque.php # library/startup.php
Showing
- VERSIONS 8 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/AccueilController.php 9 additions, 31 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/SystemeController.php 121 additions, 124 deletionsapplication/modules/admin/controllers/SystemeController.php
- application/modules/admin/views/scripts/systeme/importavisopac2.phtml 41 additions, 111 deletions...modules/admin/views/scripts/systeme/importavisopac2.phtml
- library/Class/AvisNotice.php 18 additions, 2 deletionslibrary/Class/AvisNotice.php
- library/Class/Import/Opac2.php 162 additions, 0 deletionslibrary/Class/Import/Opac2.php
- library/Class/Systeme/ModulesAccueil/Calendrier.php 0 additions, 2 deletionslibrary/Class/Systeme/ModulesAccueil/Calendrier.php
- library/Class/Systeme/ModulesAccueil/Kiosque.php 50 additions, 1 deletionlibrary/Class/Systeme/ModulesAccueil/Kiosque.php
- library/Class/Systeme/ModulesAccueil/Null.php 10 additions, 8 deletionslibrary/Class/Systeme/ModulesAccueil/Null.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/admin/controllers/AccueilControllerTest.php 34 additions, 0 deletions...ation/modules/admin/controllers/AccueilControllerTest.php
- tests/application/modules/admin/controllers/SystemeControllerOpac2ImportTest.php 420 additions, 0 deletions...es/admin/controllers/SystemeControllerOpac2ImportTest.php
- tests/application/modules/admin/controllers/SystemeControllerTest.php 13 additions, 18 deletions...ation/modules/admin/controllers/SystemeControllerTest.php
- tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php 1 addition, 1 deletiontests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php
Please register or sign in to comment