Merge remote-tracking branch 'origin/dev#17514_indexation_refactoring'
Conflicts solved: cosmogramme/php/_init.php library/Class/Codification.php library/ZendAfi/View/Helper/Frbr.php tests/application/modules/admin/controllers/CmsControllerTest.php tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php tests/application/modules/opac/controllers/RechercheControllerTest.php
Showing
- VERSIONS_WIP/dev_#17514_index_cart_into_domains 2 additions, 0 deletionsVERSIONS_WIP/dev_#17514_index_cart_into_domains
- application/modules/admin/controllers/CatalogueController.php 9 additions, 3 deletions...ication/modules/admin/controllers/CatalogueController.php
- application/modules/admin/controllers/IndexController.php 1 addition, 1 deletionapplication/modules/admin/controllers/IndexController.php
- application/modules/opac/controllers/PanierController.php 5 additions, 1 deletionapplication/modules/opac/controllers/PanierController.php
- application/modules/opac/controllers/RssController.php 5 additions, 4 deletionsapplication/modules/opac/controllers/RssController.php
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/php/integration/domaines.php 3 additions, 0 deletionscosmogramme/php/integration/domaines.php
- cosmogramme/sql/patch/patch_228.sql 0 additions, 6 deletionscosmogramme/sql/patch/patch_228.sql
- cosmogramme/sql/patch/patch_232.php 3 additions, 0 deletionscosmogramme/sql/patch/patch_232.php
- library/Class/AdminVar.php 1 addition, 1 deletionlibrary/Class/AdminVar.php
- library/Class/Album.php 14 additions, 1 deletionlibrary/Class/Album.php
- library/Class/Article.php 13 additions, 9 deletionslibrary/Class/Article.php
- library/Class/CasTicket.php 5 additions, 5 deletionslibrary/Class/CasTicket.php
- library/Class/Catalogue.php 12 additions, 4 deletionslibrary/Class/Catalogue.php
- library/Class/Codification.php 1 addition, 1 deletionlibrary/Class/Codification.php
- library/Class/CriteresRecherche.php 24 additions, 15 deletionslibrary/Class/CriteresRecherche.php
- library/Class/Indexation.php 8 additions, 0 deletionslibrary/Class/Indexation.php
- library/Class/Indexation/PseudoNotice.php 94 additions, 118 deletionslibrary/Class/Indexation/PseudoNotice.php
- library/Class/MoteurRecherche.php 47 additions, 18 deletionslibrary/Class/MoteurRecherche.php
- library/Class/Notice.php 16 additions, 0 deletionslibrary/Class/Notice.php
Please register or sign in to comment