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#64573_amelioration_de_la_charte_modele # Conflicts: # cosmogramme/sql/patch/patch_334.php
Branches
Tags 5.13.1
Pipeline
#2408
passed
with stage
in
22 minutes and 7 seconds
Showing
- VERSIONS_WIP/51538 1 addition, 0 deletionsVERSIONS_WIP/51538
- VERSIONS_WIP/63069 1 addition, 0 deletionsVERSIONS_WIP/63069
- VERSIONS_WIP/64069 2 additions, 0 deletionsVERSIONS_WIP/64069
- VERSIONS_WIP/64073 1 addition, 0 deletionsVERSIONS_WIP/64073
- application/modules/admin/controllers/BatchController.php 74 additions, 7 deletionsapplication/modules/admin/controllers/BatchController.php
- application/modules/admin/controllers/ExternalAgendasController.php 4 additions, 12 deletions...n/modules/admin/controllers/ExternalAgendasController.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
- cosmogramme/sql/patch/patch_334.php 5 additions, 2 deletionscosmogramme/sql/patch/patch_334.php
- cosmogramme/sql/patch/patch_335.php 13 additions, 0 deletionscosmogramme/sql/patch/patch_335.php
- library/Class/Batch.php 80 additions, 5 deletionslibrary/Class/Batch.php
- library/Class/Batch/Abstract.php 6 additions, 1 deletionlibrary/Class/Batch/Abstract.php
- library/Class/Batch/Definition.php 75 additions, 0 deletionslibrary/Class/Batch/Definition.php
- library/Class/Batch/ExternalAgenda.php 34 additions, 0 deletionslibrary/Class/Batch/ExternalAgenda.php
- library/Class/Batch/PremierChapitre.php 7 additions, 2 deletionslibrary/Class/Batch/PremierChapitre.php
- library/Class/Cosmogramme/Integration/PhaseBatchs.php 8 additions, 1 deletionlibrary/Class/Cosmogramme/Integration/PhaseBatchs.php
Please register or sign in to comment