Skip to content
Snippets Groups Projects
  1. Feb 12, 2014
  2. Feb 10, 2014
  3. Feb 07, 2014
  4. Feb 05, 2014
  5. Feb 03, 2014
  6. Jan 31, 2014
  7. Jan 30, 2014
  8. Jan 27, 2014
  9. Jan 25, 2014
  10. Jan 24, 2014
  11. Jan 23, 2014
  12. Jan 21, 2014
  13. Jan 20, 2014
  14. 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/IndexContro...
      71fd8299
    • continuum's avatar
      Correction merge · e0f700a2
      continuum authored
      e0f700a2
  15. Jan 16, 2014
    • continuum's avatar
      rel #8257 : Ajout de la pcdm4 dans les albums · b0457a40
      continuum authored
      b0457a40
    • 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
    • jgaimard's avatar
      Correction articles de periodiques casqy · 2908f1fd
      jgaimard authored
      2908f1fd
    • Laurent Laffont's avatar
  16. Jan 15, 2014
  17. Jan 14, 2014
  18. Jan 13, 2014
  19. Jan 10, 2014
  20. Jan 08, 2014
  21. Jan 07, 2014
  22. Jan 03, 2014
  23. Jan 02, 2014
  24. Dec 19, 2013