Merge branch 'hotline-master' into 'master'
Hotline master See merge request !1490
Branches
Tags
Showing
- VERSIONS 51 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/CmsController.php 2 additions, 6 deletionsapplication/modules/admin/controllers/CmsController.php
- application/modules/admin/controllers/ModoController.php 20 additions, 11 deletionsapplication/modules/admin/controllers/ModoController.php
- application/modules/admin/controllers/UsersController.php 44 additions, 44 deletionsapplication/modules/admin/controllers/UsersController.php
- application/modules/admin/views/scripts/modo/_avis_partial.phtml 0 additions, 9 deletions...tion/modules/admin/views/scripts/modo/_avis_partial.phtml
- application/modules/admin/views/scripts/modo/avisnotice.phtml 10 additions, 2 deletions...ication/modules/admin/views/scripts/modo/avisnotice.phtml
- application/modules/admin/views/scripts/modo/index.phtml 7 additions, 7 deletionsapplication/modules/admin/views/scripts/modo/index.phtml
- application/modules/admin/views/scripts/users/index.phtml 3 additions, 57 deletionsapplication/modules/admin/views/scripts/users/index.phtml
- application/modules/opac/controllers/RechercheController.php 0 additions, 8 deletionsapplication/modules/opac/controllers/RechercheController.php
- application/modules/opac/views/scripts/head.phtml 0 additions, 1 deletionapplication/modules/opac/views/scripts/head.phtml
- application/modules/opac/views/scripts/recherche/viewnotice.phtml 2 additions, 8 deletions...ion/modules/opac/views/scripts/recherche/viewnotice.phtml
- build.sh 1 addition, 1 deletionbuild.sh
- cosmogramme/cosmozend/application/modules/cosmo/controllers/IntegrationController.php 24 additions, 2 deletions...ation/modules/cosmo/controllers/IntegrationController.php
- cosmogramme/cosmozend/application/modules/cosmo/views/scripts/integration/generate-log.phtml 13 additions, 0 deletions...odules/cosmo/views/scripts/integration/generate-log.phtml
- cosmogramme/cosmozend/application/modules/cosmo/views/scripts/integration/generate.phtml 65 additions, 0 deletions...on/modules/cosmo/views/scripts/integration/generate.phtml
- cosmogramme/cosmozend/index.php 7 additions, 0 deletionscosmogramme/cosmozend/index.php
- cosmogramme/cosmozend/tests/CosmoControllerTestCase.php 7 additions, 1 deletioncosmogramme/cosmozend/tests/CosmoControllerTestCase.php
- cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php 404 additions, 3 deletions...n/modules/cosmo/controllers/IntegrationControllerTest.php
- cosmogramme/cosmozend/tests/bootstrap.php 1 addition, 2 deletionscosmogramme/cosmozend/tests/bootstrap.php
- cosmogramme/cosmozend/tests/bootstrap_frontcontroller.php 5 additions, 1 deletioncosmogramme/cosmozend/tests/bootstrap_frontcontroller.php
Please register or sign in to comment