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

287 commits

Author SHA1 Message Date
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
Kai Krueger
01aa270315 Add a browse page for bugs 2010-03-13 13:45:02 +00:00
Kai Krueger
42822a8b89 An initial (incomplete) "proof of concept" integration of an OpenStreetBugs interface into the rails port 
This is a (start of a) reimplementation of the api at http://github.com/emka/openstreetbugs/tree/master/api/0.1/
into rails

The client side code is taken from http://wiki.openstreetmap.org/wiki/OpenStreetBugs/New_Client

This is ment as a mockup to perhaps use as a basis to further discuss how best to integrate a map bug reporting system

It currently uses (more or less) the openstreetbugs api specification. But this api feels rather inconsistent with the
rest of the rails_port api, so depending on discussions might still need some significant changes.
 2010-02-28 09:30:40 +00:00
Tom Hughes
fbe529d87e Remove unused set_home method from user controller. 2010-02-27 00:02:22 +00:00
Tom Hughes
c55490d24e Move support for adding and deleting user images to the user settings 
page and reposition the user image ont he user page in the top right
corner of the page.
 2010-02-26 23:44:43 +00:00
Tom Hughes
8cd02f4136 Drop the username from the "new diary entry" link to avoid problems 
with caching - we don't need it as we know who the logged in user is
when a diary posting is made.
 2010-02-04 15:48:40 +00:00
Tom Hughes
634565c5d3 Add support for logical deletion of diary entries and comments. 2009-11-14 15:57:08 +00:00
Tom Hughes
ea2652a211 Rename twain geocoder to nominatim. 2009-11-09 09:06:52 +00:00
Tom Hughes
639a994c9b Experimental support for reverse geocoding using the new geocoder. 2009-10-30 11:12:55 +00:00
Tom Hughes
4a05c9a8f6 Add experimental support (disabled by default) for new geocoder. 2009-10-14 14:42:09 +00:00
Tom Hughes
a8cc053bcc Add some administrator only actions to the user page. 2009-10-12 08:00:59 +00:00
Ævar Arnfjörð Bjarmason
269ad0f52e Add a route for '/blocks/new/:display_name' so links will be 
'/blocks/new/Example' not '/blocks/new?display_name=Example'
 2009-10-01 20:08:13 +00:00
Matt Amos
daa2496024 First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
Tom Hughes
908a6ef409 Merge 16891:17044 from trunk. 2009-08-13 17:18:08 +00:00
Tom Hughes
565171486f Add extra visibility options for GPS traces, and enhance the API call 
that returns trace data to return more information if the owner of the
trace has allowed it. Based on a patch from Matt Amos.
 2009-08-13 17:06:11 +00:00
Matt Amos
e470d8a659 Moved oauth_clients page to a sub-page of the user - makes it more obvious that the oauth_clients page is for that specific user. 2009-08-04 13:07:11 +00:00
Matt Amos
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00
Tom Hughes
f3bf0c8b14 Add the ability for a recipient to (logically) delete a message from 
their INBOX so they no longer see it.
 2009-07-23 15:22:44 +00:00
Tom Hughes
64fb530581 Merge 16110:16487 from trunk. 2009-07-14 08:03:24 +00:00
Tom Hughes
942ca1ff23 Merge 16355:16480 from trunk. 2009-07-13 23:28:02 +00:00
Štefan Baebler
0ace75e663 fixed a mixup (not really broken, but producing decieving http traffic and logs) 2009-07-07 23:28:56 +00:00
Tom Hughes
9a32033209 Merge 16216:16355 from trunk. 2009-07-05 23:47:40 +00:00
Tom Hughes
336d40f2c5 Switch to using ATOM for changeset feeds. 2009-07-04 11:34:23 +00:00
Ævar Arnfjörð Bjarmason
e7f5f42856 Changeset [16271] changed "=" in the shortlink to "-" but didn't 
update the routes to match.

Change the regex to accept [=-]* ("=" since we want to be backwards
compatable)
 2009-07-02 21:44:26 +00:00
Tom Hughes
06b2d278ea Make the search box load each set of results separately so that one 
service being slow doesn't delay the response from others.
 2009-07-02 16:12:38 +00:00
Tom Hughes
6baccfaddd Merge 16110:16216 from trunk. 2009-06-29 16:50:34 +00:00
Ævar Arnfjörð Bjarmason
34b147266c Change the feature commited in [16174] to use the main map view 
instead of being located at /map.
 2009-06-27 15:34:26 +00:00