Merge branch 'stable' into hotline-master
Conflicts: VERSIONS library/startup.php
Showing
- VERSIONS 7 additions, 0 deletionsVERSIONS
- application/modules/opac/controllers/NoticeajaxController.php 3 additions, 2 deletions...ication/modules/opac/controllers/NoticeajaxController.php
- application/modules/opac/controllers/RechercheController.php 6 additions, 6 deletionsapplication/modules/opac/controllers/RechercheController.php
- library/Class/AdminVar/CVS.php 34 additions, 0 deletionslibrary/Class/AdminVar/CVS.php
- library/Class/CVSLink.php 4 additions, 4 deletionslibrary/Class/CVSLink.php
- library/Class/Systeme/ModulesMenu/CVS.php 4 additions, 4 deletionslibrary/Class/Systeme/ModulesMenu/CVS.php
- library/ZendAfi/Form/ContactForm.php 1 addition, 1 deletionlibrary/ZendAfi/Form/ContactForm.php
- tests/application/modules/opac/controllers/FormulaireContactTest.php 8 additions, 2 deletions...cation/modules/opac/controllers/FormulaireContactTest.php
- tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 10 additions, 4 deletions...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
- tests/fixtures/RessourcesNumeriquesFixtures.php 1 addition, 0 deletionstests/fixtures/RessourcesNumeriquesFixtures.php
- tests/library/Class/CVSLinkTest.php 56 additions, 0 deletionstests/library/Class/CVSLinkTest.php
- tests/library/Class/Systeme/ModulesMenu/CvsTest.php 13 additions, 3 deletionstests/library/Class/Systeme/ModulesMenu/CvsTest.php
Please register or sign in to comment