Skip to content
Snippets Groups Projects

Master

Closed Ghislain Loas requested to merge master into WIP
  1. Jun 27, 2018
    • Ghislain Loas's avatar
      Merge branch 'dev#76768_sandbox_manage_user_swaping' into 'master' · a5ccc195
      Ghislain Loas authored
      Dev#76768 sandbox manage user swaping
      
      See merge request !2714
      a5ccc195
    • Ghislain Loas's avatar
      Merge remote-tracking branch... · e9d81a90
      Ghislain Loas authored
      Merge remote-tracking branch 'origin/dev#72825_contractuel_bdp64__afficher_la_colonne_reserve_par_d_autres' into origin-master
      
      Conflicts:
      	library/Class/TableDescription.php
      	library/ZendAfi/Controller/Plugin/Abstract.php
      	library/ZendAfi/View/Helper/RenderTable.php
      e9d81a90
    • Ghislain Loas's avatar
      Merge branch... · a86422b3
      Ghislain Loas authored
      Merge branch 'dev#75073_minsoc_faire_des_filtres_sur_des_facettes_et_des_domaines_au_moment_de_la_recherche_s1' into 'master'
      
      dev #75073 : add multifacets support in custom search forms
      
      See merge request !2712
      a86422b3
    • Ghislain Loas's avatar
      Merge branch... · 600f5fba
      Ghislain Loas authored
      Merge branch 'dev#75882_minsoc_faire_des_filtres_sur_des_facettes_et_des_domaines_au_moment_de_la_recherche_s2' into 'master'
      
      Dev#75882 minsoc faire des filtres sur des facettes et des domaines au moment de la recherche s2
      
      See merge request !2711
      600f5fba
  2. Jun 25, 2018
  3. Jun 23, 2018
  4. Jun 21, 2018