Skip to content
This repository was archived by the owner on Mar 7, 2025. It is now read-only.

Commit 9ad0df2

Browse files
author
Pierre GIRAUD
committed
Merge pull request #219 from hotosm/bump_2.3.1
Bumping version 2.3.1
2 parents 97437bf + 141b0ac commit 9ad0df2

File tree

8 files changed

+31
-26
lines changed

8 files changed

+31
-26
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
OSM Tasking Manager Changelog
22
=============================
33

4+
## 2.3.1 (2014-07-24)
5+
6+
* Fixed bug with Potlatch2 not launching.
7+
* Fixed issue with static resources being cached by browser.
8+
49
## 2.3.0 (2014-07-24)
510

611
* Project creation workflow is made easier. KML can also be used as source.

‎osmtm/templates/base.mako‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<html>
44
<head>
55
<title>OSM Tasking Manager</title>
6-
<link rel="stylesheet" href="${request.static_url('osmtm:static/css/main.css', _query={'v':'2.3.0'})}">
7-
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/leaflet.css', _query={'v':'2.3.0'})}">
8-
<script src="${request.static_url('osmtm:static/js/lib/jquery-1.7.2.min.js', _query={'v':'2.3.0'})}"></script>
9-
<script src="${request.static_url('osmtm:static/js/lib/showdown.js', _query={'v':'2.3.0'})}"></script>
10-
<script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/jquery.timeago.js', _query={'v':'2.3.0'})}"></script>
11-
<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>
12-
<script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js', _query={'v':'2.3.0'})}"></script>
13-
<script src="${request.static_url('osmtm:static/js/shared.js', _query={'v':'2.3.0'})}"></script>
14-
<script src="${request.static_url('osmtm:static/bootstrap/dist/js/bootstrap.min.js', _query={'v':'2.3.0'})}"></script>
6+
<link rel="stylesheet" href="${request.static_url('osmtm:static/css/main.css', _query={'v':'2.3.1'})}">
7+
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/leaflet.css', _query={'v':'2.3.1'})}">
8+
<script src="${request.static_url('osmtm:static/js/lib/jquery-1.7.2.min.js', _query={'v':'2.3.1'})}"></script>
9+
<script src="${request.static_url('osmtm:static/js/lib/showdown.js', _query={'v':'2.3.1'})}"></script>
10+
<script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/jquery.timeago.js', _query={'v':'2.3.1'})}"></script>
11+
<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>
12+
<script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js', _query={'v':'2.3.1'})}"></script>
13+
<script src="${request.static_url('osmtm:static/js/shared.js', _query={'v':'2.3.1'})}"></script>
14+
<script src="${request.static_url('osmtm:static/bootstrap/dist/js/bootstrap.min.js', _query={'v':'2.3.1'})}"></script>
1515
<%
1616
from pyramid.security import authenticated_userid
1717
from osmtm.models import DBSession, User, TaskComment

‎osmtm/templates/project.edit.mako‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<h1>${project.name} - Edit</h1>
55
</%block>
66
<%block name="content">
7-
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/datepicker3.css', _query={'v':'2.3.0'})}">
8-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/angular.min.js', _query={'v':'2.3.0'})}"></script>
9-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/bootstrap-datepicker.js', _query={'v':'2.3.0'})}"></script>
7+
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/datepicker3.css', _query={'v':'2.3.1'})}">
8+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/angular.min.js', _query={'v':'2.3.1'})}"></script>
9+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/bootstrap-datepicker.js', _query={'v':'2.3.1'})}"></script>
1010
<div id="markdown_cheat_sheet" class="modal fade">
1111
<div class="modal-dialog">
1212
<div class="modal-content">
@@ -64,7 +64,7 @@
6464
</div>
6565
</div>
6666
</form>
67-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/project.edit.js', _query={'v':'2.3.0'})}"></script>
67+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/project.edit.js', _query={'v':'2.3.1'})}"></script>
6868
<script src="http://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.js"></script>
6969
</div>
7070
</%block>

