Merge remote-tracking branch 'refs/remotes/afi/dev#27194-add-blocks-in-front' into afi-master
# Conflicts: # library/Class/Profil.php # library/ZendAfi/View/Helper/Accueil/Base.php # library/ZendAfi/View/Helper/FonctionsAdmin.php # tests/application/modules/opac/controllers/RechercheControllerTest.php # tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php
Branches
Tags
Showing
- VERSIONS_WIP/27194 1 addition, 0 deletionsVERSIONS_WIP/27194
- application/modules/admin/controllers/AccueilController.php 43 additions, 0 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/views/scripts/accueil/add-block.phtml 25 additions, 0 deletions...ation/modules/admin/views/scripts/accueil/add-block.phtml
- library/Class/Profil.php 28 additions, 0 deletionslibrary/Class/Profil.php
- library/ZendAfi/View/Helper/Accueil/Base.php 1 addition, 1 deletionlibrary/ZendAfi/View/Helper/Accueil/Base.php
- library/ZendAfi/View/Helper/Admin/ComboModuleAccueil.php 45 additions, 0 deletionslibrary/ZendAfi/View/Helper/Admin/ComboModuleAccueil.php
- library/ZendAfi/View/Helper/FonctionsAdmin.php 77 additions, 22 deletionslibrary/ZendAfi/View/Helper/FonctionsAdmin.php
- public/opac/css/global.css 1 addition, 1 deletionpublic/opac/css/global.css
- tests/application/modules/opac/controllers/RechercheControllerTest.php 15 additions, 0 deletions...tion/modules/opac/controllers/RechercheControllerTest.php
- tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php 41 additions, 2 deletionstests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php
Please register or sign in to comment