There was a problem fetching the pipeline stages.
Merge remote-tracking branch 'refs/remotes/origin/master' into...
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#61314_explorateur_de_fichier_bokeh # Conflicts: # public/admin/css/subModal.css
Branches
Tags
Pipeline
#2425
passed
with stage
in
20 minutes and 46 seconds
Showing
- VERSIONS 34 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/BatchController.php 74 additions, 7 deletionsapplication/modules/admin/controllers/BatchController.php
- application/modules/admin/controllers/BibController.php 27 additions, 0 deletionsapplication/modules/admin/controllers/BibController.php
- application/modules/admin/controllers/ExternalAgendasController.php 4 additions, 12 deletions...n/modules/admin/controllers/ExternalAgendasController.php
- application/modules/admin/controllers/IndexController.php 3 additions, 2 deletionsapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/controllers/ModulesController.php 2 additions, 3 deletionsapplication/modules/admin/controllers/ModulesController.php
- application/modules/admin/controllers/ProfilController.php 22 additions, 2 deletionsapplication/modules/admin/controllers/ProfilController.php
- application/modules/admin/views/scripts/batch/add.phtml 0 additions, 1 deletionapplication/modules/admin/views/scripts/batch/add.phtml
- application/modules/admin/views/scripts/batch/edit.phtml 0 additions, 1 deletionapplication/modules/admin/views/scripts/batch/edit.phtml
- application/modules/admin/views/scripts/batch/index.phtml 16 additions, 39 deletionsapplication/modules/admin/views/scripts/batch/index.phtml
- application/modules/admin/views/scripts/batch/plan.phtml 1 addition, 0 deletionsapplication/modules/admin/views/scripts/batch/plan.phtml
- application/modules/admin/views/scripts/external-agendas/index.phtml 20 additions, 26 deletions.../modules/admin/views/scripts/external-agendas/index.phtml
- application/modules/admin/views/scripts/index/index.phtml 28 additions, 0 deletionsapplication/modules/admin/views/scripts/index/index.phtml
- application/modules/admin/views/scripts/modules/auth-login.phtml 2 additions, 4 deletions...tion/modules/admin/views/scripts/modules/auth-login.phtml
- application/modules/opac/controllers/AbonneController.php 2 additions, 5 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/BibController.php 2 additions, 17 deletionsapplication/modules/opac/controllers/BibController.php
- application/modules/opac/views/scripts/head.phtml 0 additions, 1 deletionapplication/modules/opac/views/scripts/head.phtml
- application/modules/opac/views/scripts/site_down.phtml 1 addition, 0 deletionsapplication/modules/opac/views/scripts/site_down.phtml
- application/modules/telephone/controllers/AbonneController.php 5 additions, 6 deletions...cation/modules/telephone/controllers/AbonneController.php
- cosmogramme/sql/patch/patch_334.php 8 additions, 0 deletionscosmogramme/sql/patch/patch_334.php
Please register or sign in to comment