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

Commit 03fa057

Browse files
author
Pierre GIRAUD
committed
Bumping version 2.6.0
1 parent c4ebbdb commit 03fa057

File tree

9 files changed

+59
-33
lines changed

9 files changed

+59
-33
lines changed

‎CHANGELOG.md‎

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

4+
## 2.6.0 (2014-10-17)
5+
6+
* Fixed issue with JOSM not ignoring ignore=true tags
7+
* Fixed issue with some static resources being loaded from external urls
8+
* some other minor fixes and enhancements
9+
10+
Thanks to @oeon, @CloCkWeRX and @NitikaAgarwal for their contributions.
11+
12+
https://github.com/hotosm/osm-tasking-manager2/compare/2.5.0...2.6
13+
14+
## 2.5.0 (2014-09-23)
15+
16+
* Add xyz to properties when exporting to GeoJSON
17+
* Don't load imagery in JOSM if not available
18+
* Manager OSM username changes
19+
* Fixed issues with markdown + more HTML tags allowed
20+
* Performances enhancements (home page)
21+
* Pyramid upgraded to 1.5
22+
* Layout is now partly customizable
23+
* Users can be mentioned using "@" in comment.
24+
* + several bug fixes
25+
* https://github.com/hotosm/osm-tasking-manager2/compare/2.4.2...2.5.0
26+
427
## 2.4.2 (2014-08-08)
528

629
* More or less important bugs fixed

‎RELEASING.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
- [ ] Update CHANGELOG.md
1414
- [ ] Update version number in setup.py
1515
- [ ] Update version number in mako templates (resources)
16+
```
17+
sed s/2.6-dev/2.6.0/ -i osmtm/templates/*.mako
18+
```
1619
- [ ] git ci -m "Bumping version A.B.C"
1720
- [ ] git tag A.B.C (for example 2.3.0)
1821
- [ ] git push upstream --tags

‎osmtm/templates/base.mako‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<title>${custom.instance_name()} - ${self.title()}</title>
88
<link rel="shortcut icon" href="${request.static_url('osmtm:static/img/favicon.ico')}">
9-
<link rel="stylesheet" href="${request.static_url('osmtm:static/css/main.css', _query={'v':'2.6-dev'})}">
10-
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/leaflet.css', _query={'v':'2.6-dev'})}">
11-
<script src="${request.static_url('osmtm:static/js/lib/jquery-1.7.2.min.js', _query={'v':'2.6-dev'})}"></script>
12-
<script src="${request.static_url('osmtm:static/js/lib/showdown.js', _query={'v':'2.6-dev'})}"></script>
13-
<script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/jquery.timeago.js', _query={'v':'2.6-dev'})}"></script>
14-
<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>
15-
<script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js', _query={'v':'2.6-dev'})}"></script>
16-
<script src="${request.static_url('osmtm:static/js/shared.js', _query={'v':'2.6-dev'})}"></script>
17-
<script src="${request.static_url('osmtm:static/bootstrap/dist/js/bootstrap.min.js', _query={'v':'2.6-dev'})}"></script>
9+
<link rel="stylesheet" href="${request.static_url('osmtm:static/css/main.css', _query={'v':'2.6.0'})}">
10+
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/leaflet.css', _query={'v':'2.6.0'})}">
11+
<script src="${request.static_url('osmtm:static/js/lib/jquery-1.7.2.min.js', _query={'v':'2.6.0'})}"></script>
12+
<script src="${request.static_url('osmtm:static/js/lib/showdown.js', _query={'v':'2.6.0'})}"></script>
13+
<script src="${request.static_url('osmtm:static/js/lib/jquery-timeago/jquery.timeago.js', _query={'v':'2.6.0'})}"></script>
14+
<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>
15+
<script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js', _query={'v':'2.6.0'})}"></script>
16+
<script src="${request.static_url('osmtm:static/js/shared.js', _query={'v':'2.6.0'})}"></script>
17+
<script src="${request.static_url('osmtm:static/bootstrap/dist/js/bootstrap.min.js', _query={'v':'2.6.0'})}"></script>
1818
<%
1919
from osmtm.models import DBSession, TaskComment
2020
login_url= request.route_path('login', _query=[('came_from', request.url)])

