Merge branch 'stable' into hotline-master
# Conflicts: # VERSIONS # library/startup.php # tests/application/modules/opac/controllers/IndexControllerTest.php
Showing
- VERSIONS 12 additions, 0 deletionsVERSIONS
- application/modules/opac/controllers/HelpController.php 29 additions, 0 deletionsapplication/modules/opac/controllers/HelpController.php
- application/modules/opac/views/scripts/help/cookies.phtml 15 additions, 0 deletionsapplication/modules/opac/views/scripts/help/cookies.phtml
- library/Class/AdminVar.php 2 additions, 1 deletionlibrary/Class/AdminVar.php
- library/Class/ArticleCategorie.php 2 additions, 0 deletionslibrary/Class/ArticleCategorie.php
- library/Class/Cnil.php 84 additions, 0 deletionslibrary/Class/Cnil.php
- library/Class/Indexation.php 507 additions, 504 deletionslibrary/Class/Indexation.php
- library/Class/MoteurRecherche.php 1 addition, 0 deletionslibrary/Class/MoteurRecherche.php
- library/Class/NoticeOAI.php 12 additions, 12 deletionslibrary/Class/NoticeOAI.php
- library/Class/ScriptLoader.php 4 additions, 4 deletionslibrary/Class/ScriptLoader.php
- library/ZendAfi/Controller/Plugin/CnilConsent.php 30 additions, 0 deletionslibrary/ZendAfi/Controller/Plugin/CnilConsent.php
- library/ZendAfi/View/Helper/Help/GoogleAnalyticsWarning.php 26 additions, 0 deletionslibrary/ZendAfi/View/Helper/Help/GoogleAnalyticsWarning.php
- library/startup.php 2 additions, 1 deletionlibrary/startup.php
- tests/application/modules/AbstractControllerTestCase.php 4 additions, 0 deletionstests/application/modules/AbstractControllerTestCase.php
- tests/application/modules/admin/controllers/AdminIndexControllerTest.php 6 additions, 0 deletions...on/modules/admin/controllers/AdminIndexControllerTest.php
- tests/application/modules/admin/controllers/OaiControllerTest.php 6 additions, 6 deletions...plication/modules/admin/controllers/OaiControllerTest.php
- tests/application/modules/admin/controllers/UsersControllerTest.php 16 additions, 16 deletions...ication/modules/admin/controllers/UsersControllerTest.php
- tests/application/modules/opac/controllers/HelpControllerTest.php 87 additions, 0 deletions...plication/modules/opac/controllers/HelpControllerTest.php
- tests/application/modules/opac/controllers/IndexControllerTest.php 118 additions, 4 deletions...lication/modules/opac/controllers/IndexControllerTest.php
- tests/application/modules/opac/controllers/OAIControllerTest.php 1 addition, 1 deletion...pplication/modules/opac/controllers/OAIControllerTest.php
Please register or sign in to comment