cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5918 commits 4 branches 1 tag 499 MiB
Commit graph

263 commits

Author SHA1 Message Date
Tom Hughes
58d889436f Fix various routing and route generation errors 2012-03-09 23:15:39 +00:00
Tom Hughes
d5bdf633bf Remove some unecessary routes and add lots of method constraints 2012-03-09 20:15:34 +00:00
Tom Hughes
fbf2310721 Remove redundant routes and add default format specifiers 2012-03-09 00:41:15 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
 2012-03-08 18:23:27 +00:00
Steve Singer
1944372af8 Add a view to show diary comments left by a user 2012-02-28 21:29:18 +00:00
Tom Hughes
3121d1b5a0 Put pretty route for /copyright/locale first 2012-02-14 11:54:16 +00:00
Shaun McDonald
0465fda75a Railsify the box link on the browse changeset page 
This removes the whitespace in the url, and makes the root path a
named route so that it can be nicely referenced.
 2012-01-16 17:51:25 +00:00
Mikel Maron
d878db0a9b Add some more social features 
Add a view showing changesets by nearby users, and views showing
diary entries by friends and nearby users.
 2012-01-07 11:54:07 +00:00
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
Mikel Maron
ce829bcc7c Add support for viewing a list of your friends' changesets 2011-12-15 21:25:27 +00:00
Matt Amos
64030a40ac Replace @ with ~ in the shortlink 
This should help Twitter's horribly broken URL detection algorithm
not screw up shortlinks from OSM.
 2011-11-24 22:27:16 +00:00
Tom Hughes
be8164cf15 Generate correct URLs for changeset feeds 2011-11-19 12:42:37 +00:00
Tom Hughes
7b89dc6349 Make OAuth work again 2011-11-16 21:13:25 +00:00
Tom Hughes
a00b1240dd Revert "Put changeset feeds before lists in the routes" 
This reverts commit 76c1371dcf.
 2011-11-15 16:10:08 +00:00
Tom Hughes
76c1371dcf Put changeset feeds before lists in the routes 2011-11-15 12:56:38 +00:00
Tom Hughes
c9fa49c994 Update to rails 3 2011-11-14 09:42:40 +00:00
Tom Hughes
2bceba38ba Allow the format to be selected for note API responses 2011-08-28 16:25:32 +01:00
Tom Hughes
e3b8b89330 Mass rename of "bugs" as "notes" for increased user friendliness 2011-05-21 17:22:31 +01:00
Tom Hughes
f4928d0e95 Rename a number of methods in the map_bugs controller 2011-05-18 00:36:02 +01:00
Tom Hughes
54b42ec94d Place legacy routes after their replacements 2011-05-07 18:07:32 +01:00
Tom Hughes
6aec21b5b8 Merge the gpx_bugs action into the main get_bugs action 2011-05-07 17:30:53 +01:00
Tom Hughes
fb4d003ebe Tidy up some of the map bugs code 2011-05-07 13:05:39 +01:00
Tom Hughes
a1cb0f04d4 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/site/index.html.erb
 2010-10-17 11:02:11 +01:00
Tom Hughes
71f1554212 Make trace API a proper CRUD API like other object types 2010-10-11 23:09:27 +01:00
Tom Hughes
bddf524c88 Allow users to send themselves a new confirmation email 
Add a method which generates a new confirmation email, and provide
links to it from appropriate places.
 2010-10-04 21:52:58 +01:00
Tom Hughes
b477cd5492 Remove unused/non-functional tag searching methods 2010-09-09 21:32:15 +01:00
Tom Hughes
6fb8570200 Merge branch 'master' into openstreetbugs 
Conflicts:
	config/environment.rb
	config/routes.rb
 2010-09-06 12:51:50 +01:00
Tom Hughes
2ce394118d Allow uncompressed GPX traces to be fetched from the API 2010-08-24 21:21:02 +01:00
Tom Hughes
027312fa7e Reorder routes so correct one is selected 2010-08-11 15:23:40 +01:00
Tom Hughes
f7ebb905f1 Put global changeset list route after more specific ones 2010-08-06 11:15:27 +01:00
Tom Hughes
2edd80f465 More reordering routes to put more specific ones first 2010-08-06 11:13:21 +01:00
Tom Hughes
c5b35406a6 More fixed to trace redirection 
Redirect to list on a delete, not view. Also reorder the routes so
the more specific ones are first.
 2010-08-06 10:31:20 +01:00
Tom Hughes
02ad2f5a51 Merge branch 'master' into openstreetbugs 2010-06-27 16:29:52 +01:00
Tom Hughes
98d73aead1 Remove unused routes 2010-06-27 14:45:04 +01:00
Tom Hughes
959442d087 Merge branch 'master' into openstreetbugs 2010-05-11 19:53:57 +01:00
Tom Hughes
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +01:00
Tom Hughes
303e5d3eb9 Merge branch 'master' into terms 
Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
 2010-05-07 22:23:20 +01:00
Tom Hughes
9230721a1f Redirect suspended users to an information page 
If the current session is for a logged in user and that user has
been suspended then log them out and redirect them to a page
explaining that their account has been suspended.
 2010-05-07 10:00:24 +01:00
Tom Hughes
ae8c0b3baf Add a user list view for administrators 2010-05-06 20:55:02 +01:00
Tom Hughes
552a647810 Merge all the user status changing methods into one 2010-05-06 17:18:34 +01:00
Tom Hughes
5a54630b57 Add support for suspended and confirmed users 
Replace the existing "active" and "visible" with an enumerated status
that allows for extra cases. Currently we have "suspended" for users
who hve triggered the spam detector and "confirmed" for users that have
triggered the detector but have been confirmed as vald by an admin.
 2010-05-06 17:18:34 +01:00
Tom Hughes
ffd7b02b0c Merge branch 'master' into terms 2010-05-05 15:29:48 +01:00
Kai Krueger
5898b494df Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs 2010-05-02 11:42:58 +01:00
Tom Hughes
feb9582b07 Tweak the copyright page translation 2010-04-27 16:00:10 +01:00
Tom Hughes
6729272444 Merge branch 'master' into terms 2010-04-27 11:22:25 +01:00
Richard Fairhurst
ecbd526956 New, more helpful and compliant copyright page 2010-04-06 13:55:33 +00:00
Tom Hughes
898c47e647 Present the contributor terms as part of the initial signup instead of 
during the account confirmation step.
 2010-03-26 18:55:17 +00:00
Kai Krueger
c3bf919e3e Reuse the map_bug_comment table as a more general history table of map_bugs including close and reopen events 
This helps the rss feed to work on a per event basis rather than on a per bug basis
 2010-03-21 12:12:05 +00:00
Kai Krueger
c9a3f91f69 List bugs submited or commented on by user 2010-03-15 00:10:41 +00:00
Kai Krueger
458402813c try and make the OpenStreetBugs API a bit more consistent with the rest of the API 2010-03-13 22:21:48 +00:00