From 2fcfe3e6800c88efb2efbc67f95f2999c906a267 Mon Sep 17 00:00:00 2001 From: xbgmsharp Date: Sat, 17 Jan 2015 20:35:16 +0900 Subject: [PATCH] Bump version to 2.7.c --- CHANGELOG | 11 +++++++++++ admin/admin_config.php | 2 +- main.inc.php | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 166c082..a7e02cc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,18 @@ +Changes from v2.7.b to v2.7.c +- RE Add Batch manager mode support +- Extend PWG support for GPX tracks file +- Add a prefilter for GPX tracks on batch manager +- Add/Integrate Map in batch manager +- Add new config option for world map layout +- Add new config options for GPX view +- Update language, thanks to the contributors +- Drop previous support for GPS tracks file + Changes from v2.7.a to v2.7.b - Add new options for world map view - Unify code, Thanks to GnunuX - Add support for GPS tracks file, Thanks to GnunuX +- Fix PHP error for special config Changes from v2.6.b to v2.7.a - Add custom pin marker support diff --git a/admin/admin_config.php b/admin/admin_config.php index 0e3525e..0f99c41 100644 --- a/admin/admin_config.php +++ b/admin/admin_config.php @@ -112,7 +112,7 @@ $available_layout = array( '1' => 'osm-map.tpl', '2' => 'osm-map2.tpl', - '3' => 'osm-map3.tpl', +// '3' => 'osm-map3.tpl', ); $query = 'SELECT COUNT(*) FROM '.IMAGES_TABLE.' WHERE `latitude` IS NOT NULL and `longitude` IS NOT NULL '; diff --git a/main.inc.php b/main.inc.php index 132e6cc..6559c13 100644 --- a/main.inc.php +++ b/main.inc.php @@ -1,7 +1,7 @@