Merge remote-tracking branch 'origin/dev#21441_creer_des_facettes_a_partir_des_custom_fields'
Conflicts solved: cosmogramme/php/_init.php cosmogramme/sql/patch/patch_266.php
Showing
- VERSIONS_WIP/21441 1 addition, 0 deletionsVERSIONS_WIP/21441
- application/modules/admin/controllers/CustomFieldsMetaController.php 1 addition, 2 deletions.../modules/admin/controllers/CustomFieldsMetaController.php
- application/modules/admin/views/scripts/custom-fields-meta/index.phtml 21 additions, 8 deletions...odules/admin/views/scripts/custom-fields-meta/index.phtml
- application/modules/admin/views/scripts/modules/recherche_resultat.phtml 8 additions, 14 deletions...ules/admin/views/scripts/modules/recherche_resultat.phtml
- application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml 9 additions, 14 deletions...es/admin/views/scripts/modules/recherche_viewnotice.phtml
- application/modules/admin/views/scripts/modules/search-result.phtml 2 additions, 9 deletions...n/modules/admin/views/scripts/modules/search-result.phtml
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_265.php 1 addition, 1 deletioncosmogramme/sql/patch/patch_265.php
- library/Class/CodifThesaurus.php 167 additions, 60 deletionslibrary/Class/CodifThesaurus.php
- library/Class/Codification.php 44 additions, 54 deletionslibrary/Class/Codification.php
- library/Class/CustomField.php 55 additions, 40 deletionslibrary/Class/CustomField.php
- library/Class/CustomField/Meta.php 59 additions, 9 deletionslibrary/Class/CustomField/Meta.php
- library/Class/CustomField/Value.php 3 additions, 0 deletionslibrary/Class/CustomField/Value.php
- library/Class/Indexation/PseudoNotice.php 8 additions, 1 deletionlibrary/Class/Indexation/PseudoNotice.php
- library/Class/Indexation/PseudoNotice/FacettesVisitor.php 52 additions, 14 deletionslibrary/Class/Indexation/PseudoNotice/FacettesVisitor.php
- library/Class/MoteurRecherche/Facettes.php 59 additions, 46 deletionslibrary/Class/MoteurRecherche/Facettes.php
- library/Class/Notice.php 5 additions, 0 deletionslibrary/Class/Notice.php
- library/Class/Notice/Facette.php 36 additions, 33 deletionslibrary/Class/Notice/Facette.php
- library/Class/Notice/RubriqueFacette.php 46 additions, 16 deletionslibrary/Class/Notice/RubriqueFacette.php
- library/ZendAfi/Controller/Action.php 2 additions, 2 deletionslibrary/ZendAfi/Controller/Action.php
Please register or sign in to comment