Merge remote-tracking branch 'refs/remotes/origin/master' into sandbox-adminvar-journal
# Conflicts: # tests/application/modules/opac/controllers/RecordCustomLinksTest.php
Branches
Tags
Showing
- VERSIONS 61 additions, 0 deletionsVERSIONS
- VERSIONS_WIP/101702 1 addition, 0 deletionsVERSIONS_WIP/101702
- application/modules/admin/controllers/BibnumController.php 20 additions, 0 deletionsapplication/modules/admin/controllers/BibnumController.php
- application/modules/admin/controllers/IndexController.php 1 addition, 6 deletionsapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/controllers/RecordsController.php 23 additions, 14 deletionsapplication/modules/admin/controllers/RecordsController.php
- application/modules/admin/controllers/SessionActivityController.php 2 additions, 4 deletions...n/modules/admin/controllers/SessionActivityController.php
- application/modules/admin/controllers/TemplateController.php 21 additions, 0 deletionsapplication/modules/admin/controllers/TemplateController.php
- application/modules/admin/views/scripts/bibnum/artevod-dashboard.phtml 2 additions, 0 deletions...odules/admin/views/scripts/bibnum/artevod-dashboard.phtml
- application/modules/admin/views/scripts/index/index.phtml 5 additions, 1 deletionapplication/modules/admin/views/scripts/index/index.phtml
- application/modules/admin/views/scripts/template/apply.phtml 32 additions, 0 deletionsapplication/modules/admin/views/scripts/template/apply.phtml
- application/modules/opac/controllers/AbonneController.php 11 additions, 3 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/AuthController.php 1 addition, 0 deletionsapplication/modules/opac/controllers/AuthController.php
- application/modules/opac/controllers/BibController.php 15 additions, 2 deletionsapplication/modules/opac/controllers/BibController.php
- application/modules/opac/controllers/BlogController.php 3 additions, 8 deletionsapplication/modules/opac/controllers/BlogController.php
- application/modules/opac/controllers/CmsController.php 21 additions, 11 deletionsapplication/modules/opac/controllers/CmsController.php
- application/modules/opac/views/scripts/auth/newsletter-register-mail.phtml 0 additions, 6 deletions...es/opac/views/scripts/auth/newsletter-register-mail.phtml
- application/modules/opac/views/scripts/auth/oauth.phtml 2 additions, 1 deletionapplication/modules/opac/views/scripts/auth/oauth.phtml
- application/modules/opac/views/scripts/blog/viewavis.phtml 2 additions, 6 deletionsapplication/modules/opac/views/scripts/blog/viewavis.phtml
- application/modules/opac/views/scripts/head.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/head.phtml
- application/modules/opac/views/scripts/index/formulairecontact.phtml 5 additions, 5 deletions.../modules/opac/views/scripts/index/formulairecontact.phtml
Please register or sign in to comment