Merge branch 'Dev#17629_Domains' into dev_#17514_indexation_paniers_domaines
Conflicts: cosmogramme/php/_init.php cosmogramme/php/integration/domaines.php library/Class/NoticeDomain.php library/Class/PanierNotice.php
Branches
Tags
Showing
- application/modules/admin/controllers/AlbumController.php 20 additions, 20 deletionsapplication/modules/admin/controllers/AlbumController.php
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/php/integration/domaines.php 6 additions, 2 deletionscosmogramme/php/integration/domaines.php
- cosmogramme/php/integre_traite_main.php 0 additions, 1 deletioncosmogramme/php/integre_traite_main.php
- cosmogramme/sql/patch/patch_228.sql 1 addition, 1 deletioncosmogramme/sql/patch/patch_228.sql
- cosmogramme/sql/patch/patch_229.php 0 additions, 3 deletionscosmogramme/sql/patch/patch_229.php
- cosmogramme/sql/patch/patch_229.sql 0 additions, 0 deletionscosmogramme/sql/patch/patch_229.sql
- library/Class/Album.php 85 additions, 85 deletionslibrary/Class/Album.php
- library/Class/Article.php 3 additions, 6 deletionslibrary/Class/Article.php
- library/Class/Catalogue.php 1 addition, 1 deletionlibrary/Class/Catalogue.php
- library/Class/CriteresRecherche.php 14 additions, 1 deletionlibrary/Class/CriteresRecherche.php
- library/Class/Indexation.php 20 additions, 20 deletionslibrary/Class/Indexation.php
- library/Class/Indexation/PseudoNotice.php 130 additions, 111 deletionslibrary/Class/Indexation/PseudoNotice.php
- library/Class/MoteurRecherche.php 71 additions, 22 deletionslibrary/Class/MoteurRecherche.php
- library/Class/NoticeDomain.php 10 additions, 6 deletionslibrary/Class/NoticeDomain.php
- library/Class/PanierNotice.php 1 addition, 4 deletionslibrary/Class/PanierNotice.php
- library/Class/Sitotheque.php 20 additions, 6 deletionslibrary/Class/Sitotheque.php
- library/Trait/Indexable.php 68 additions, 0 deletionslibrary/Trait/Indexable.php
- library/ZendAfi/Form/Album/Ressource.php 12 additions, 14 deletionslibrary/ZendAfi/Form/Album/Ressource.php
- library/ZendAfi/View/Helper/TagCriteresRecherche.php 4 additions, 0 deletionslibrary/ZendAfi/View/Helper/TagCriteresRecherche.php
Please register or sign in to comment