Merge branch 'master' into rd_#14085_pnb
Showing
- VERSIONS 15 additions, 0 deletionsVERSIONS
- VERSIONS_WIP/dev_#16860_mycow 1 addition, 0 deletionsVERSIONS_WIP/dev_#16860_mycow
- application/modules/admin/controllers/AlbumController.php 46 additions, 13 deletionsapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/controllers/IndexController.php 1 addition, 0 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/UsersController.php 23 additions, 24 deletionsapplication/modules/admin/controllers/UsersController.php
- application/modules/admin/views/scripts/index/adminvar.phtml 13 additions, 1 deletionapplication/modules/admin/views/scripts/index/adminvar.phtml
- application/modules/admin/views/scripts/index/adminvaredit.phtml 14 additions, 2 deletions...tion/modules/admin/views/scripts/index/adminvaredit.phtml
- application/modules/opac/controllers/ModulesController.php 14 additions, 0 deletionsapplication/modules/opac/controllers/ModulesController.php
- application/modules/opac/controllers/NoticeajaxController.php 12 additions, 0 deletions...ication/modules/opac/controllers/NoticeajaxController.php
- application/modules/opac/views/scripts/modules/mycow-sso.phtml 15 additions, 0 deletions...cation/modules/opac/views/scripts/modules/mycow-sso.phtml
- application/modules/opac/views/scripts/recherche/viewnotice.phtml 1 addition, 0 deletions...ion/modules/opac/views/scripts/recherche/viewnotice.phtml
- application/modules/push/controllers/MultimediaController.php 48 additions, 12 deletions...ication/modules/push/controllers/MultimediaController.php
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/php/integration/domaines.php 10 additions, 6 deletionscosmogramme/php/integration/domaines.php
- cosmogramme/sql/patch/patch_235.php 2 additions, 9 deletionscosmogramme/sql/patch/patch_235.php
- cosmogramme/sql/patch/patch_236.php 8 additions, 0 deletionscosmogramme/sql/patch/patch_236.php
- cosmogramme/sql/patch/patch_237.php 4 additions, 0 deletionscosmogramme/sql/patch/patch_237.php
- cosmogramme/sql/patch/patch_238.php 14 additions, 0 deletionscosmogramme/sql/patch/patch_238.php
Please register or sign in to comment