1. 02 May, 2019 1 commit
  2. 16 Apr, 2019 1 commit
  3. 11 Feb, 2019 1 commit
  4. 03 Jan, 2018 1 commit
  5. 30 Sep, 2017 1 commit
  6. 17 Jun, 2016 1 commit
  7. 13 Jun, 2016 1 commit
  8. 10 Jun, 2016 1 commit
  9. 20 Sep, 2014 2 commits
  10. 17 Jan, 2014 1 commit
    • efalcy's avatar
      Resolve conflicts · 71fd8299
      efalcy authored
      Conflicts:
      	.gitattributes
      	.gitignore
      	application/modules/admin/controllers/AlbumController.php
      	application/modules/admin/controllers/HarvestController.php
      	application/modules/admin/controllers/SystemeController.php
      	cosmogramme/php/classes/classe_notice_avenio.php
      	cosmogramme/php/classes/classe_notice_integration.php
      	cosmogramme/php/classes/classe_unimarc.php
      	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
      	library/Class/Album.php
      	library/Class/FRBR/Link.php
      	library/Class/Indexation.php
      	library/Class/NatureDoc.php
      	library/Class/Notice.php
      	library/Class/Profil.php
      	library/Class/WebService/BibNumerique/RessourceNumerique.php
      	library/ZendAfi/Controller/Plugin/AdminAuth.php
      	scripts/emacs/phafi-autoload.el
      	tests/application/modules/admin/controllers/AdminAuthControllerTest.php
      	tests/application/modules/admin/controllers/AlbumControllerTest.php
      	tests/application/modules/admin/controllers/HarvestControllerTest.php
      	tests/application/modules/opac/controllers/IndexControllerTest.php
      	tests/library/Class/FRBR/LinkTest.php
      	tests/library/Class/ProfilTest.php
      71fd8299
  11. 23 Sep, 2013 1 commit
  12. 18 Sep, 2013 11 commits
  13. 17 Sep, 2013 1 commit
  14. 26 Aug, 2013 1 commit
  15. 22 Jul, 2013 1 commit
  16. 22 Feb, 2013 1 commit
  17. 31 Jan, 2013 1 commit
  18. 02 Jan, 2013 1 commit
  19. 21 Dec, 2012 3 commits
  20. 20 Dec, 2012 8 commits