Tom Hughes
|
78f608b114
|
Merge branch 'master' into notes
Conflicts:
app/assets/javascripts/browse.js
app/assets/javascripts/map.js.erb
app/assets/stylesheets/common.css.scss
app/views/site/index.html.erb
|
2012-12-01 18:22:30 +00:00 |
|
John Firebaugh
|
05eba79008
|
Move "Browse Map Data" to layers control
Fixes https://trac.openstreetmap.org/ticket/4680
|
2012-11-29 18:23:41 +00:00 |
|
Tom Hughes
|
7599f98957
|
Merge branch 'master' into notes
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/common.css.scss
app/helpers/application_helper.rb
|
2012-11-20 19:08:30 +00:00 |
|
John Firebaugh
|
379cb35832
|
Support semicolon as parameter delimiter
http://lists.openstreetmap.org/pipermail/rails-dev/2012-November/001259.html
|
2012-11-05 08:57:05 +00:00 |
|
Tom Hughes
|
0037502426
|
Merge branch 'master' into notes
Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/site/index.html.erb
|
2012-10-13 15:55:34 +01:00 |
|
John Firebaugh
|
3cf3d888b2
|
Refactor mapParams to compose better with apiUrl
|
2012-10-05 15:36:07 +01:00 |
|
John Firebaugh
|
e4ef507c5c
|
Extract OSM.apiUrl
|
2012-10-05 15:26:54 +01:00 |
|
John Firebaugh
|
c3d1123965
|
Merge globals.js.erb and params.js
|
2012-10-05 15:21:47 +01:00 |
|