| [galette-commits] [GIT] galette/plugin-maps.git branch, master, updated. 0.0.5-15-ge7bc03a |
[ Thread Index |
Date Index
| More lists.galette.eu/commits Archives
]
This is an automated email from git. It was enerated because a ref
change was pushed to the repository "galette/plugin-maps.git".
The branch, master has been updated
via e7bc03a3831c0a01c0dc5598878d645d07991a8d (commit)
via caa1aac65b5e88266f44dc0fd1978169c9c2c226 (commit)
via 4a16ea2ff30c67353e01db7691e7dae846f5c7b5 (commit)
via 3b456ce9f84cece93e31c51b0fdbe910776aecb8 (commit)
via 77cbc07325618838c9389dfcdf06956cd48c8baa (commit)
via 98fe36f516514336eb1b6a544440a76f536e4763 (commit)
via d6bba8c06e8a83454416f073cc41a72a7c5ee628 (commit)
via acf5784e579a639a9c03d0bf3b2c947c2628f5c9 (commit)
via 0f8f7ff744a1d474258da18d6dd6d357877d7b7d (commit)
via 637dc431abef17e6958e68be475d0e700e00ebda (commit)
via ff8942aab8236fd2b8d18ba0d047a7fb91d069a7 (commit)
via c4458232f37abdce8f698dedc51125dbab82267c (commit)
via 4928377ff73c4b39eab9e909121c891886644a64 (commit)
via fa8bee0ad458b5aeb69ddbb47bf9da7e7c425e07 (commit)
via 190ba0d4e2b99d74a3d5a01ffd58f8ea759d5fb6 (commit)
from ded0a61976cee7552b7c6c5c84a03435b63ba9d9 (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 e7bc03a3831c0a01c0dc5598878d645d07991a8d
Merge: ded0a61 caa1aac
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Tue Aug 20 18:19:52 2013 +0200
Merge branch 'release/1.0.0'
-----------------------------------------------------------------------
Summary of changes:
_define.php | 2 +-
includes/leaflet-0.5.1/images/layers.png | Bin 973 -> 0 bytes
includes/leaflet-0.5.1/leaflet.js | 8 -
includes/leaflet-0.6.4/images/layers-2x.png | Bin 0 -> 2898 bytes
includes/leaflet-0.6.4/images/layers.png | Bin 0 -> 1502 bytes
includes/leaflet-0.6.4/images/marker-galette.png | Bin 0 -> 1647 bytes
.../images/marker-icon-2x.png} | Bin 4033 -> 4033 bytes
.../images/marker-icon.png | Bin 1747 -> 1747 bytes
.../images/marker-shadow.png | Bin 797 -> 797 bytes
.../leaflet-src.js | 2908 ++++++++++++--------
.../{leaflet-0.5.1 => leaflet-0.6.4}/leaflet.css | 146 +-
.../leaflet.ie.css | 6 -
includes/leaflet-0.6.4/leaflet.js | 9 +
includes/leaflet-geosearch/css/l.geosearch.css | 38 +
.../leaflet-geosearch/js/l.control.geosearch.js | 144 +
.../js/l.geosearch.provider.bing.js | 40 +
.../js/l.geosearch.provider.esri.js | 40 +
.../js/l.geosearch.provider.google.js | 50 +
.../js/l.geosearch.provider.nokia.js | 40 +
.../js/l.geosearch.provider.openstreetmap.js | 40 +
.../leaflet-locatecontrol/L.Control.Locate.css | 34 +
.../leaflet-locatecontrol/L.Control.Locate.ie.css | 12 +
includes/leaflet-locatecontrol/L.Control.Locate.js | 280 ++
includes/leaflet-locatecontrol/images/locate.png | Bin 0 -> 1127 bytes
includes/leaflet-locatecontrol/images/locate.svg | 493 ++++
.../leaflet-locatecontrol/images/locate_touch.png | Bin 0 -> 1438 bytes
includes/leaflet-locatecontrol/images/spinner.gif | Bin 0 -> 1397 bytes
lang/en_US.po | 124 +-
lang/en_US/LC_MESSAGES/galette_maps.mo | Bin 1747 -> 2147 bytes
lang/fr_FR.utf8.po | 124 +-
lang/fr_FR.utf8/LC_MESSAGES/galette_maps.mo | Bin 1898 -> 2331 bytes
lang/lang_english.php | 81 +-
lang/lang_french.php | 81 +-
lang/messages.po | 96 +-
templates/default/common_scripts.tpl | 47 +-
templates/default/galette_maps.css | 5 +
templates/default/headers.tpl | 12 +-
templates/default/maps.tpl | 5 +-
templates/default/mymap.tpl | 97 +-
39 files changed, 3449 insertions(+), 1513 deletions(-)
delete mode 100644 includes/leaflet-0.5.1/images/layers.png
delete mode 100644 includes/leaflet-0.5.1/leaflet.js
create mode 100644 includes/leaflet-0.6.4/images/layers-2x.png
create mode 100644 includes/leaflet-0.6.4/images/layers.png
create mode 100644 includes/leaflet-0.6.4/images/marker-galette.png
rename includes/{leaflet-0.5.1/images/marker-icon@xxxxxx => leaflet-0.6.4/images/marker-icon-2x.png} (100%)
rename includes/{leaflet-0.5.1 => leaflet-0.6.4}/images/marker-icon.png (100%)
rename includes/{leaflet-0.5.1 => leaflet-0.6.4}/images/marker-shadow.png (100%)
rename includes/{leaflet-0.5.1 => leaflet-0.6.4}/leaflet-src.js (76%)
rename includes/{leaflet-0.5.1 => leaflet-0.6.4}/leaflet.css (80%)
rename includes/{leaflet-0.5.1 => leaflet-0.6.4}/leaflet.ie.css (90%)
create mode 100644 includes/leaflet-0.6.4/leaflet.js
create mode 100644 includes/leaflet-geosearch/css/l.geosearch.css
create mode 100644 includes/leaflet-geosearch/js/l.control.geosearch.js
create mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.bing.js
create mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.esri.js
create mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.google.js
create mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.nokia.js
create mode 100644 includes/leaflet-geosearch/js/l.geosearch.provider.openstreetmap.js
create mode 100644 includes/leaflet-locatecontrol/L.Control.Locate.css
create mode 100644 includes/leaflet-locatecontrol/L.Control.Locate.ie.css
create mode 100644 includes/leaflet-locatecontrol/L.Control.Locate.js
create mode 100755 includes/leaflet-locatecontrol/images/locate.png
create mode 100644 includes/leaflet-locatecontrol/images/locate.svg
create mode 100644 includes/leaflet-locatecontrol/images/locate_touch.png
create mode 100644 includes/leaflet-locatecontrol/images/spinner.gif
hooks/post-receive
--
galette/plugin-maps.git
--
--
Galette repositories commits - http://galette.tuxfamily.org