Skip to content
Snippets Groups Projects
  1. Feb 26, 2015
  2. Feb 24, 2015
  3. Feb 23, 2015
  4. Feb 21, 2015
  5. Feb 20, 2015
  6. Feb 19, 2015
  7. Feb 18, 2015
  8. Feb 17, 2015
  9. Feb 16, 2015
    • Ghislain Loas's avatar
      Merge branch 'dev#19542-miop-fix-user-passwords' · 4197cacb
      Ghislain Loas authored
      Conflicts:
      	library/Class/Article.php
      	library/Class/ArticleCategorie.php
      	library/Class/Catalogue.php
      	library/Class/Sitotheque.php
      4197cacb
    • Ghislain Loas's avatar
      Merge branch 'dev#20351-articles-admin-as-list' · bde3e157
      Ghislain Loas authored
      Conflicts:
      	application/modules/admin/controllers/CmsController.php
      	cosmogramme/php/_init.php
      	library/Class/AdminVar.php
      	library/Class/ArticleCategorie.php
      	library/Class/Catalogue.php
      	library/Class/TypeDoc.php
      	library/Class/Users.php
      	tests/application/modules/admin/controllers/CmsControllerTest.php
      bde3e157