Bumping version 2.6.0

hotosm · Oct 17, 2014 · 03fa057 · 03fa057
1 parent c4ebbdb
commit 03fa057
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,29 @@
 OSM Tasking Manager Changelog
 =============================
 
+## 2.6.0 (2014-10-17)
+
+ * Fixed issue with JOSM not ignoring ignore=true tags
+ * Fixed issue with some static resources being loaded from external urls
+ * some other minor fixes and enhancements
+
+ Thanks to @oeon, @CloCkWeRX and @NitikaAgarwal for their contributions.
+
+ https://github.com/hotosm/osm-tasking-manager2/compare/2.5.0...2.6
+
+## 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
+ * https://github.com/hotosm/osm-tasking-manager2/compare/2.4.2...2.5.0
+
 ## 2.4.2 (2014-08-08)
 
  * More or less important bugs fixed

diff --git a/RELEASING.md b/RELEASING.md
@@ -13,6 +13,9 @@
 - [ ] Update CHANGELOG.md
 - [ ] Update version number in setup.py
 - [ ] Update version number in mako templates (resources)
+```
+sed s/2.6-dev/2.6.0/ -i osmtm/templates/*.mako
+```
 - [ ] git ci -m "Bumping version A.B.C"
 - [ ] git tag A.B.C (for example 2.3.0)
 - [ ] git push upstream --tags

diff --git a/osmtm/templates/base.mako b/osmtm/templates/base.mako
@@ -6,15 +6,15 @@
   <head>
   <title>${custom.instance_name()} - ${self.title()}</title>
     <link rel="shortcut icon" href="${request.static_url('osmtm:static/img/favicon.ico')}">
-    <link rel="stylesheet" href="${request.static_url('osmtm:static/css/main.css', _query={'v':'2.6-dev'})}">
-    <link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/leaflet.css', _query={'v':'2.6-dev'})}">
-    <script src="${request.static_url('osmtm:static/js/lib/jquery-1.7.2.min.js', _query={'v':'2.6-dev'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/lib/showdown.js', _query={'v':'2.6-dev'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/jquery.timeago.js', _query={'v':'2.6-dev'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/locales/jquery.timeago.%s.js' % request.locale_name, _query={'v':'2.6-dev'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js', _query={'v':'2.6-dev'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/shared.js', _query={'v':'2.6-dev'})}"></script>
-    <script src="${request.static_url('osmtm:static/bootstrap/dist/js/bootstrap.min.js', _query={'v':'2.6-dev'})}"></script>
+    <link rel="stylesheet" href="${request.static_url('osmtm:static/css/main.css', _query={'v':'2.6.0'})}">
+    <link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/leaflet.css', _query={'v':'2.6.0'})}">
+    <script src="${request.static_url('osmtm:static/js/lib/jquery-1.7.2.min.js', _query={'v':'2.6.0'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/lib/showdown.js', _query={'v':'2.6.0'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/jquery.timeago.js', _query={'v':'2.6.0'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/locales/jquery.timeago.%s.js' % request.locale_name, _query={'v':'2.6.0'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js', _query={'v':'2.6.0'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/shared.js', _query={'v':'2.6.0'})}"></script>
+    <script src="${request.static_url('osmtm:static/bootstrap/dist/js/bootstrap.min.js', _query={'v':'2.6.0'})}"></script>
 <%
 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
@@ -4,12 +4,12 @@
 <h1>${project.id} - ${project.name} - Edit</h1>
 </%block>
 <%block name="content">
-<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/datepicker3.css', _query={'v':'2.6-dev'})}">
-<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/angular.min.js', _query={'v':'2.6-dev'})}"></script>
-<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/bootstrap-datepicker.js', _query={'v':'2.6-dev'})}"></script>
-<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.6-dev'})}"/>
-<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6-dev'})}"></script>
-<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.6-dev'})}"></script>
+<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/datepicker3.css', _query={'v':'2.6.0'})}">
+<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/angular.min.js', _query={'v':'2.6.0'})}"></script>
+<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/bootstrap-datepicker.js', _query={'v':'2.6.0'})}"></script>
+<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.6.0'})}"/>
+<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6.0'})}"></script>
+<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.6.0'})}"></script>
 <div id="markdown_cheat_sheet" class="modal fade">
   <div class="modal-dialog">
   <div class="modal-content">
@@ -78,8 +78,8 @@ geometry = loads(str(project.area.geometry.data))
       </div>
     </div>
   </form>
-  <script type="text/javascript" src="${request.static_url('osmtm:static/js/project.edit.js', _query={'v':'2.6-dev'})}"></script>
-  <script src="${request.static_url('osmtm:static/js/lib/typeahead.bundle.js', _query={'v':'2.6-dev'})}"></script>
+  <script type="text/javascript" src="${request.static_url('osmtm:static/js/project.edit.js', _query={'v':'2.6.0'})}"></script>
+  <script src="${request.static_url('osmtm:static/js/lib/typeahead.bundle.js', _query={'v':'2.6.0'})}"></script>
 </div>
 </%block>
 <%block name="description">

diff --git a/osmtm/templates/project.mako b/osmtm/templates/project.mako
@@ -84,7 +84,7 @@ else:
     </div>
   </div>
 </div>
