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

510 commits

Author SHA1 Message Date
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
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
77ce1b2809 Ignore empty tags. Closes #2311. 2009-09-24 23:27:13 +00:00
Tom Hughes
63b399c9b2 Update to rails 2.3.4 for security fixes. 2009-09-04 08:45:38 +00:00
Tom Hughes
73340e1780 Add support for reloading the language table. 2009-09-03 21:55:42 +00:00
Tom Hughes
d227589a63 Merge oauth branch at r17138 to trunk. 2009-08-18 20:01:56 +00:00
Tom Hughes
0f6dda6050 Qualify SCALE properly - apparently object visibility when running the 
test suite is not the same as when running live... Rails FAIL!
 2009-08-16 10:36:16 +00:00
Matt Amos
d0e47d30e4 Fixes bug #2152 by preventing over-expansion of bboxes beyond the world range. 2009-08-16 00:19:18 +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
bb84a78a09 Made XML parsing routines raise an exception if the document is valid XML, but not valid as an OSM document. This is now the same behaviour as when the document isn't valid XML. 2009-08-06 17:28:49 +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
Tom Hughes
254ce1eca0 Exclude deleted messages from the new_messages relationship. 2009-08-03 14:33:53 +00:00
Matt Amos
eff06faf46 Moved find_token method into the token class, since that seems a more appropriate place for it. 2009-08-03 14:00:29 +00:00
Matt Amos
e1ad636f53 Removed debugging statements accidentally committed. 2009-08-03 13:58:59 +00:00
Matt Amos
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00
Tom Hughes
70cf737626 Ignore deleted traces when returning a user's traces. Fixes #2093. 2009-07-23 17:45:28 +00:00
Tom Hughes
581c243e0e Allow messages to be deleted from the outbox as well as the inbox. 2009-07-23 17:41:50 +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
291350850d Say which way is too long. 2009-07-15 13:34:14 +00:00
Tom Hughes
64fb530581 Merge 16110:16487 from trunk. 2009-07-14 08:03:24 +00:00
Štefan Baebler
9afb533280 added comment for future generations 2009-07-07 22:50:46 +00:00
Štefan Baebler
ebbcf63f0d Introducing comma as tag separator (if present, otherwise it behaves as before), allowing spaces in tags. fixes #2032 2009-07-07 22:05:03 +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
554818b5b4 Contrary to what the previous commit message said, we do actually have more cases of user A triggering mail to user B. 
(references #1968)
 2009-06-20 20:42:22 +00:00
Thomas Wood
0ed4cdbd49 Force locale on subject translation for diary comment notifications, since the sending user's locale is not that of recipient. 
It is assumed that sender locale is that of recipient for the rest of the emails, which is fine, since the sender is the recipient.
The bodies are accounted for correctly by common_headers and the monkeypatching of ActionMailer.
(references #1968)
 2009-06-20 20:36:52 +00:00
Shaun McDonald
65eb6af303 Give a nice error message when parsing the nwr tags and they are missing the k and/or v. Also includes tests. 2009-06-11 11:08:37 +00:00
Shaun McDonald
37df03a043 Cleanup the Relation.from_xml to come in line with the Way and Node versions. Includes tests. Bug fix for the previous tests. 2009-06-10 17:17:03 +00:00
Shaun McDonald
e4d7b3ee66 Throw errors in the way xml parsing if there is a problem. Bring the way parsing in line with the node parsing. Properly deal with the 0 id case. Some Way.from_xml tests. 2009-06-10 15:42:12 +00:00
Shaun McDonald
e3693d487a More unit tests for the parsing of the Node.from_xml. Some code clean up to ensure that a node that cannot be parsed will always throw an exception, to be handled by the arround handler. 2009-06-08 18:53:19 +00:00
Ævar Arnfjörð Bjarmason
938cdd8503 Made GPX notification E-Mails translatable 
The multiline 'notifier.gpx_notification.success.loaded_successfully'
message is how one should properly do multiline messages to be
embedded into E-Mail. It wraps at 80 columns (if translated correctly)
and isn't as inhererently limited as splitting the E-Mail into one
message per-line like the other notification messages do it.
 2009-06-07 15:50:30 +00:00
Tom Hughes
d9dbd3edf1 Make the rest of the email translatable. 2009-06-05 23:53:47 +00:00
Tom Hughes
5de81dc4b0 More work on optimisation the location of nearby users - it turns out 
that getting the database to do the filtering is much better as it
avoids us constructing thousands of user objects only to then throw
most of them away again.
 2009-06-05 09:30:31 +00:00
Tom Hughes
857eeae8b2 Optimise the finding of nearby users a bit. 2009-06-05 08:27:45 +00:00
Tom Hughes
35eeff0081 Fix up translation issues in diary comment notifier. 2009-06-02 08:25:00 +00:00
Shaun McDonald
2875a2c4b3 more tranlations for validations. Bug fix for the missing translation of the gps upload 2009-06-01 18:09:24 +00:00
Tom Hughes
5294e4d989 Send notification messages in the target user's language. 2009-05-31 16:10:53 +00:00
Tom Hughes
0e96027a20 Sort out storage and use of user preferred languages. 2009-05-31 14:55:45 +00:00
Tom Hughes
3d906fe8c6 Merge 15165:15373 from trunk. 2009-05-31 11:32:32 +00:00
Tom Hughes
5b3b288fc2 Add a list of languages and fix a few issues with the schema. Also get 
language selection for diary entries working.
 2009-05-30 16:37:21 +00:00
Shaun McDonald
3a599519eb Some more of the user account translations. Custom generate method for languages, that doesn't appear to work. Setting user language on create. Start translations in controllers. Diary entries can now be saved. 2009-05-30 14:04:42 +00:00
Tom Hughes
0e71278320 Rename language_code to code - language_code is tautological when it's 
in the language table anyway.
 2009-05-23 00:00:25 +00:00
Shaun McDonald
53b4d645d8 First stage of i18n. Some migrations and extra plugins. 2009-05-22 18:36:17 +00:00
Matt Amos
4ab495f5db Added locking around update and delete methods on main API objects. This should remove the 500 errors which come from concurrent overlapping updates. Experimental - might be too slow for production. 2009-05-21 14:57:03 +00:00
Matt Amos
3d0ca940d2 Using an around_handler for catching and rendering errors in most of the API controller methods. This simplifies the code and makes errors and error messages a bit more consistent. Also added a utility method for checking the HTTP method. 2009-05-20 17:39:59 +00:00