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

171 commits

Author SHA1 Message Date
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
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
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
Ævar Arnfjörð Bjarmason
8bc8e537b2 Introducing a new /browse/{node,way,relation,changeset}/{id}/map page 
which is slippy map covering the screen showing the map data that is
in the small map at /browse/{node,way,relation,changeset}/{id}.

/browse/{node,way,relation,changeset}/{id} now contains a link to both
"View Larger Map" which has been changed to link to this new map
feature, and "View on main map" which as before links to the area
showing the feature on the main slippy map.

/browse/{node,way,relation,changeset}/{id}/map supports permalinks
using its own hacked version of updateLocation() (which doesn't set a
cookie), but shortlinks are not supported. The Edit/History/Export
links link back to the main map.
 2009-06-27 09:30:10 +00:00
Matt Amos
1d8e66016c Adding 'shortlink' functions which will allow URLs like http://osm.org/go/XXXX suitable for use in twitter, etc... 2009-06-25 23:31:53 +00:00
Tom Hughes
e657cff464 Merge 16070:16110 from trunk. 2009-06-25 16:45:26 +00:00
Tom Hughes
02628bed1e Merge 16012:16110 from trunk. 2009-06-25 16:32:05 +00:00
Tom Hughes
e3f37d9872 Add new route for AJAX call to get map key. 2009-06-24 23:39:25 +00:00
Tom Hughes
f4571eeb7c Revert r16046. 
DO NOT COMMIT MAJOR ENHANCEMENTS TO TRUNK WITHOUT TALKING TO ME FIRST.
 2009-06-23 02:48:38 +00:00
Matt Amos
b8f6dbd403 Adding initial version of the OAuth token authentication method. This adds basic OAuth support for registering apps, getting and revoking keys, etc... The tokens come with 6 separate permissions bits; read/write user preferences, write diaries, write API and read/write GPS traces. Needs more tests. 2009-06-22 16:54:37 +00:00
Thomas Wood
ff03138a97 merge 15807:16012 from rails_port 2009-06-19 22:53:16 +00:00
Thomas Wood
98a86836d2 Commit avar's patch (+ fix for user not found) to change message sending URL to be by user name rather than id. 
(Closes #1920)
 2009-06-19 22:33:16 +00:00
Tom Hughes
edaddbedae Merge 15722:15806 from head and adjust new views to rails 2 style names. 2009-06-09 21:50:37 +00:00
Ævar Arnfjörð Bjarmason
ea93ad2f07 Since both site.rhtml and site.rxml exists we have to add :format => 
'rhtml' to the root controller so that the index isn't broken.

RSS feeds also work without XHTML being added to them now.
 2009-06-09 13:23:08 +00:00
Tom Hughes
9df991e343 Marge all the changeset list methods together into one. 2009-06-07 16:59:58 +00:00
Tom Hughes
396d8ce313 Use some rails magic to avoid having to duplicate all the changeset 
list controller methods for the RSS feeds.
 2009-06-07 11:24:11 +00:00
Tom Hughes
e1cb17faa6 Back out the changeset RSS stuff from the head for now. 2009-06-07 08:03:07 +00:00
Ævar Arnfjörð Bjarmason
0d16fd57d4 Add RSS feed for global recent changes & changes within a bbox. Solves #1737 
This has so much copy/paste code it hurts, the new list*_rss methods
are just copies of the old list* methods, but see #1927 for that.
 2009-06-07 02:39:45 +00:00
Ævar Arnfjörð Bjarmason
011237c2c5 Implement /user/$user/edits/rss, partially solves #1737 2009-06-07 01:32:19 +00:00