Merge branch 'master' into origin-rd_#14085_pnb
Conflicts: cosmogramme/sql/patch/patch_239.php
Branches
Tags
Showing
- .htaccess 1 addition, 1 deletion.htaccess
- VERSIONS 19 additions, 0 deletionsVERSIONS
- VERSIONS_WIP/dev_#16860_mycow 0 additions, 1 deletionVERSIONS_WIP/dev_#16860_mycow
- application/modules/admin/controllers/AccueilController.php 1 addition, 1 deletionapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/HarvestController.php 146 additions, 124 deletionsapplication/modules/admin/controllers/HarvestController.php
- application/modules/admin/controllers/SystemeController.php 17 additions, 20 deletionsapplication/modules/admin/controllers/SystemeController.php
- application/modules/admin/views/scripts/harvest/orphea-browse.phtml 48 additions, 0 deletions...n/modules/admin/views/scripts/harvest/orphea-browse.phtml
- application/modules/opac/controllers/JavaController.php 15 additions, 13 deletionsapplication/modules/opac/controllers/JavaController.php
- application/modules/opac/controllers/NoticeajaxController.php 0 additions, 7 deletions...ication/modules/opac/controllers/NoticeajaxController.php
- application/modules/opac/controllers/RechercheController.php 2 additions, 3 deletionsapplication/modules/opac/controllers/RechercheController.php
- application/modules/opac/controllers/RssController.php 15 additions, 16 deletionsapplication/modules/opac/controllers/RssController.php
- application/modules/opac/controllers/SitoController.php 2 additions, 7 deletionsapplication/modules/opac/controllers/SitoController.php
- application/modules/opac/views/scripts/java/cube.phtml 17 additions, 29 deletionsapplication/modules/opac/views/scripts/java/cube.phtml
- application/modules/opac/views/scripts/java/diaporama.phtml 18 additions, 32 deletionsapplication/modules/opac/views/scripts/java/diaporama.phtml
- application/modules/opac/views/scripts/java/jcarousel.phtml 20 additions, 20 deletionsapplication/modules/opac/views/scripts/java/jcarousel.phtml
- application/modules/opac/views/scripts/java/mycarousel_horizontal.phtml 14 additions, 35 deletions...dules/opac/views/scripts/java/mycarousel_horizontal.phtml
- application/modules/opac/views/scripts/java/mycarousel_partial.phtml 16 additions, 0 deletions.../modules/opac/views/scripts/java/mycarousel_partial.phtml
- application/modules/opac/views/scripts/java/mycarousel_vertical.phtml 12 additions, 33 deletions...modules/opac/views/scripts/java/mycarousel_vertical.phtml
- application/modules/opac/views/scripts/java/protoflow.phtml 29 additions, 33 deletionsapplication/modules/opac/views/scripts/java/protoflow.phtml
- application/modules/opac/views/scripts/java/slide_show.phtml 35 additions, 31 deletionsapplication/modules/opac/views/scripts/java/slide_show.phtml
Please register or sign in to comment