Merge branch 'dev-bloc-info-integration' into 'master'
Dev bloc info integration See merge request !1910
Branches
Tags
Showing
- VERSIONS_WIP/hackfest_bloc_info_integration 1 addition, 0 deletionsVERSIONS_WIP/hackfest_bloc_info_integration
- application/modules/admin/controllers/IndexController.php 7 additions, 1 deletionapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/views/scripts/head.phtml 1 addition, 1 deletionapplication/modules/admin/views/scripts/head.phtml
- application/modules/admin/views/scripts/index/index.phtml 31 additions, 54 deletionsapplication/modules/admin/views/scripts/index/index.phtml
- cosmogramme/php/integre_traite_main.php 0 additions, 1 deletioncosmogramme/php/integre_traite_main.php
- library/Class/Cosmogramme/Integration/PhasePrepareIntegrations.php 3 additions, 0 deletions...lass/Cosmogramme/Integration/PhasePrepareIntegrations.php
- library/Class/TimeSource.php 12 additions, 3 deletionslibrary/Class/TimeSource.php
- library/Class/Users.php 6 additions, 7 deletionslibrary/Class/Users.php
- library/ZendAfi/Acl/AdminControllerGroup.php 2 additions, 2 deletionslibrary/ZendAfi/Acl/AdminControllerGroup.php
- library/ZendAfi/View/Helper/Admin/CosmoStatus.php 109 additions, 0 deletionslibrary/ZendAfi/View/Helper/Admin/CosmoStatus.php
- library/ZendAfi/View/Helper/Admin/LigneInfos.php 22 additions, 9 deletionslibrary/ZendAfi/View/Helper/Admin/LigneInfos.php
- library/ZendAfi/View/Helper/Admin/MenuHorizontalAdmin.php 4 additions, 6 deletionslibrary/ZendAfi/View/Helper/Admin/MenuHorizontalAdmin.php
- tests/application/modules/admin/controllers/AdminControllerTest.php 2 additions, 5 deletions...ication/modules/admin/controllers/AdminControllerTest.php
- tests/application/modules/admin/controllers/IndexControllerTest.php 137 additions, 57 deletions...ication/modules/admin/controllers/IndexControllerTest.php
- tests/application/modules/admin/controllers/UsersControllerTest.php 1 addition, 1 deletion...ication/modules/admin/controllers/UsersControllerTest.php
- tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php 11 additions, 3 deletions.../Cosmogramme/Integration/PhasePrepareIntegrationsTest.php
Please register or sign in to comment