From 4c500ab60086e10fdda3520da8a0af6cc7d8f02e Mon Sep 17 00:00:00 2001
From: Pierre GIRAUD
Date: Tue, 23 Sep 2014 15:25:07 +0200
Subject: [PATCH] Bumping version 2.5.0
---
CHANGELOG.md | 12 ++++++++++++
osmtm/templates/base.mako | 18 +++++++++---------
osmtm/templates/project.edit.mako | 14 +++++++-------
osmtm/templates/project.mako | 10 +++++-----
osmtm/templates/project.new.import.mako | 2 +-
osmtm/templates/project.new.mako | 14 +++++++-------
osmtm/templates/task.assigned.mako | 2 +-
setup.py | 2 +-
8 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94fcd7e0..ace36050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
OSM Tasking Manager Changelog
=============================
+## 2.5.0 (2014-09-23)
+
+ * Add xyz to properties when exporting to GeoJSON
+ * Don't load imagery in JOSM if not available
+ * Manager OSM username changes
+ * Fixed issues with markdown + more HTML tags allowed
+ * Performances enhancements (home page)
+ * Pyramid upgraded to 1.5
+ * Layout is now partly customizable
+ * Users can be mentioned using "@" in comment.
+ * + several bug fixes
+
## 2.4.2 (2014-08-08)
* More or less important bugs fixed
diff --git a/osmtm/templates/base.mako b/osmtm/templates/base.mako
index d15e962e..cbee72af 100644
--- a/osmtm/templates/base.mako
+++ b/osmtm/templates/base.mako
@@ -6,15 +6,15 @@
${custom.instance_name()} - ${self.title()}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
<%
from osmtm.models import DBSession, TaskComment
login_url= request.route_path('login', _query=[('came_from', request.url)])
diff --git a/osmtm/templates/project.edit.mako b/osmtm/templates/project.edit.mako
index abcbf10f..40b39ce2 100644
--- a/osmtm/templates/project.edit.mako
+++ b/osmtm/templates/project.edit.mako
@@ -4,12 +4,12 @@
${project.id} - ${project.name} - Edit
%block>
<%block name="content">
-
-
-
-
-
-
+
+
+
+
+
+
@@ -78,7 +78,7 @@ geometry = loads(str(project.area.geometry.data))
-
+
%block>
diff --git a/osmtm/templates/project.mako b/osmtm/templates/project.mako
index 87b2bda2..9c7e90ac 100644
--- a/osmtm/templates/project.mako
+++ b/osmtm/templates/project.mako
@@ -84,7 +84,7 @@ else:
-
+
-
-
-
-
+
+
+
+
%block>
diff --git a/osmtm/templates/project.new.import.mako b/osmtm/templates/project.new.import.mako
index 82e2a1ee..f59d186b 100644
--- a/osmtm/templates/project.new.import.mako
+++ b/osmtm/templates/project.new.import.mako
@@ -15,5 +15,5 @@
-
+
%block>
diff --git a/osmtm/templates/project.new.mako b/osmtm/templates/project.new.mako
index 2e4fa93c..28ddf1dc 100644
--- a/osmtm/templates/project.new.mako
+++ b/osmtm/templates/project.new.mako
@@ -17,11 +17,11 @@
-
-
-
-
-
+
+
+
+
+
%block>
@@ -64,7 +64,7 @@
Square Grid
-
+
Area of interest is automatically split into grid cells. Each one is a task.
@@ -78,7 +78,7 @@
Arbitrary Geometries
-
+
Each polygon represents a task.
diff --git a/osmtm/templates/task.assigned.mako b/osmtm/templates/task.assigned.mako
index 842a8936..69b3d502 100644
--- a/osmtm/templates/task.assigned.mako
+++ b/osmtm/templates/task.assigned.mako
@@ -11,7 +11,7 @@
% endif
-
+
diff --git a/setup.py b/setup.py
index 482de518..1fa3082a 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
]
setup(name='osmtm',
- version='2.5-dev',
+ version='2.5.0',
description='osmtm',
long_description=README + '\n\n' + CHANGES,
classifiers=[