Merge branch 'master' into origin-dev#7832_profils_url_rewriting
Conflicts: library/startup.php library/storm tests/bootstrap_frontcontroller.php
Branches
Tags
Showing
- CONTRIB.en.md 175 additions, 0 deletionsCONTRIB.en.md
- CONTRIB.fr.md 1 addition, 1 deletionCONTRIB.fr.md
- INSTALL.en.md 179 additions, 0 deletionsINSTALL.en.md
- INSTALL.fr.md 0 additions, 0 deletionsINSTALL.fr.md
- VERSIONS 42 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/AccueilController.php 14 additions, 15 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/IndexController.php 7 additions, 5 deletionsapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/views/scripts/accueil/calendrier.phtml 192 additions, 182 deletions...tion/modules/admin/views/scripts/accueil/calendrier.phtml
- application/modules/admin/views/scripts/index/adminvar.phtml 6 additions, 5 deletionsapplication/modules/admin/views/scripts/index/adminvar.phtml
- application/modules/admin/views/scripts/index/adminvaredit.phtml 2 additions, 2 deletions...tion/modules/admin/views/scripts/index/adminvaredit.phtml
- application/modules/opac/controllers/AuthController.php 37 additions, 0 deletionsapplication/modules/opac/controllers/AuthController.php
- application/modules/opac/controllers/CmsController.php 1 addition, 0 deletionsapplication/modules/opac/controllers/CmsController.php
- application/modules/opac/controllers/PanierController.php 30 additions, 28 deletionsapplication/modules/opac/controllers/PanierController.php
- application/modules/opac/views/scripts/recherche/resultatRecherche.phtml 5 additions, 4 deletions...ules/opac/views/scripts/recherche/resultatRecherche.phtml
- cosmogramme/php/classes/classe_notice_integration.php 3 additions, 3 deletionscosmogramme/php/classes/classe_notice_integration.php
- cosmogramme/php/classes/classe_profil_donnees.php 8 additions, 1 deletioncosmogramme/php/classes/classe_profil_donnees.php
- cosmogramme/php/classes/classe_unimarc.php 5 additions, 8 deletionscosmogramme/php/classes/classe_unimarc.php
- cosmogramme/php/integre_traite_main.php 49 additions, 39 deletionscosmogramme/php/integre_traite_main.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 113 additions, 1 deletioncosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/unimarc_aux_animaux_la_guerre.txt 1 addition, 0 deletions...ramme/tests/php/classes/unimarc_aux_animaux_la_guerre.txt
Please register or sign in to comment