There was a problem fetching the pipeline stages.
Merge remote-tracking branch 'refs/remotes/afi/master' into...
Merge remote-tracking branch 'refs/remotes/afi/master' into dev#61350_entrepot_oai_gallica_europeana # Conflicts: # application/modules/admin/views/scripts/album/edit-images.phtml # library/ZendAfi/View/Helper/TagUploadMultiple.php # tests/library/ZendAfi/View/Helper/TagUploadMultipleTest.php
Branches
Tags
Pipeline
#2746
passed
with stage
in
30 minutes and 44 seconds
Showing
- VERSIONS 24 additions, 0 deletionsVERSIONS
- amber/afi/js/AFI.deploy.js 0 additions, 26 deletionsamber/afi/js/AFI.deploy.js
- amber/afi/js/AFI.js 0 additions, 36 deletionsamber/afi/js/AFI.js
- amber/afi/souvigny/iviewer/jquery.iviewer.js 1 addition, 1 deletionamber/afi/souvigny/iviewer/jquery.iviewer.js
- amber/afi/souvigny/iviewer/jquery.iviewer.min.js 14 additions, 14 deletionsamber/afi/souvigny/iviewer/jquery.iviewer.min.js
- amber/afi/st/AFI.st 0 additions, 10 deletionsamber/afi/st/AFI.st
- amber/src/js/Canvas.deploy.js 2 additions, 38 deletionsamber/src/js/Canvas.deploy.js
- amber/src/js/Canvas.js 5 additions, 52 deletionsamber/src/js/Canvas.js
- amber/src/st/Canvas.st 1 addition, 25 deletionsamber/src/st/Canvas.st
- application/modules/admin/controllers/IndexController.php 5 additions, 1 deletionapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/controllers/RedmineController.php 66 additions, 10 deletionsapplication/modules/admin/controllers/RedmineController.php
- application/modules/admin/views/scripts/album/edit-images.phtml 113 additions, 119 deletions...ation/modules/admin/views/scripts/album/edit-images.phtml
- application/modules/admin/views/scripts/cms/versions.phtml 5 additions, 27 deletionsapplication/modules/admin/views/scripts/cms/versions.phtml
- application/modules/admin/views/scripts/harvest/_harvest_progress.phtml 1 addition, 1 deletion...dules/admin/views/scripts/harvest/_harvest_progress.phtml
- application/modules/admin/views/scripts/harvest/orphea-browse.phtml 1 addition, 1 deletion...n/modules/admin/views/scripts/harvest/orphea-browse.phtml
- application/modules/admin/views/scripts/modo/articlesformulaires.phtml 20 additions, 14 deletions...odules/admin/views/scripts/modo/articlesformulaires.phtml
- application/modules/admin/views/scripts/oai/browse.phtml 6 additions, 6 deletionsapplication/modules/admin/views/scripts/oai/browse.phtml
- application/modules/admin/views/scripts/profil/proprietes.phtml 3 additions, 11 deletions...ation/modules/admin/views/scripts/profil/proprietes.phtml
- application/modules/admin/views/scripts/redmine/edit-issue.phtml 10 additions, 0 deletions...tion/modules/admin/views/scripts/redmine/edit-issue.phtml
- application/modules/admin/views/scripts/redmine/index.phtml 0 additions, 1 deletionapplication/modules/admin/views/scripts/redmine/index.phtml
Please register or sign in to comment