Commit graph

210 commits

Author SHA1 Message Date
Tom Hughes
8980da4381 Merge branch 'master' into openstreetbugs 2011-04-20 19:23:39 +01:00
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Matt Amos
f3ff36418b Fixed bug in changeset queries
The 'or' condition needed to be bracketed within larger 'and' expression.
2011-03-15 13:56:55 +00:00
Tom Hughes
2d937f94d5 Add support for conditional deletes in changeset uploads
A delete element in an osmChange upload can now have an if-unused
attribute to indicate that the delete should not be done if the
object is still in use.
2010-12-15 23:59:06 +00:00
Tom Hughes
f20a85a5c5 Allow the client to request errors as an XML document 2010-12-15 23:58:59 +00:00
Shaun McDonald
8e58ec0ff5 Update expected GPS namespace in tests
Update tests to expect the correct GPX namespace URL to reflect the
change made in 7369b7427c ane make the
tests pass again.
2010-12-06 00:40:11 +00:00
Tom Hughes
d458bb044c Fix test for change to editor options 2010-12-01 09:27:12 +00:00
Tom Hughes
06105d280c Fixup tests for changes to multi-editor functionality 2010-11-29 21:19:54 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Tom Hughes
a1cb0f04d4 Merge branch 'master' into openstreetbugs
Conflicts:
	app/views/site/index.html.erb
2010-10-17 11:02:11 +01:00
Tom Hughes
71f1554212 Make trace API a proper CRUD API like other object types 2010-10-11 23:09:27 +01:00
Tom Hughes
6fb8570200 Merge branch 'master' into openstreetbugs
Conflicts:
	config/environment.rb
	config/routes.rb
2010-09-06 12:51:50 +01:00
Matt Amos
838b1ee7e9 Fixed AMF controller to validate changeset comments
Fixed AMF controller so that it doesn't accept non-UTF8 comments, and
throws away non-XML characters.
2010-08-08 16:23:11 +01:00
Tom Hughes
f07819d81a Rework application configuration
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
2010-08-04 22:06:05 +01:00
Tom Hughes
52395b3cdf Merge branch 'master' into openstreetbugs 2010-07-28 21:30:55 +01:00
Tom Hughes
6f73468f18 Convert diary views to use CSS based user specific components 2010-07-21 22:24:35 +01:00
Tom Hughes
959442d087 Merge branch 'master' into openstreetbugs 2010-05-11 19:53:57 +01:00
Tom Hughes
e005926131 Update test to reflect changes in signup page 2010-05-11 19:17:14 +01:00
Tom Hughes
acbc99ac16 Merge branch 'master' into openstreetbugs 2010-04-19 21:30:42 +01:00
Shaun McDonald
9dabe69032 Adding timecop as a gem dependency when in development env. This allows for time based tests to be accurate/consistent. It will stop the random error on the api_controller_test#test_changes_simple, when you are on a slow machine/have bad timing. 2010-04-03 21:02:20 +00:00
Kai Krueger
abf3358ce5 Fixed some minor bugs and add tests to spot them 2010-03-27 11:45:36 +00:00
Matt Amos
11d136e508 Patching fix to test from branch. 2010-03-22 22:56:45 +00:00
Kai Krueger
4aec8dc3a5 minor improvement to the map_bugs tests 2010-03-21 12:04:15 +00:00
Kai Krueger
59a6ed0e20 Don't limit get map_bugs to a small Area, by disabling the quadtile index for those searches
The volumn of bugs seem small enough to get away with normal or GiST indexes (not included yet)

Also includes some other fixes
2010-03-20 11:59:23 +00:00
Kai Krueger
6d668f6f3a Add some rudimentary initial tests for the map bugs api 2010-03-17 23:43:32 +00:00
Tom Hughes
0b913efd05 Use Nominatim to reverse geocode diary location information and display
a friendly human readable location instead of some coordinates.
2010-02-27 12:41:56 +00:00
Tom Hughes
d3bcbf0367 Fix test for viewing an unknown user to actually specify a name - what
it was doing before was testing whether the null user existed.
2010-02-26 15:07:28 +00:00
Tom Hughes
8264fb92ff Fixup AMF tests to match Richard's latest changes. 2010-02-11 17:33:46 +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
Shaun McDonald
5cbaa2fca7 fix some trace tests, due to a change of the way that your own ones are rendered. 2010-01-10 15:21:53 +00:00
Matt Amos
b3f4637a42 Fixed copy-n-paste bug in querying for closed changesets and added a test for it. 2009-12-26 21:29:43 +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
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
c6bf21a9d0 merge r17141:17256 from trunk 2009-08-25 16:49:52 +00:00
Štefan Baebler
93c592bbe4 tests for diary rss feeds 2009-08-19 05:07:26 +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
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
e93becd304 Node controller wasn't using the right name for an exception class. 2009-08-05 11:28:49 +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
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
c807e9ba66 Fixup tests for changes in view templates. 2009-06-25 16:45:56 +00:00