Commit graph

423 commits

Author SHA1 Message Date
Shaun McDonald
43a28065b1 Change the way that the changeset parsing is done, so that it is in line with the nodes/ways/relations and gives much nicer error messages. Adding some tests too to back up those changes. 2009-12-06 02:13:30 +00:00
Tom Hughes
d4b8020757 Fix tests to reflect changes to signup form. 2009-10-21 23:35:59 +00:00
Tom Hughes
eb0f9ff63d Merged 17073:17076 from trunk. 2009-10-13 20:25:11 +00:00
Tom Hughes
ef40b61ff4 Merged 17256:18123 from trunk. 2009-10-13 20:06:24 +00:00
Matt Amos
16b79f9964 Added a :display_name option for the changesets query code. 2009-10-12 10:12:12 +00:00
Tom Hughes
fc9df968fc Fix tests which do logins to handle the cookie test. 2009-10-09 09:13:13 +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
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
76b6d7d876 Tests for [17838]
Why is our testing fixtures such a mess? It took me half an hour to find a useable node. And I'm still not sure if it's ok, since I want to get to bed. kthxbye
2009-09-29 03:58:33 +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
49906c99cd Workaround rails 2.3.4 bogus deprecation warnings. 2009-09-04 10:52:58 +00:00
Matt Amos
c6bf21a9d0 merge r17141:17256 from trunk 2009-08-25 16:49:52 +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
Štefan Baebler
93c592bbe4 tests for diary rss feeds 2009-08-19 05:07:26 +00:00
Tom Hughes
d227589a63 Merge oauth branch at r17138 to trunk. 2009-08-18 20:01:56 +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
7ac66a371e Fix test to reflect change to changeset templates. 2009-08-07 14:14:27 +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
Matt Amos
0d5be22cb5 Merging 16820:16891 from trunk. 2009-08-06 16:24:39 +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
Matt Amos
0a122639c9 Ooops. Should have committed the test too. 2009-08-04 13:15:19 +00:00
Matt Amos
655dc6787e Reorganised OAuth clients and tokens details page. Made clients info editable and some more stuff translatable in the OAuth pages. 2009-08-03 17:08:40 +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
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00
Matt Amos
44ec85fcad fixed gps_point coordinates and tile. why was this passing the tests before? 2009-07-30 15:19:07 +00:00
Matt Amos
1e1d7cef73 Fix compatibility with older versions of the ruby std lib (i.e: the one on cruise.osm.org) 2009-07-27 16:59:14 +00:00
Matt Amos
4826032d18 Added methods to strip those non-XML control characters from tags in AMF controller and give an error if there's invalid UTF-8. 2009-07-27 16:54:00 +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
Richard Fairhurst
8eb77ef5e1 "list mode" should really be "live mode" :) 2009-07-08 22:29:45 +00:00
Richard Fairhurst
369202787b Potlatch 1.1 (server code) 2009-07-08 20:52:02 +00:00
Tom Hughes
9a32033209 Merge 16216:16355 from trunk. 2009-07-05 23:47:40 +00:00
Matt Amos
feae60fb69 Fixed short link integration test so that it would have caught a bug in shortlink charset. 2009-07-03 11:19:23 +00:00
Tom Hughes
6baccfaddd Merge 16110:16216 from trunk. 2009-06-29 16:50:34 +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
c807e9ba66 Fixup tests for changes in view templates. 2009-06-25 16:45:56 +00:00
Tom Hughes
02628bed1e Merge 16012:16110 from trunk. 2009-06-25 16:32:05 +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
Matt Amos
b4e634fd35 'Fixing' annoying test case which intermittently fails. 2009-06-22 15:47:46 +00:00
Thomas Wood
ff03138a97 merge 15807:16012 from rails_port 2009-06-19 22:53:16 +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
17a1e22df9 Adding a couple of extra unit tests for the parsing of keys 2009-06-10 17:42:29 +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