‎osmtm/templates/project.edit.mako‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<h1>${project.id} - ${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.6-dev'})}">
8-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/angular.min.js', _query={'v':'2.6-dev'})}"></script>
9-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/bootstrap-datepicker.js', _query={'v':'2.6-dev'})}"></script>
10-
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.6-dev'})}"/>
11-
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6-dev'})}"></script>
12-
<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.6-dev'})}"></script>
7+
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/datepicker3.css', _query={'v':'2.6.0'})}">
8+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/angular.min.js', _query={'v':'2.6.0'})}"></script>
9+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/lib/bootstrap-datepicker.js', _query={'v':'2.6.0'})}"></script>
10+
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.6.0'})}"/>
11+
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6.0'})}"></script>
12+
<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.6.0'})}"></script>
1313
<div id="markdown_cheat_sheet" class="modal fade">
1414
<div class="modal-dialog">
1515
<div class="modal-content">
@@ -78,8 +78,8 @@ geometry = loads(str(project.area.geometry.data))
7878
</div>
7979
</div>
8080
</form>
81-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/project.edit.js', _query={'v':'2.6-dev'})}"></script>
82-
<script src="${request.static_url('osmtm:static/js/lib/typeahead.bundle.js', _query={'v':'2.6-dev'})}"></script>
81+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/project.edit.js', _query={'v':'2.6.0'})}"></script>
82+
<script src="${request.static_url('osmtm:static/js/lib/typeahead.bundle.js', _query={'v':'2.6.0'})}"></script>
8383
</div>
8484
</%block>
8585
<%block name="description">

‎osmtm/templates/project.mako‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ else:
8484
</div>
8585
</div>
8686
</div>
87-
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6-dev'})}"></script>
87+
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6.0'})}"></script>
8888
<script>
8989
<%
9090
from shapely.wkb import loads
@@ -102,9 +102,9 @@ var statesI18n = ["${_('Ready')}", "${_('Invalidated')}", "${_('Done')}", "${_('
102102
var commentRequiredMsg = "${_('You must leave a comment.')}";
103103
var highPriorityI18n = "${_('High priority')}";
104104
</script>
105-
<script src="${request.static_url('osmtm:static/js/lib/d3.v3.js', _query={'v':'2.6-dev'})}"></script>
106-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/project.js', _query={'v':'2.6-dev'})}"></script>
107-
<script type="text/javascript" src="${request.static_url('osmtm:static/js/task.difficulty.js', _query={'v':'2.6-dev'})}"></script>
108-
<script src="${request.static_url('osmtm:static/js/lib/At.js/js/jquery.caret.js', _query={'v':'2.6-dev'})}"></script>
109-
<script src="${request.static_url('osmtm:static/js/lib/At.js/js/jquery.atwho.js', _query={'v':'2.6-dev'})}"></script>
105+
<script src="${request.static_url('osmtm:static/js/lib/d3.v3.js', _query={'v':'2.6.0'})}"></script>
106+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/project.js', _query={'v':'2.6.0'})}"></script>
107+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/task.difficulty.js', _query={'v':'2.6.0'})}"></script>
108+
<script src="${request.static_url('osmtm:static/js/lib/At.js/js/jquery.caret.js', _query={'v':'2.6.0'})}"></script>
109+
<script src="${request.static_url('osmtm:static/js/lib/At.js/js/jquery.atwho.js', _query={'v':'2.6.0'})}"></script>
110110
</%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.6-dev'})}"></script>
18+
<script src="${request.static_url('osmtm:static/js/project.new.import.js', _query={'v':'2.6.0'})}"></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.6-dev'})}"/>
21-
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6-dev'})}"></script>
22-
<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.6-dev'})}"></script>
23-
<script src="${request.static_url('osmtm:static/js/lib/leaflet-omnivore.min.js', _query={'v':'2.6-dev'})}"></script>
24-
<script src="${request.static_url('osmtm:static/js/project.new.js', _query={'v':'2.6-dev'})}"></script>
20+
<link rel="stylesheet" href="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.css', _query={'v':'2.6.0'})}"/>
21+
<script src="${request.static_url('osmtm:static/js/lib/leaflet.js', _query={'v':'2.6.0'})}"></script>
22+
<script src="${request.static_url('osmtm:static/js/lib/Leaflet.draw/dist/leaflet.draw.js', _query={'v':'2.6.0'})}"></script>
23+
<script src="${request.static_url('osmtm:static/js/lib/leaflet-omnivore.min.js', _query={'v':'2.6.0'})}"></script>
24+
<script src="${request.static_url('osmtm:static/js/project.new.js', _query={'v':'2.6.0'})}"></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.6-dev'})}" width="150">
67+
<img src="${request.static_url('osmtm:static/img/project_creation_grid.png', _query={'v':'2.6.0'})}" 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.6-dev'})}" width="150">
81+
<img src="${request.static_url('osmtm:static/img/project_creation_arbitrary.png', _query={'v':'2.6.0'})}" 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.6-dev'})}"></script>
14+
<script type="text/javascript" src="${request.static_url('osmtm:static/js/task.assign.js', _query={'v':'2.6.0'})}"></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
@@ -36,7 +36,7 @@
3636
]
3737

3838
setup(name='osmtm',
39-
version='2.6-dev',
39+
version='2.6.0',
4040
description='osmtm',
4141
long_description=README + '\n\n' + CHANGES,
4242
classifiers=[

0 commit comments

Comments
 (0)