| [galette-commits] [GIT] galette/plugin-maps.git branch master updated. 1.2.3-31-gf2aa9ea |
[ Thread Index |
Date Index
| More lists.galette.eu/commits Archives
]
- To: commits@xxxxxxxxxxxxxxxx
- Subject: [galette-commits] [GIT] galette/plugin-maps.git branch master updated. 1.2.3-31-gf2aa9ea
- From: <git@xxxxxxxxxxxxx>
- Date: Wed, 20 Dec 2017 21:55:54 +0100
- Auto-submitted: auto-generated
This is an automated email from git. It was generated because a ref
change was pushed to the "galette/plugin-maps.git" repository.
The branch, master has been updated
via f2aa9ea45e71f4077c977b79224709ae6fe6f5c0 (commit)
via e46cc69ac6ccb2910cc704d75204ee74d9d50cbe (commit)
via f0c473eb8751635a770c5a1b26b4706abd8396ca (commit)
via 4947f1566abf6a4ce80f2cd4f5fb2a2b4f511b9b (commit)
via 859cccbcea56e541e8e199919a5d1613d91868c2 (commit)
via 75b77b7ef6181dcbfedf9a6f90dce71d369cbe63 (commit)
via f55b8def7ef670bf7e99b2e1eda6b3222d6aa04c (commit)
via 02ce89e7bb68836ca5663287af9147c324aa64db (commit)
via fd665fc7cf0118ed3d0db59e5b81c0d82927cdd8 (commit)
via 49c8fbd62f840cf1507027ff008fd456a59bd21e (commit)
via 8707029fbdf9fc1abe8bb921f59de66865000a6c (commit)
via 20b8e5bc1d04354126d614c31340d8a4c3f2c303 (commit)
via feadbea0338ec97b231ca26c0a56ae8fb7e1dac1 (commit)
via 377ff1e406b69ee912e7e800bbeb136df6a76a45 (commit)
via 50393baf8b050dc9a196f338ed7d7788aae88231 (commit)
via 8fc461da35d318a708b6e8c16a61aa4554538491 (commit)
via ae6adb5c2fd3e705186391561c0d5993223ca8ef (commit)
via a0495aaba82f3f3d71a7aa80cef8af5de1d74a6e (commit)
via 76f2f626f9b73024aabd300740f1bb33195c9435 (commit)
via 4272bfba0ae5cc073e6ab049168901a2ac648ede (commit)
via 6c5675925bab509da8eb1f864d7eee267cf3999e (commit)
via 37a4371ee3eafbe262e6333435eb5d3c0281bfc0 (commit)
via cd2f8f09f38eeb555e944c13ec1313d0997fdabd (commit)
via f3ada2dbc2cf2e087b0934c1fa64e11591a57f17 (commit)
via 2b155de7e06073958b1b9fc476205694024a1687 (commit)
via 4dd7c0d8442a0af200dc433ebbeec6474d60d90a (commit)
via 2d9e99042e3809f9639c50d9e4c4cbd699334d98 (commit)
via 37f68f7990ffddc766a78e333f1f311bc61dd47a (commit)
via d9b22662f1a4d2a79faf0e3bc2e81f22221ed4b6 (commit)
via 3783d072b3ae9f87fbb056f2c02c8e66f8825338 (commit)
from 5285f59800f7ae7309e7c987c55a8a3537d5bc0a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f2aa9ea45e71f4077c977b79224709ae6fe6f5c0
Merge: 5285f59 e46cc69
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Wed Dec 20 21:55:20 2017 +0100
Merge branch 'release/1.3.0'
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 +-
ChangeLog | 5 +
_config.inc.php | 2 -
_define.php | 13 +-
_routes.php | 274 +
adh_map.php | 122 -
ajax_ilivehere.php | 114 -
includes/leaflet-0.7.1/images/layers-2x.png | Bin 2898 -> 0 bytes
includes/leaflet-0.7.1/images/layers.png | Bin 1502 -> 0 bytes
includes/leaflet-0.7.1/images/marker-icon-2x.png | Bin 4033 -> 0 bytes
includes/leaflet-0.7.1/images/marker-icon.png | Bin 1747 -> 0 bytes
includes/leaflet-0.7.1/images/marker-shadow.png | Bin 797 -> 0 bytes
includes/leaflet-0.7.1/leaflet-src.js | 9180 -------------
includes/leaflet-0.7.1/leaflet.js | 9 -
.../Control.FullScreen.css | 3 -
.../Control.FullScreen.js | 165 -
includes/leaflet-fullscreencontrol/LICENSE | 22 -
.../leaflet-fullscreencontrol/icon-fullscreen.png | Bin 389 -> 0 bytes
includes/leaflet-geosearch/LICENSE | 22 -
includes/leaflet-geosearch/css/l.geosearch.css | 38 -
.../leaflet-geosearch/js/l.control.geosearch.js | 212 -
.../js/l.geosearch.provider.bing.js | 40 -
.../js/l.geosearch.provider.esri.js | 41 -
.../js/l.geosearch.provider.google.js | 56 -
.../js/l.geosearch.provider.nokia.js | 40 -
.../js/l.geosearch.provider.openstreetmap.js | 40 -
.../leaflet-locatecontrol/L.Control.Locate.0.5.css | 44 -
.../leaflet-locatecontrol/L.Control.Locate.css | 34 -
.../leaflet-locatecontrol/L.Control.Locate.ie.css | 12 -
includes/leaflet-locatecontrol/L.Control.Locate.js | 298 -
lang/Makefile | 91 +-
lang/en_US/LC_MESSAGES/maps.mo | Bin 0 -> 3146 bytes
lang/en_US/LC_MESSAGES/maps_routes.mo | Bin 0 -> 549 bytes
lang/fr_FR.utf8/LC_MESSAGES/maps.mo | Bin 0 -> 3475 bytes
lang/fr_FR.utf8/LC_MESSAGES/maps_routes.mo | Bin 0 -> 558 bytes
lang/lang_english.php | 123 -
lang/lang_french.php | 123 -
lang/maps.pot | 148 +
lang/maps_en_US.php | 113 +
lang/{en_US.po => maps_en_US.po} | 145 +-
lang/maps_fr_FR.utf8.php | 113 +
lang/{fr_FR.utf8.po => maps_fr_FR.utf8.po} | 145 +-
lang/maps_routes.pot | 16 +
lang/maps_routes_en_US.php | 17 +
lang/maps_routes_en_US.po | 29 +
lang/maps_routes_fr_FR.utf8.php | 17 +
lang/maps_routes_fr_FR.utf8.po | 29 +
lang/messages.po | 161 -
lang/xgettext.py | 94 +-
lib/GaletteMaps/Coordinates.php | 2 +-
lib/GaletteMaps/NominatimTowns.php | 49 +-
maps.php | 95 -
maps_preferences.php | 70 -
mymap.php | 109 -
...-1.2.3-mysql.sql => upgrade-to-1.3.0-mysql.sql} | 0
...-1.2.3-pgsql.sql => upgrade-to-1.3.0-pgsql.sql} | 0
templates/default/adh_actions.tpl | 2 +-
templates/default/adh_fiche_action.tpl | 7 +-
templates/default/common_html.tpl | 29 +
templates/default/common_scripts.tpl | 113 +-
templates/default/headers.tpl | 19 +-
templates/default/maps.tpl | 12 +-
templates/default/menu.tpl | 4 +-
templates/default/mymap.tpl | 43 +-
templates/default/public_menu.tpl | 7 +-
{templates/default => webroot}/galette_maps.css | 9 +-
{templates/default => webroot}/images/legend.png | Bin
.../default => webroot}/images/locate_member.png | Bin
{templates/default => webroot}/images/maps.png | Bin
webroot/leaflet-1.2.0/images/layers-2x.png | Bin 0 -> 1259 bytes
webroot/leaflet-1.2.0/images/layers.png | Bin 0 -> 696 bytes
.../leaflet-1.2.0}/images/marker-galette-pro.png | Bin
.../leaflet-1.2.0}/images/marker-galette.png | Bin
webroot/leaflet-1.2.0/images/marker-icon-2x.png | Bin 0 -> 2586 bytes
webroot/leaflet-1.2.0/images/marker-icon.png | Bin 0 -> 1466 bytes
webroot/leaflet-1.2.0/images/marker-shadow.png | Bin 0 -> 618 bytes
webroot/leaflet-1.2.0/leaflet-src.js | 13609 +++++++++++++++++++
.../leaflet-1.2.0}/leaflet.css | 240 +-
webroot/leaflet-1.2.0/leaflet.js | 5 +
.../Control.OSMGeocoder.css | 38 +
.../Control.OSMGeocoder.js | 197 +
webroot/leaflet-control-osm-geocoder/LICENSE | 23 +
.../images/geocoder.png | Bin 0 -> 1940 bytes
.../Control.FullScreen.css | 8 +
.../Control.FullScreen.js | 203 +
webroot/leaflet-fullscreencontrol/LICENSE | 19 +
.../icon-fullscreen-2x.png | Bin 0 -> 215 bytes
.../leaflet-fullscreencontrol/icon-fullscreen.png | Bin 0 -> 139 bytes
.../leaflet-legendcontrol/L.Control.Legend.js | 0
webroot/leaflet-locatecontrol/L.Control.Locate.css | 12 +
.../L.Control.Locate.mapbox.css | 20 +
.../L.Control.Locate.mapbox.min.css | 2 +
.../leaflet-locatecontrol/L.Control.Locate.min.css | 2 +
.../leaflet-locatecontrol/L.Control.Locate.min.js | 5 +
.../leaflet-locatecontrol/images/locate.png | Bin
.../leaflet-locatecontrol/images/locate.svg | 0
.../leaflet-locatecontrol/images/locate_alt.png | Bin
.../leaflet-locatecontrol/images/locate_alt.svg | 0
.../leaflet-locatecontrol/images/locate_touch.png | Bin
.../images/locate_touch_alt.png | Bin
.../leaflet-locatecontrol/images/spinner.gif | Bin
101 files changed, 15528 insertions(+), 11579 deletions(-)
create mode 100644 _routes.php
delete mode 100644 adh_map.php
delete mode 100644 ajax_ilivehere.php
delete mode 100644 includes/leaflet-0.7.1/images/layers-2x.png
delete mode 100644 includes/leaflet-0.7.1/images/layers.png
delete mode 100644 includes/leaflet-0.7.1/images/marker-icon-2x.png
delete mode 100644 includes/leaflet-0.7.1/images/marker-icon.png
delete mode 100644 includes/leaflet-0.7.1/images/marker-shadow.png
delete mode 100644 includes/leaflet-0.7.1/leaflet-src.js
delete mode 100644 includes/leaflet-0.7.1/leaflet.js
delete mode 100644 includes/leaflet-fullscreencontrol/Control.FullScreen.css
delete mode 100644 includes/leaflet-fullscreencontrol/Control.FullScreen.js
delete mode 100644 includes/leaflet-fullscreencontrol/LICENSE
delete mode 100644 includes/leaflet-fullscreencontrol/icon-fullscreen.png
delete mode 100644 includes/leaflet-geosearch/LICENSE
delete mode 100644 includes/leaflet-geosearch/css/l.geosearch.css
delete mode 100644 includes/leaflet-geosearch/js/l.control.geosearch.js
delete mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.bing.js
delete mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.esri.js
delete mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.google.js
delete mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.nokia.js
delete mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.openstreetmap.js
delete mode 100644 includes/leaflet-locatecontrol/L.Control.Locate.0.5.css
delete mode 100644 includes/leaflet-locatecontrol/L.Control.Locate.css
delete mode 100644 includes/leaflet-locatecontrol/L.Control.Locate.ie.css
delete mode 100644 includes/leaflet-locatecontrol/L.Control.Locate.js
create mode 100644 lang/en_US/LC_MESSAGES/maps.mo
create mode 100644 lang/en_US/LC_MESSAGES/maps_routes.mo
create mode 100644 lang/fr_FR.utf8/LC_MESSAGES/maps.mo
create mode 100644 lang/fr_FR.utf8/LC_MESSAGES/maps_routes.mo
delete mode 100644 lang/lang_english.php
delete mode 100644 lang/lang_french.php
create mode 100644 lang/maps.pot
create mode 100644 lang/maps_en_US.php
rename lang/{en_US.po => maps_en_US.po} (55%)
create mode 100644 lang/maps_fr_FR.utf8.php
rename lang/{fr_FR.utf8.po => maps_fr_FR.utf8.po} (57%)
create mode 100644 lang/maps_routes.pot
create mode 100644 lang/maps_routes_en_US.php
create mode 100644 lang/maps_routes_en_US.po
create mode 100644 lang/maps_routes_fr_FR.utf8.php
create mode 100644 lang/maps_routes_fr_FR.utf8.po
delete mode 100644 lang/messages.po
delete mode 100644 maps.php
delete mode 100644 maps_preferences.php
delete mode 100644 mymap.php
copy scripts/{upgrade-to-1.2.3-mysql.sql => upgrade-to-1.3.0-mysql.sql} (100%)
copy scripts/{upgrade-to-1.2.3-pgsql.sql => upgrade-to-1.3.0-pgsql.sql} (100%)
create mode 100644 templates/default/common_html.tpl
rename {templates/default => webroot}/galette_maps.css (73%)
rename {templates/default => webroot}/images/legend.png (100%)
rename {templates/default => webroot}/images/locate_member.png (100%)
rename {templates/default => webroot}/images/maps.png (100%)
create mode 100644 webroot/leaflet-1.2.0/images/layers-2x.png
create mode 100644 webroot/leaflet-1.2.0/images/layers.png
rename {includes/leaflet-0.7.1 => webroot/leaflet-1.2.0}/images/marker-galette-pro.png (100%)
rename {includes/leaflet-0.7.1 => webroot/leaflet-1.2.0}/images/marker-galette.png (100%)
create mode 100644 webroot/leaflet-1.2.0/images/marker-icon-2x.png
create mode 100644 webroot/leaflet-1.2.0/images/marker-icon.png
create mode 100644 webroot/leaflet-1.2.0/images/marker-shadow.png
create mode 100644 webroot/leaflet-1.2.0/leaflet-src.js
rename {includes/leaflet-0.7.1 => webroot/leaflet-1.2.0}/leaflet.css (63%)
create mode 100644 webroot/leaflet-1.2.0/leaflet.js
create mode 100644 webroot/leaflet-control-osm-geocoder/Control.OSMGeocoder.css
create mode 100644 webroot/leaflet-control-osm-geocoder/Control.OSMGeocoder.js
create mode 100644 webroot/leaflet-control-osm-geocoder/LICENSE
create mode 100644 webroot/leaflet-control-osm-geocoder/images/geocoder.png
create mode 100644 webroot/leaflet-fullscreencontrol/Control.FullScreen.css
create mode 100644 webroot/leaflet-fullscreencontrol/Control.FullScreen.js
create mode 100644 webroot/leaflet-fullscreencontrol/LICENSE
create mode 100644 webroot/leaflet-fullscreencontrol/icon-fullscreen-2x.png
create mode 100644 webroot/leaflet-fullscreencontrol/icon-fullscreen.png
rename {includes => webroot}/leaflet-legendcontrol/L.Control.Legend.js (100%)
create mode 100644 webroot/leaflet-locatecontrol/L.Control.Locate.css
create mode 100644 webroot/leaflet-locatecontrol/L.Control.Locate.mapbox.css
create mode 100644 webroot/leaflet-locatecontrol/L.Control.Locate.mapbox.min.css
create mode 100644 webroot/leaflet-locatecontrol/L.Control.Locate.min.css
create mode 100644 webroot/leaflet-locatecontrol/L.Control.Locate.min.js
rename {includes => webroot}/leaflet-locatecontrol/images/locate.png (100%)
rename {includes => webroot}/leaflet-locatecontrol/images/locate.svg (100%)
rename {includes => webroot}/leaflet-locatecontrol/images/locate_alt.png (100%)
rename {includes => webroot}/leaflet-locatecontrol/images/locate_alt.svg (100%)
rename {includes => webroot}/leaflet-locatecontrol/images/locate_touch.png (100%)
rename {includes => webroot}/leaflet-locatecontrol/images/locate_touch_alt.png (100%)
rename {includes => webroot}/leaflet-locatecontrol/images/spinner.gif (100%)
hooks/post-receive
--
galette/plugin-maps.git
--
Galette repositories commits - http://galette.eu
List documentation: https://listengine.tuxfamily.org/lists.galette.eu/commits/