Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master
Conflicts: VERSIONS library/Class/Indexation/PseudoNotice/UnimarcVisitor.php library/startup.php
Showing
- VERSIONS 7 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/ModoController.php 53 additions, 4 deletionsapplication/modules/admin/controllers/ModoController.php
- application/modules/admin/controllers/WidgetController.php 1 addition, 4 deletionsapplication/modules/admin/controllers/WidgetController.php
- application/modules/admin/views/scripts/modo/membreview.phtml 29 additions, 55 deletions...ication/modules/admin/views/scripts/modo/membreview.phtml
- library/Class/Indexation/PseudoNotice/UnimarcVisitor.php 37 additions, 22 deletionslibrary/Class/Indexation/PseudoNotice/UnimarcVisitor.php
- library/Class/Systeme/Widget/Abstract.php 17 additions, 4 deletionslibrary/Class/Systeme/Widget/Abstract.php
- library/Class/Users.php 4 additions, 1 deletionlibrary/Class/Users.php
- library/Class/UsersNonValid.php 15 additions, 2 deletionslibrary/Class/UsersNonValid.php
- library/ZendAfi/Controller/Plugin/Manager/Article.php 7 additions, 6 deletionslibrary/ZendAfi/Controller/Plugin/Manager/Article.php
- tests/application/modules/admin/controllers/ModoControllerTest.php 218 additions, 0 deletions...lication/modules/admin/controllers/ModoControllerTest.php
- tests/application/modules/opac/controllers/AuthControllerTest.php 4 additions, 1 deletion...plication/modules/opac/controllers/AuthControllerTest.php
- tests/library/Class/Indexation/PseudoNoticeTest.php 37 additions, 2 deletionstests/library/Class/Indexation/PseudoNoticeTest.php
Please register or sign in to comment