‎osmtm/templates/project.mako‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ else:
7676
</div>
7777
</div>
7878
</div>
79-
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.3.0'})}"></script>
80-
<script src="${request.static_url('osmtm:static/js/lib/Leaflet.utfgrid/dist/leaflet.utfgrid.js', _query={'v':'2.3.0'})}"></script>
79+
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.3.1'})}"></script>
80+
<script src="${request.static_url('osmtm:static/js/lib/Leaflet.utfgrid/dist/leaflet.utfgrid.js', _query={'v':'2.3.1'})}"></script>
8181
<script>
8282
<%
8383
from shapely.wkb import loads
@@ -94,5 +94,5 @@ var statesI18n = ["${_('Ready')}", "${_('Invalidated')}", "${_('Done')}", "${_('
9494
var commentRequiredMsg = "${_('You must leave a comment.')}"
9595
</script>
9696
<script src="http://d3js.org/d3.v3.js"></script>
97-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/project.js', _query={'v':'2.3.0'})}"></script>
97+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/project.js', _query={'v':'2.3.1'})}"></script>
9898
</%block>

‎osmtm/templates/project.new.import.mako‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
</p>
1616
</form>
1717
</div>
18-
<script src="${request.static_url('osmtm:static/js/project.new.import.js', _query={'v':'2.3.0'})}"></script>
18+
<script src="${request.static_url('osmtm:static/js/project.new.import.js', _query={'v':'2.3.1'})}"></script>
1919
</%block>

‎osmtm/templates/project.new.mako‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
</div>
1818
</div>
1919
</div>
20-
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.3.0'})}"/>
21-
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.3.0'})}"></script>
22-
<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.3.0'})}"></script>
23-
<script src="${request.static_url('osmtm:static/js/lib/leaflet-omnivore.min.js', _query={'v':'2.3.0'})}"></script>
24-
<script src="${request.static_url('osmtm:static/js/project.new.js', _query={'v':'2.3.0'})}"></script>
20+
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.3.1'})}"/>
21+
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.3.1'})}"></script>
22+
<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.3.1'})}"></script>
23+
<script src="${request.static_url('osmtm:static/js/lib/leaflet-omnivore.min.js', _query={'v':'2.3.1'})}"></script>
24+
<script src="${request.static_url('osmtm:static/js/project.new.js', _query={'v':'2.3.1'})}"></script>
2525
2626
</%block>
2727

@@ -64,7 +64,7 @@
6464
<input type="radio" name="type" value="grid" checked/>
6565
Square Grid
6666
<br>
67-
<img src="${request.static_url('osmtm:static/img/project_creation_grid.png', _query={'v':'2.3.0'})}" width="150">
67+
<img src="${request.static_url('osmtm:static/img/project_creation_grid.png', _query={'v':'2.3.1'})}" width="150">
6868
<p class="help-block">
6969
Area of interest is automatically split into grid cells. Each one is a task.<br>
7070
</p>
@@ -78,7 +78,7 @@
7878
<input type="radio" name="type" value="arbitrary" disabled />
7979
Arbitrary Geometries
8080
<br>
81-
<img src="${request.static_url('osmtm:static/img/project_creation_arbitrary.png', _query={'v':'2.3.0'})}" width="150">
81+
<img src="${request.static_url('osmtm:static/img/project_creation_arbitrary.png', _query={'v':'2.3.1'})}" width="150">
8282
<p class="help-block">
8383
Each polygon represents a task.<br>
8484
</p>

‎osmtm/templates/task.assigned.mako‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</a>
1212
% endif
1313
</div>
14-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/task.assign.js', _query={'v':'2.3.0'})}"></script>
14+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/task.assign.js', _query={'v':'2.3.1'})}"></script>
1515
<div id="assign_to_selector" class="panel panel-default hide">
1616
<div class="panel-heading small">
1717
<strong>

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
]
3636

3737
setup(name='osmtm',
38-
version='2.3.0',
38+
version='2.3.1',
3939
description='osmtm',
4040
long_description=README + '\n\n' + CHANGES,
4141
classifiers=[

0 commit comments

Comments
 (0)