Skip to content
Snippets Groups Projects
  1. Mar 04, 2014
  2. Mar 03, 2014
  3. Feb 28, 2014
  4. Feb 27, 2014
  5. Feb 06, 2014
  6. Jan 24, 2014
  7. Jan 23, 2014
  8. Jan 20, 2014
  9. Jan 17, 2014
    • 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
  10. Jan 16, 2014
    • continuum's avatar
      Resolve conflicts · c5d10876
      continuum 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
      c5d10876
  11. Jan 15, 2014
  12. Jan 14, 2014
  13. Jan 07, 2014
  14. Jan 02, 2014
  15. Dec 24, 2013
  16. Dec 19, 2013
  17. Dec 16, 2013
  18. Dec 14, 2013
  19. Dec 10, 2013
  20. Dec 06, 2013
  21. Nov 28, 2013
  22. Nov 27, 2013
  23. Nov 22, 2013
  24. Oct 30, 2013
  25. Oct 19, 2013