Skip to content
Snippets Groups Projects
  1. Jan 21, 2014
  2. Jan 20, 2014
  3. Jan 17, 2014
  4. Jan 16, 2014
    • continuum's avatar
      rel #8257 : Ajout de la pcdm4 dans les albums · b0457a40
      continuum authored
      b0457a40
    • continuum's avatar
      Correction merge · c773ab1b
      continuum authored
      c773ab1b
    • 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/IndexContro...
      c5d10876
    • jgaimard's avatar
      Correction articles de periodiques casqy · 2908f1fd
      jgaimard authored
      2908f1fd
    • Patrick Barroca's avatar
      Corrections tests · 696a5ec0
      Patrick Barroca authored
      696a5ec0
    • Patrick Barroca's avatar
      Correction oubli parent::setUp() · 902f1110
      Patrick Barroca authored
      902f1110