| [galette-commits] [GIT] galette/plugin-maps.git branch, master, updated. 1.0.0-25-ga59fc1b |
[ 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 a59fc1b69924ade5ed14015ea94059461284599f (commit)
via e85e78c8b559abd86a82a8cd81229ef685795c5b (commit)
via b96e28e677e50dce7ef16a1aedfa046c5ea6a63a (commit)
via 6bbf846f748d8fad8f6f4e8c5f93d1db4495e08c (commit)
via 31978178946aa29182db0b00722d6147508b4f3f (commit)
via 9b00eb6a34dd00bc2eb91336fe0858015037059d (commit)
via 8491a4b8b204090c2cb091f119a06649a9c97dcd (commit)
via 39411d6a71c719a8bd9c69dfcc09242933ae3175 (commit)
via e2a4af1428c6c004098407522135d33f52761773 (commit)
via 764acd244380032c7473d803a7dc6602bfde9676 (commit)
via 9d73f539105a9ea98db0dd03baa158ae3d0f1df0 (commit)
via 936e1708c903d1c49dc0a0752c4bfb98a0217a73 (commit)
via e9fe6b301a6bf24dcb7b98fedac98540066c1b98 (commit)
via dee2ca896ade86913c70d076e1a2fea36a3095b5 (commit)
via 2d2844098ebfa1996cffc34d8331e21dc64dd955 (commit)
via 6cda044257b973e3cd9da9baa576a68025fe1d00 (commit)
via ff5c4f6e4e9ebef04dfbbee0a33db6dbc2ec20a5 (commit)
via 629d6f71876a6fb1d57340b3b78a689128e6ada2 (commit)
via 27e0b174e463d6762ed00a7f1a4a8b326e168dbd (commit)
via e826ba2f83a9c7bfe67646881eb02233997e3017 (commit)
via 81f723182b4944f2358d5167ed4d9892182fd156 (commit)
via 751855a3c473cd3eb07766adbc6a3e6d855c6346 (commit)
via e023fae2bf0fa5f55d087b267535864090c98648 (commit)
via 28c9c6e1bb37716a97c63aeb9266bb985a9ca3cc (commit)
via 02ffa4c2cf2256e5cd7ba26fc9defecf4571b6bf (commit)
from e7bc03a3831c0a01c0dc5598878d645d07991a8d (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 a59fc1b69924ade5ed14015ea94059461284599f
Merge: e7bc03a e85e78c
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sat Dec 21 23:54:05 2013 +0100
Merge branch 'release/1.1.0'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 20 +
_config.inc.php | 2 +-
_define.php | 6 +-
_smarties.php | 1 -
mymap.php => adh_map.php | 22 +-
ajax_ilivehere.php | 9 +-
includes/leaflet-0.6.4/leaflet.ie.css | 51 -
includes/leaflet-0.6.4/leaflet.js | 9 -
.../images/layers-2x.png | Bin 2898 -> 2898 bytes
.../images/layers.png | Bin 1502 -> 1502 bytes
.../leaflet-0.7.1/images/marker-galette-pro.png | Bin 0 -> 1802 bytes
.../images/marker-galette.png | Bin 1647 -> 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 | 1099 ++++++++++++--------
.../{leaflet-0.6.4 => leaflet-0.7.1}/leaflet.css | 129 ++--
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 0 -> 389 bytes
includes/leaflet-geosearch/LICENSE | 22 +
.../leaflet-geosearch/js/l.control.geosearch.js | 170 +++-
.../js/l.geosearch.provider.esri.js | 5 +-
.../js/l.geosearch.provider.google.js | 16 +-
includes/leaflet-legendcontrol/L.Control.Legend.js | 65 ++
...Control.Locate.css => L.Control.Locate.0.5.css} | 28 +-
includes/leaflet-locatecontrol/L.Control.Locate.js | 38 +-
includes/leaflet-locatecontrol/images/locate.png | Bin 1127 -> 829 bytes
includes/leaflet-locatecontrol/images/locate.svg | 168 +---
.../images/{locate.png => locate_alt.png} | Bin 1127 -> 1127 bytes
.../images/{locate.svg => locate_alt.svg} | 0
.../leaflet-locatecontrol/images/locate_touch.png | Bin 1438 -> 1095 bytes
.../{locate_touch.png => locate_touch_alt.png} | Bin 1438 -> 1438 bytes
lang/en_US.po | 139 ++-
lang/en_US/LC_MESSAGES/galette_maps.mo | Bin 2147 -> 2869 bytes
lang/fr_FR.utf8.po | 139 ++-
lang/fr_FR.utf8/LC_MESSAGES/galette_maps.mo | Bin 2331 -> 3154 bytes
lang/lang_english.php | 94 ++-
lang/lang_french.php | 94 ++-
lang/messages.po | 116 ++-
lang/xgettext.py | 49 +-
lib/GaletteMaps/Coordinates.php | 20 +-
maps.php | 12 +-
maps_preferences.php | 2 -
mymap.php | 4 +-
templates/default/adh_actions.tpl | 1 +
templates/default/adh_fiche_action.tpl | 4 +
templates/default/common_scripts.tpl | 94 ++-
templates/default/galette_maps.css | 37 +
templates/default/headers.tpl | 10 +-
templates/default/images/legend.png | Bin 0 -> 861 bytes
templates/default/images/locate_member.png | Bin 0 -> 1522 bytes
templates/default/images/maps.png | Bin 0 -> 766 bytes
templates/default/maps.tpl | 9 +-
templates/default/menu.tpl | 10 +-
templates/default/mymap.tpl | 21 +-
templates/default/public_menu.tpl | 5 +
59 files changed, 1909 insertions(+), 1010 deletions(-)
copy mymap.php => adh_map.php (89%)
delete mode 100644 includes/leaflet-0.6.4/leaflet.ie.css
delete mode 100644 includes/leaflet-0.6.4/leaflet.js
rename includes/{leaflet-0.6.4 => leaflet-0.7.1}/images/layers-2x.png (100%)
rename includes/{leaflet-0.6.4 => leaflet-0.7.1}/images/layers.png (100%)
create mode 100644 includes/leaflet-0.7.1/images/marker-galette-pro.png
rename includes/{leaflet-0.6.4 => leaflet-0.7.1}/images/marker-galette.png (100%)
rename includes/{leaflet-0.6.4 => leaflet-0.7.1}/images/marker-icon-2x.png (100%)
rename includes/{leaflet-0.6.4 => leaflet-0.7.1}/images/marker-icon.png (100%)
rename includes/{leaflet-0.6.4 => leaflet-0.7.1}/images/marker-shadow.png (100%)
rename includes/{leaflet-0.6.4 => leaflet-0.7.1}/leaflet-src.js (89%)
rename includes/{leaflet-0.6.4 => leaflet-0.7.1}/leaflet.css (81%)
create mode 100644 includes/leaflet-0.7.1/leaflet.js
create mode 100644 includes/leaflet-fullscreencontrol/Control.FullScreen.css
create mode 100644 includes/leaflet-fullscreencontrol/Control.FullScreen.js
create mode 100644 includes/leaflet-fullscreencontrol/LICENSE
create mode 100644 includes/leaflet-fullscreencontrol/icon-fullscreen.png
create mode 100644 includes/leaflet-geosearch/LICENSE
create mode 100644 includes/leaflet-legendcontrol/L.Control.Legend.js
copy includes/leaflet-locatecontrol/{L.Control.Locate.css => L.Control.Locate.0.5.css} (50%)
mode change 100755 => 100644 includes/leaflet-locatecontrol/images/locate.png
copy includes/leaflet-locatecontrol/images/{locate.png => locate_alt.png} (100%)
copy includes/leaflet-locatecontrol/images/{locate.svg => locate_alt.svg} (100%)
copy includes/leaflet-locatecontrol/images/{locate_touch.png => locate_touch_alt.png} (100%)
create mode 100644 templates/default/adh_actions.tpl
create mode 100644 templates/default/adh_fiche_action.tpl
create mode 100644 templates/default/images/legend.png
create mode 100644 templates/default/images/locate_member.png
create mode 100644 templates/default/images/maps.png
create mode 100644 templates/default/public_menu.tpl
hooks/post-receive
--
galette/plugin-maps.git
--
--
Galette repositories commits - http://galette.tuxfamily.org