Merge branch 'master' into 'sandbox_fusion_search_result_and_print'
Master See merge request !780
Showing
- .htaccess 1 addition, 1 deletion.htaccess
- VERSIONS 83 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/AccueilController.php 1 addition, 1 deletionapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/AlbumController.php 97 additions, 16 deletionsapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/controllers/CmsController.php 6 additions, 0 deletionsapplication/modules/admin/controllers/CmsController.php
- application/modules/admin/controllers/HarvestController.php 146 additions, 124 deletionsapplication/modules/admin/controllers/HarvestController.php
- application/modules/admin/controllers/IndexController.php 16 additions, 30 deletionsapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/controllers/ModulesnoticeController.php 7 additions, 16 deletions...ion/modules/admin/controllers/ModulesnoticeController.php
- application/modules/admin/controllers/MultimediaController.php 32 additions, 6 deletions...cation/modules/admin/controllers/MultimediaController.php
- application/modules/admin/controllers/SystemeController.php 17 additions, 20 deletionsapplication/modules/admin/controllers/SystemeController.php
- application/modules/admin/controllers/UsersController.php 23 additions, 24 deletionsapplication/modules/admin/controllers/UsersController.php
- application/modules/admin/views/scripts/album/import-dilicom.phtml 1 addition, 0 deletions...on/modules/admin/views/scripts/album/import-dilicom.phtml
- application/modules/admin/views/scripts/cms/_newsform_head.phtml 16 additions, 12 deletions...tion/modules/admin/views/scripts/cms/_newsform_head.phtml
- application/modules/admin/views/scripts/harvest/orphea-browse.phtml 48 additions, 0 deletions...n/modules/admin/views/scripts/harvest/orphea-browse.phtml
- application/modules/admin/views/scripts/head.phtml 4 additions, 4 deletionsapplication/modules/admin/views/scripts/head.phtml
- application/modules/admin/views/scripts/index/adminvar.phtml 18 additions, 6 deletionsapplication/modules/admin/views/scripts/index/adminvar.phtml
- application/modules/admin/views/scripts/index/adminvaredit.phtml 4 additions, 30 deletions...tion/modules/admin/views/scripts/index/adminvaredit.phtml
- application/modules/admin/views/scripts/popup.phtml 1 addition, 2 deletionsapplication/modules/admin/views/scripts/popup.phtml
- application/modules/opac/controllers/BibNumeriqueController.php 18 additions, 1 deletion...ation/modules/opac/controllers/BibNumeriqueController.php
- application/modules/opac/controllers/CasServerController.php 5 additions, 8 deletionsapplication/modules/opac/controllers/CasServerController.php
Please register or sign in to comment