Merge pull request #219 from hotosm/bump_2.3.1

Bumping version 2.3.1
hotosm · Jul 24, 2014 · 9ad0df2 · 9ad0df2
2 parents 97437bf + 141b0ac
commit 9ad0df2
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 OSM Tasking Manager Changelog
 =============================
 
+## 2.3.1 (2014-07-24)
+
+ * Fixed bug with Potlatch2 not launching.
+ * Fixed issue with static resources being cached by browser.
+
 ## 2.3.0 (2014-07-24)
 
  * Project creation workflow is made easier. KML can also be used as source.

diff --git a/osmtm/templates/base.mako b/osmtm/templates/base.mako
@@ -3,15 +3,15 @@
 <html>
   <head>
     <title>OSM Tasking Manager</title>
-    <link rel="stylesheet" href="${request.static_url('osmtm:static/css/main.css', _query={'v':'2.3.0'})}">
-    <link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/leaflet.css', _query={'v':'2.3.0'})}">
-    <script src="${request.static_url('osmtm:static/js/lib/jquery-1.7.2.min.js', _query={'v':'2.3.0'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/lib/showdown.js', _query={'v':'2.3.0'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/jquery.timeago.js', _query={'v':'2.3.0'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/locales/jquery.timeago.%s.js' % request.locale_name, _query={'v':'2.3.0'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js', _query={'v':'2.3.0'})}"></script>
-    <script src="${request.static_url('osmtm:static/js/shared.js', _query={'v':'2.3.0'})}"></script>
-    <script src="${request.static_url('osmtm:static/bootstrap/dist/js/bootstrap.min.js', _query={'v':'2.3.0'})}"></script>
+    <link rel="stylesheet" href="${request.static_url('osmtm:static/css/main.css', _query={'v':'2.3.1'})}">
+    <link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/leaflet.css', _query={'v':'2.3.1'})}">
+    <script src="${request.static_url('osmtm:static/js/lib/jquery-1.7.2.min.js', _query={'v':'2.3.1'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/lib/showdown.js', _query={'v':'2.3.1'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/jquery.timeago.js', _query={'v':'2.3.1'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/locales/jquery.timeago.%s.js' % request.locale_name, _query={'v':'2.3.1'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js', _query={'v':'2.3.1'})}"></script>
+    <script src="${request.static_url('osmtm:static/js/shared.js', _query={'v':'2.3.1'})}"></script>
+    <script src="${request.static_url('osmtm:static/bootstrap/dist/js/bootstrap.min.js', _query={'v':'2.3.1'})}"></script>
 <%
 from pyramid.security import authenticated_userid
 from osmtm.models import DBSession, User, TaskComment

diff --git a/osmtm/templates/project.edit.mako b/osmtm/templates/project.edit.mako
@@ -4,9 +4,9 @@
 <h1>${project.name} - Edit</h1>
 </%block>
 <%block name="content">
-<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/datepicker3.css', _query={'v':'2.3.0'})}">
-<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/angular.min.js', _query={'v':'2.3.0'})}"></script>
-<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/bootstrap-datepicker.js', _query={'v':'2.3.0'})}"></script>
+<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/datepicker3.css', _query={'v':'2.3.1'})}">
+<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/angular.min.js', _query={'v':'2.3.1'})}"></script>
+<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/bootstrap-datepicker.js', _query={'v':'2.3.1'})}"></script>
 <div id="markdown_cheat_sheet" class="modal fade">
   <div class="modal-dialog">
   <div class="modal-content">
@@ -64,7 +64,7 @@
       </div>
     </div>
   </form>
-  <script type="text/javascript" src="${request.static_url('osmtm:static/js/project.edit.js', _query={'v':'2.3.0'})}"></script>
+  <script type="text/javascript" src="${request.static_url('osmtm:static/js/project.edit.js', _query={'v':'2.3.1'})}"></script>
   <script src="http://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.js"></script>
 </div>
 </%block>

diff --git a/osmtm/templates/project.mako b/osmtm/templates/project.mako
@@ -76,8 +76,8 @@ else:
     </div>
   </div>
 </div>
-<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.3.0'})}"></script>
-<script src="${request.static_url('osmtm:static/js/lib/Leaflet.utfgrid/dist/leaflet.utfgrid.js', _query={'v':'2.3.0'})}"></script>
+<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.3.1'})}"></script>
+<script src="${request.static_url('osmtm:static/js/lib/Leaflet.utfgrid/dist/leaflet.utfgrid.js', _query={'v':'2.3.1'})}"></script>
 <script>
 <%
 from shapely.wkb import loads
@@ -94,5 +94,5 @@ var statesI18n = ["${_('Ready')}", "${_('Invalidated')}", "${_('Done')}", "${_('
 var commentRequiredMsg = "${_('You must leave a comment.')}"
 </script>
   <script src="http://d3js.org/d3.v3.js"></script>
-  <script type="text/javascript" src="${request.static_url('osmtm:static/js/project.js', _query={'v':'2.3.0'})}"></script>
+  <script type="text/javascript" src="${request.static_url('osmtm:static/js/project.js', _query={'v':'2.3.1'})}"></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.3.0'})}"></script>
+<script src="${request.static_url('osmtm:static/js/project.new.import.js', _query={'v':'2.3.1'})}"></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.3.0'})}"/>
-<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.3.0'})}"></script>
-<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.3.0'})}"></script>
-<script src="${request.static_url('osmtm:static/js/lib/leaflet-omnivore.min.js', _query={'v':'2.3.0'})}"></script>
-<script src="${request.static_url('osmtm:static/js/project.new.js', _query={'v':'2.3.0'})}"></script>
+<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.3.1'})}"/>
+<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.3.1'})}"></script>
+<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.3.1'})}"></script>
+<script src="${request.static_url('osmtm:static/js/lib/leaflet-omnivore.min.js', _query={'v':'2.3.1'})}"></script>
+<script src="${request.static_url('osmtm:static/js/project.new.js', _query={'v':'2.3.1'})}"></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.3.0'})}" width="150">
+        <img src="${request.static_url('osmtm:static/img/project_creation_grid.png', _query={'v':'2.3.1'})}" 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.3.0'})}" width="150">
+        <img src="${request.static_url('osmtm:static/img/project_creation_arbitrary.png', _query={'v':'2.3.1'})}" 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.3.0'})}"></script>
+  <script type="text/javascript" src="${request.static_url('osmtm:static/js/task.assign.js', _query={'v':'2.3.1'})}"></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
@@ -35,7 +35,7 @@
 ]
 
 setup(name='osmtm',
-      version='2.3.0',
+      version='2.3.1',
       description='osmtm',
       long_description=README + '\n\n' + CHANGES,
       classifiers=[