Merge remote-tracking branch 'origin/hotline_6.43'
Conflicts: VERSIONS library/startup.php
Branches
Tags
Showing
- VERSIONS 5 additions, 0 deletionsVERSIONS
- application/modules/opac/controllers/SitoController.php 4 additions, 3 deletionsapplication/modules/opac/controllers/SitoController.php
- library/Class/Indexation/PseudoNotice.php 4 additions, 0 deletionslibrary/Class/Indexation/PseudoNotice.php
- library/Class/WebService/SIGB/Koha/PatronInfoReader.php 12 additions, 1 deletionlibrary/Class/WebService/SIGB/Koha/PatronInfoReader.php
- library/ZendAfi/View/Helper/Accueil/MenuVertical.php 2 additions, 2 deletionslibrary/ZendAfi/View/Helper/Accueil/MenuVertical.php
- library/ZendAfi/View/Helper/Avis.php 3 additions, 3 deletionslibrary/ZendAfi/View/Helper/Avis.php
- library/ZendAfi/View/Helper/CkEditor.php 20 additions, 3 deletionslibrary/ZendAfi/View/Helper/CkEditor.php
- library/ZendAfi/View/Helper/TagTitreEtNombreDeResultats.php 2 additions, 2 deletionslibrary/ZendAfi/View/Helper/TagTitreEtNombreDeResultats.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- scripts/clean_articles_url.php 13 additions, 0 deletionsscripts/clean_articles_url.php
- tests/application/modules/admin/controllers/AlbumControllerTest.php 3 additions, 1 deletion...ication/modules/admin/controllers/AlbumControllerTest.php
- tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php 15 additions, 1 deletion...c/controllers/RechercheControllerAlbumAudioRecordTest.php
- tests/application/modules/opac/controllers/SitoControllerTest.php 19 additions, 1 deletion...plication/modules/opac/controllers/SitoControllerTest.php
- tests/library/Class/WebService/SIGB/KohaFixtures.php 2 additions, 1 deletiontests/library/Class/WebService/SIGB/KohaFixtures.php
- tests/library/Class/WebService/SIGB/KohaTest.php 14 additions, 0 deletionstests/library/Class/WebService/SIGB/KohaTest.php
- tests/library/ZendAfi/View/Helper/Accueil/MenuVerticalTest.php 31 additions, 13 deletions.../library/ZendAfi/View/Helper/Accueil/MenuVerticalTest.php
- tests/library/ZendAfi/View/Helper/CkEditorTest.php 1 addition, 1 deletiontests/library/ZendAfi/View/Helper/CkEditorTest.php
Please register or sign in to comment