Merge branch 'stable' into 'master'
Stable See merge request !1792
Showing
- VERSIONS 9 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/47256 1 addition, 0 deletionsVERSIONS_HOTLINE/47256
- application/modules/admin/views/scripts/head.phtml 2 additions, 5 deletionsapplication/modules/admin/views/scripts/head.phtml
- application/modules/opac/controllers/RechercheController.php 4 additions, 8 deletionsapplication/modules/opac/controllers/RechercheController.php
- application/modules/opac/views/scripts/head.phtml 1 addition, 0 deletionsapplication/modules/opac/views/scripts/head.phtml
- library/ZendAfi/Acl/AdminControllerGroup.php 130 additions, 0 deletionslibrary/ZendAfi/Acl/AdminControllerGroup.php
- library/ZendAfi/Acl/AdminControllerRoles.php 3 additions, 1 deletionlibrary/ZendAfi/Acl/AdminControllerRoles.php
- library/ZendAfi/Controller/Plugin/AdminAuth.php 43 additions, 42 deletionslibrary/ZendAfi/Controller/Plugin/AdminAuth.php
- library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php 201 additions, 295 deletionslibrary/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
- library/ZendAfi/View/Helper/Heartbeat.php 34 additions, 0 deletionslibrary/ZendAfi/View/Helper/Heartbeat.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- public/admin/js/global.js 4 additions, 0 deletionspublic/admin/js/global.js
- public/admin/skins/bokeh74/colors/solarized_dark.css 1 addition, 0 deletionspublic/admin/skins/bokeh74/colors/solarized_dark.css
- public/admin/skins/bokeh74/global.css 1 addition, 1 deletionpublic/admin/skins/bokeh74/global.css
- public/admin/skins/retro/global.css 1 addition, 1 deletionpublic/admin/skins/retro/global.css
- public/opac/js/mugifly-jquery-simple-datetimepicker/jquery.simple-dtpicker.css 4 additions, 4 deletions...y-jquery-simple-datetimepicker/jquery.simple-dtpicker.css
- tests/application/modules/admin/controllers/AdminAuthControllerTest.php 170 additions, 18 deletions...ion/modules/admin/controllers/AdminAuthControllerTest.php
- tests/application/modules/admin/controllers/AlbumControllerDilicomPNBTest.php 8 additions, 1 deletion...dules/admin/controllers/AlbumControllerDilicomPNBTest.php
- tests/application/modules/admin/controllers/AlbumControllerPharoVideosTest.php 6 additions, 5 deletions...ules/admin/controllers/AlbumControllerPharoVideosTest.php
- tests/application/modules/admin/controllers/AlbumControllerTest.php 10 additions, 17 deletions...ication/modules/admin/controllers/AlbumControllerTest.php
Please register or sign in to comment