Tom Hughes
|
52e5fa6ad7
|
Merge branch 'master' into openstreetbugs
Conflicts:
app/views/browse/_map.html.erb
app/views/site/index.html.erb
config/initializers/mime_types.rb
config/routes.rb
lib/map_boundary.rb
lib/migrate.rb
lib/osm.rb
vendor/assets/openlayers/OpenLayers.js
|
2012-01-05 20:15:53 +00:00 |
|
Tom Hughes
|
0030c77537
|
Rework notes interface using OpenLayers and rails
|
2011-09-19 20:16:20 +01:00 |
|
Tom Hughes
|
d5295fb485
|
Return GeoJSON for notes when JSON format is requested
|
2011-09-18 18:54:39 +01:00 |
|
Tom Hughes
|
8382181635
|
Tidy up the note controller
Go through most of the note controller, tidying things up, fixing
a few bugs, and making sure we have tests for everything.
|
2011-05-22 17:02:48 +01:00 |
|
Tom Hughes
|
33c0f15990
|
Tidy up the note model a bit
|
2011-05-22 11:33:49 +01:00 |
|
Tom Hughes
|
e3b8b89330
|
Mass rename of "bugs" as "notes" for increased user friendliness
|
2011-05-21 17:22:31 +01:00 |
|