[echobase] branch master updated (1333a66 -> d3da33a)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See http://git.codelutin.com/echobase.git omits 1333a66 refs #4194 : cache batimetry and eatrh omits f480dba refs #4194 : update site omits 2d2e515 refs #4194 : assembly lizmap zip omits 3b5e910 refs #4194 : organize lizmap files omits c169198 refs #4194 : used echobase style in lizmap frame omits 3b2bca2 refs #4194 : in lizmap frame fix position body omits 7187ede refs #4194 : add Lizamp default theme and one javascript omits a086f99 refs #4194 : fix dependencies and lizmpa repository id omits 39a025c refs #4194 : create one repository by data base omits 3188442 refs #4194 : change lizmap directories and files names, create lizmap files is not exists omits b3add9e refs #4194 : add VoyageId in layerId omits 730917e refs #4194 : fixe bluid error in jenkins omits f183fed refs #4194 : Visualisation des données spatiales omits 3a8bfe6 fixes #5186 Export Coser : mettre un message si le site des indicateurs n'est pas accessible omits a83166a fixes #5181: Utilisation coser 1.5-rc-1 omits fab5ee7 fixes #5182: Export coser, mauvais nom d'espèce omits 1948b70 fixes #5180: Améioration de l'export Coser omits 15310b8 fix pom urls + updates to mavenpom 5.0.8 and others libs omits 9e22a10 [maven-release-plugin] prepare for next development iteration adds d3da33a [maven-release-plugin] copy for tag echobase-2.6 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1333a66) \ N -- N -- N refs/heads/master (d3da33a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 51 - .../config/EchoBaseConfigurationOption.java | 34 +- .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 2 +- .../i18n/echobase-domain_en_GB.properties | 7 - .../i18n/echobase-domain_fr_FR.properties | 7 - echobase-services/pom.xml | 6 +- .../services/service/UserDbPersistenceService.java | 4 - .../exportCoser/ExportCoserConfiguration.java | 76 +- .../service/exportCoser/ExportCoserService.java | 91 +- .../services/service/spatial/SpatialService.java | 244 -- .../workingDb/WorkingDbConfigurationService.java | 7 - echobase-ui/pom.xml | 23 +- echobase-ui/src/main/assembly/lizmap-zip.xml | 23 - .../echobase/ui/EchoBaseApplicationContext.java | 41 - .../echobase/ui/EchoBaseApplicationListener.java | 8 - .../echobase/ui/actions/exportCoser/Configure.java | 27 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 33 +- .../echobase/ui/actions/spatial/ShowMap.java | 21 + .../src/main/resources/config/struts-spatial.xml | 4 +- .../actions/exportCoser/Configure-validation.xml | 16 +- .../resources/i18n/echobase-ui_en_GB.properties | 10 - .../resources/i18n/echobase-ui_fr_FR.properties | 10 - .../resources/lizmap/resources/France&Spain.dbf | Bin 277 -> 0 bytes .../resources/lizmap/resources/France&Spain.prj | 1 - .../resources/lizmap/resources/France&Spain.qpj | 1 - .../resources/lizmap/resources/France&Spain.shp | Bin 1692536 -> 0 bytes .../resources/lizmap/resources/France&Spain.shx | Bin 116 -> 0 bytes .../main/resources/lizmap/resources/pelgas09.avl | 1134 ----- .../main/resources/lizmap/resources/pelgas09.dbf | Bin 434 -> 0 bytes .../main/resources/lizmap/resources/pelgas09.qix | Bin 152 -> 0 bytes .../main/resources/lizmap/resources/pelgas09.shp | Bin 896940 -> 0 bytes .../main/resources/lizmap/resources/pelgas09.shx | Bin 196 -> 0 bytes .../lizmap/templates/LizmapTemplate.qgs.cfg | 325 -- .../resources/lizmap/templates/QgisTemplate.qgs | 4530 -------------------- .../src/main/resources/lizmap/www/js/map.js | 3998 ----------------- .../lizmap/www/themes/default/css/admin.css | 8 - .../www/themes/default/css/images/123_click.png | Bin 270 -> 0 bytes .../www/themes/default/css/images/bt_jaune.jpg | Bin 1271 -> 0 bytes .../themes/default/css/images/download_layer.gif | Bin 5174 -> 0 bytes .../www/themes/default/css/images/sprite_18.png | Bin 3731 -> 0 bytes .../www/themes/default/css/images/sprite_20.png | Bin 2394 -> 0 bytes .../themes/default/css/images/sprite_20_black.png | Bin 2730 -> 0 bytes .../themes/default/css/images/sprite_20_tools.png | Bin 26490 -> 0 bytes .../www/themes/default/css/images/sprite_menu.png | Bin 2062 -> 0 bytes .../default/css/images/sprite_menu_tools.png | Bin 4871 -> 0 bytes .../default/css/images/sprite_timemanager.png | Bin 730 -> 0 bytes .../themes/default/css/img/250x250_mappemonde.png | Bin 59473 -> 0 bytes .../lizmap/www/themes/default/css/img/loading.gif | Bin 12454 -> 0 bytes .../lizmap/www/themes/default/css/img/logo.png | Bin 6717 -> 0 bytes .../www/themes/default/css/img/logo_footer.png | Bin 1520 -> 0 bytes .../default/css/img/overview_replacement.gif | Bin 100 -> 0 bytes .../default/css/img/overview_replacement.png | Bin 208 -> 0 bytes .../lizmap/www/themes/default/css/main.css | 113 - .../lizmap/www/themes/default/css/map.css | 520 --- .../lizmap/www/themes/default/css/media.css | 90 - .../lizmap/www/themes/default/css/view.css | 36 - .../webapp/WEB-INF/jsp/exportCoser/configure.jsp | 122 +- .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 77 +- echobase-ui/src/main/webapp/css/screen.css | 6 - pom.xml | 32 +- src/site/rst/install.rst.vm | 102 +- 62 files changed, 196 insertions(+), 11646 deletions(-) delete mode 100644 echobase-ui/src/main/assembly/lizmap-zip.xml delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.dbf delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.prj delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.qpj delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.shp delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.shx delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.avl delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.dbf delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.qix delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.shp delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.shx delete mode 100644 echobase-ui/src/main/resources/lizmap/templates/LizmapTemplate.qgs.cfg delete mode 100644 echobase-ui/src/main/resources/lizmap/templates/QgisTemplate.qgs delete mode 100755 echobase-ui/src/main/resources/lizmap/www/js/map.js delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/123_click.png delete mode 100644 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/bt_jaune.jpg delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/download_layer.gif delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_18.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_20.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_20_black.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_20_tools.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_menu.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_menu_tools.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_timemanager.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/250x250_mappemonde.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/loading.gif delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/logo.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/logo_footer.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/overview_replacement.gif delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/overview_replacement.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm