1. 23 Feb, 2018 3 commits
    • Ghislain Loas's avatar
      Merge branch... · 666372c9
      Ghislain Loas authored
      Merge branch 'dev#69826_contractuel_minsoc_diffusion_selective_de_l_information_enregistrer_modifier_ma_recherche' into 'master'
      
      Dev#69826 contractuel minsoc diffusion selective de l information enregistrer modifier ma recherche
      
      See merge request afi/opacce!2516
      666372c9
    • Ghislain Loas's avatar
      dev #69826 version file · 4d1f6d90
      Ghislain Loas authored
      4d1f6d90
    • Ghislain Loas's avatar
      Merge remote-tracking branch 'refs/remotes/origin/master' into... · 205510a0
      Ghislain Loas authored
      Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#69826_contractuel_minsoc_diffusion_selective_de_l_information_enregistrer_modifier_ma_recherche
      
      Conflicts:
      	application/modules/admin/views/scripts/album/edit-images.phtml
      	cosmogramme/sql/patch/patch_342.php
      	library/ZendAfi/Controller/Plugin/Manager/Sitotheque.php
      	library/ZendAfi/View/Helper/TagPreview.php
      	library/ZendAfi/View/Helper/TagSlideshow.php
      	tests/application/modules/admin/controllers/AdminControllerTest.php
      	tests/application/modules/admin/controllers/CatalogueControllerTest.php
      	tests/application/modules/admin/controllers/CmsControllerTest.php
      	tests/application/modules/admin/controllers/IndexControllerTest.php
      	tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
      	tests/application/modules/opac/controllers/PanierControllerTest.php
      	tests/db/UpgradeDBTest.php
      	tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php
      205510a0
  2. 22 Feb, 2018 4 commits
  3. 21 Feb, 2018 1 commit
  4. 20 Feb, 2018 2 commits
  5. 19 Feb, 2018 4 commits
  6. 16 Feb, 2018 14 commits
  7. 15 Feb, 2018 10 commits
  8. 14 Feb, 2018 2 commits