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

773 commits

Author SHA1 Message Date
Matt Amos
16b79f9964 Added a :display_name option for the changesets query code. 2009-10-12 10:12:12 +00:00
Tom Hughes
a8cc053bcc Add some administrator only actions to the user page. 2009-10-12 08:00:59 +00:00
Tom Hughes
0189bce496 Test that the user has cookies enabled at critical points where we 
are about to require them and warn the user if they are not enabled.
 2009-10-09 08:47:47 +00:00
Matt Amos
3429f016c2 Adding blocking to user auth bits of amf_controller. Or, at least, the bits I could find. 2009-10-02 10:49:03 +00:00
Matt Amos
1009788043 Fix wrong comment. 2009-10-02 10:46:19 +00:00
Tom Hughes
54649a39a0 Correct comment. 2009-10-01 20:22:52 +00:00
Matt Amos
1e3b3c1f10 Refactored user_role and controller. Now much more DRY. 2009-10-01 17:15:34 +00:00
Matt Amos
77851bac7b Added better messages and error handling in a couple of places. Added integration checks to ensure that the blocking is actually working. Tests FTW. 2009-09-30 17:39:42 +00:00
Matt Amos
95c3d640a4 Tried to DRY the user_blocks controller. Moved the configuration of the blocking periods into application.yml. 2009-09-30 15:44:29 +00:00
Matt Amos
ca06b3c7b1 New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages. 2009-09-29 16:44:03 +00:00
Matt Amos
09c5740b5b Merging 17824:17845 from trunk to blocking branch. 2009-09-29 10:23:31 +00:00
Thomas Wood
ec26e06706 5 character patch to only output duplicated nodes once in a way/full call 
Unit tests not run - problems on this system
Fixes #2327
 2009-09-29 02:55:35 +00:00
Matt Amos
30d5e783e4 Added a confirmation step to the process of granting and revoking user roles. 2009-09-28 17:35:39 +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
b8afd4fbf3 Fix comment typo. 2009-09-24 23:27:45 +00:00
Tom Hughes
2297dc9074 Wrap GPX API calls with the API error handler, and make sure the create 
method throws on error so it can be trapped and reported. Closes #2310.
 2009-09-24 23:15:35 +00:00
Ævar Arnfjörð Bjarmason
9b7e39dc49 I moved Potlatch's locales but didn't update this, which broke all i18n 2009-09-23 23:34:43 +00:00
Ævar Arnfjörð Bjarmason
5a76b08868 oops, removing debugging code 2009-09-23 17:36:51 +00:00
Ævar Arnfjörð Bjarmason
65eec82978 [2304]: Split the default English i18n parameter in Potlatch out to a YAML file 2009-09-23 17:08:46 +00:00
Tom Hughes
fc5261ece5 Remove remaining trailing spaces from translations. 2009-09-22 20:15:09 +00:00
Tom Hughes
06a17b6bc6 Treat an explicit public=0 argument as meaning private. 2009-09-12 16:46:25 +00:00
Matt Amos
69ab396f08 Fixed bug when oauthorizing with a token which no longer exists (merged 17416 from oauth branch). 2009-09-01 10:25:53 +00:00
Tom Hughes
783748b1e5 Tidy up. 2009-08-31 23:32:03 +00:00
Tom Hughes
543e8c5503 Fix backwards compatibility code to handle an old style public 
attribute correctly. Closes #2242.
 2009-08-31 23:28:51 +00:00
Matt Amos
ade96da19f Added user ID, description, languages and image link to the user details API call. 2009-08-31 23:11:15 +00:00
Matt Amos
b34b898451 Added referer URL in user_token so that redirections (e.g: from oauth token requests) are followed after the user has confirmed the sign-up. Added test for the same. 2009-08-25 15:00:32 +00:00
Tom Hughes
1ce8368f64 Remove debugging. 2009-08-19 08:04:42 +00:00
Tom Hughes
173e92edb8 Cleanup some of the oauth stuff: 
- Detabify views.
- Move translations to correct names.
- Make flash messages translatable.
 2009-08-19 07:59:15 +00:00
Tom Hughes
9fec2fd137 Call the set_locale filter for oauth methods which display web 
pages to the user. Closes #2203.
 2009-08-19 07:45:24 +00:00
Tom Hughes
43d9b32012 Remove explicit specification of I18n.local as the locale in resource 
lookups - it's the default anyway.
 2009-08-18 20:21:25 +00:00
Tom Hughes
d227589a63 Merge oauth branch at r17138 to trunk. 2009-08-18 20:01:56 +00:00
Štefan Baebler
803acea032 fixing interpolation error with per language rss feeds that was introduced in [16903] 2009-08-18 19:36:58 +00:00
Tom Hughes
cd8bb0dc57 Log unexpected exceptions raised by API calls. 2009-08-15 11:35:43 +00:00
Tom Hughes
9617ca2acc Identifiable traces should be trated as private in the trace list. 2009-08-13 17:59:38 +00:00
Tom Hughes
e8a2a15ea1 The "public" field no longer exists in gpx_files. 2009-08-13 17:57:14 +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
Ævar Arnfjörð Bjarmason
127241cdff Make the diary RSS feed translatable 2009-08-07 01:03:42 +00:00
Matt Amos
0d5be22cb5 Merging 16820:16891 from trunk. 2009-08-06 16:24:39 +00:00
Tom Hughes
e477f68a6c Render the links using partial so we can do the appropriate rendering 
for HTML and Atom versions and hopefully get the escaping right in the
feed. Closes #2135.
 2009-08-05 23:39:24 +00:00
Tom Hughes
e48e4ccbd3 Send an appropriate Vary header when we negotiate the language to stop 
caches doing the wrong thing. Closes #1995.
 2009-08-05 20:35:28 +00:00
Matt Amos
e93becd304 Node controller wasn't using the right name for an exception class. 2009-08-05 11:28:49 +00:00
Richard Fairhurst
233f3ee527 Potlatch 1.2 2009-08-04 22:24:20 +00:00
Matt Amos
d75bc6ef69 Use method rather than direct access to member for the current token. 2009-08-04 12:59:02 +00:00
Tom Hughes
39cbc9d653 Tweak the password reset pages a bit. 2009-08-04 00:14:03 +00:00
Tom Hughes
cbbfdf3948 Merge 16743:16811 from trunk. 2009-08-03 23:50:47 +00:00
Tom Hughes
e890528aac Rework password reset system to do away with the second email and instead 
just allow the user (providing they possess a valid token from the first
email) to enter a new password on the site.
 2009-08-03 23:42:29 +00:00
Matt Amos
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00
Tom Hughes
4afacf3410 Fix the changeset feed to put the description in as raw HTML so we 
can include links instead of having to create a separate link free
version of it.
 2009-07-30 11:25:33 +00:00
Ævar Arnfjörð Bjarmason
b06b6c2ce9 Atom readers (Firefox/Liferea) don't like when we embed XHTML anchors 
in the description. So adjust the code that creates the changeset
browser title/description to emit a XHTML and plaintext version with
the HTML and Atom output can use, respectively.

Also:

 * Split up @title into @title and @heading as elsewhere
 * Turn the username on the user / user+bbox browser into a link to the userpage
 * Say "Changesets" instead of "Recent changes". Unlike Wikipedia the changes on OSM aren't guaranteed to be recent, they're just going to be the latest
 2009-07-29 18:44:51 +00:00