Merge branch 'hotline-master' into 'master'
Hotline master See merge request !798
Showing
- .htaccess 29 additions, 27 deletions.htaccess
- VERSIONS 18 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/CatalogueController.php 44 additions, 62 deletions...ication/modules/admin/controllers/CatalogueController.php
- application/modules/admin/controllers/IndexController.php 0 additions, 6 deletionsapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/views/scripts/catalogue/_catalogue_row.phtml 37 additions, 35 deletions...odules/admin/views/scripts/catalogue/_catalogue_row.phtml
- application/modules/admin/views/scripts/catalogue/form.phtml 23 additions, 22 deletionsapplication/modules/admin/views/scripts/catalogue/form.phtml
- application/modules/admin/views/scripts/catalogue/index.phtml 32 additions, 28 deletions...ication/modules/admin/views/scripts/catalogue/index.phtml
- application/modules/admin/views/scripts/index/index.phtml 2 additions, 6 deletionsapplication/modules/admin/views/scripts/index/index.phtml
- library/Class/Users.php 3 additions, 1 deletionlibrary/Class/Users.php
- library/ZendAfi/View/Helper/Admin/ComboCatalogue.php 30 additions, 22 deletionslibrary/ZendAfi/View/Helper/Admin/ComboCatalogue.php
- library/ZendAfi/View/Helper/BaseHelper.php 7 additions, 1 deletionlibrary/ZendAfi/View/Helper/BaseHelper.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/admin/controllers/AdminIndexControllerTest.php 0 additions, 65 deletions...on/modules/admin/controllers/AdminIndexControllerTest.php
- tests/application/modules/admin/controllers/CatalogueControllerTest.php 28 additions, 18 deletions...ion/modules/admin/controllers/CatalogueControllerTest.php
Please register or sign in to comment