-<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6-dev'})}"></script>
+<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6.0'})}"></script>
 <script>
 <%
 from shapely.wkb import loads
@@ -102,9 +102,9 @@ var statesI18n = ["${_('Ready')}", "${_('Invalidated')}", "${_('Done')}", "${_('
 var commentRequiredMsg = "${_('You must leave a comment.')}";
 var highPriorityI18n = "${_('High priority')}";
 </script>
-  <script src="${request.static_url('osmtm:static/js/lib/d3.v3.js', _query={'v':'2.6-dev'})}"></script>
-  <script type="text/javascript" src="${request.static_url('osmtm:static/js/project.js', _query={'v':'2.6-dev'})}"></script>
-  <script type="text/javascript" src="${request.static_url('osmtm:static/js/task.difficulty.js', _query={'v':'2.6-dev'})}"></script>
-  <script src="${request.static_url('osmtm:static/js/lib/At.js/js/jquery.caret.js', _query={'v':'2.6-dev'})}"></script>
-  <script src="${request.static_url('osmtm:static/js/lib/At.js/js/jquery.atwho.js', _query={'v':'2.6-dev'})}"></script>
+  <script src="${request.static_url('osmtm:static/js/lib/d3.v3.js', _query={'v':'2.6.0'})}"></script>
+  <script type="text/javascript" src="${request.static_url('osmtm:static/js/project.js', _query={'v':'2.6.0'})}"></script>
+  <script type="text/javascript" src="${request.static_url('osmtm:static/js/task.difficulty.js', _query={'v':'2.6.0'})}"></script>
+  <script src="${request.static_url('osmtm:static/js/lib/At.js/js/jquery.caret.js', _query={'v':'2.6.0'})}"></script>
+  <script src="${request.static_url('osmtm:static/js/lib/At.js/js/jquery.atwho.js', _query={'v':'2.6.0'})}"></script>
 </%block>
diff --git a/osmtm/templates/project.new.import.mako b/osmtm/templates/project.new.import.mako
@@ -15,5 +15,5 @@
     </p>
   </form>
 </div>
-<script src="${request.static_url('osmtm:static/js/project.new.import.js', _query={'v':'2.6-dev'})}"></script>
+<script src="${request.static_url('osmtm:static/js/project.new.import.js', _query={'v':'2.6.0'})}"></script>
 </%block>
diff --git a/osmtm/templates/project.new.mako b/osmtm/templates/project.new.mako
@@ -17,11 +17,11 @@
       </div>
     </div>
 </div>
-<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.6-dev'})}"/>
-<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6-dev'})}"></script>
-<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.6-dev'})}"></script>
-<script src="${request.static_url('osmtm:static/js/lib/leaflet-omnivore.min.js', _query={'v':'2.6-dev'})}"></script>
-<script src="${request.static_url('osmtm:static/js/project.new.js', _query={'v':'2.6-dev'})}"></script>
+<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.6.0'})}"/>
+<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6.0'})}"></script>
+<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.6.0'})}"></script>
+<script src="${request.static_url('osmtm:static/js/lib/leaflet-omnivore.min.js', _query={'v':'2.6.0'})}"></script>
+<script src="${request.static_url('osmtm:static/js/project.new.js', _query={'v':'2.6.0'})}"></script>
 
 </%block>
 
@@ -64,7 +64,7 @@
         <input type="radio" name="type" value="grid" checked/>
         Square Grid
         <br>
-        <img src="${request.static_url('osmtm:static/img/project_creation_grid.png', _query={'v':'2.6-dev'})}" width="150">
+        <img src="${request.static_url('osmtm:static/img/project_creation_grid.png', _query={'v':'2.6.0'})}" width="150">
         <p class="help-block">
         Area of interest is automatically split into grid cells. Each one is a task.<br>
         </p>
@@ -78,7 +78,7 @@
         <input type="radio" name="type" value="arbitrary" disabled />
         Arbitrary Geometries
         <br>
-        <img src="${request.static_url('osmtm:static/img/project_creation_arbitrary.png', _query={'v':'2.6-dev'})}" width="150">
+        <img src="${request.static_url('osmtm:static/img/project_creation_arbitrary.png', _query={'v':'2.6.0'})}" width="150">
         <p class="help-block">
         Each polygon represents a task.<br>
         </p>

diff --git a/osmtm/templates/task.assigned.mako b/osmtm/templates/task.assigned.mako
@@ -11,7 +11,7 @@
     </a>
     % endif
   </div>
-  <script type="text/javascript" src="${request.static_url('osmtm:static/js/task.assign.js', _query={'v':'2.6-dev'})}"></script>
+  <script type="text/javascript" src="${request.static_url('osmtm:static/js/task.assign.js', _query={'v':'2.6.0'})}"></script>
   <div id="assign_to_selector" class="panel panel-default hide">
     <div class="panel-heading small">
       <strong>

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
 ]
 
 setup(name='osmtm',
-      version='2.6-dev',
+      version='2.6.0',
       description='osmtm',
       long_description=README + '\n\n' + CHANGES,
       classifiers=[