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

1383 commits

Author SHA1 Message Date
Tom Hughes
02e186ee5b Allow user details to be fetched without agreeing terms 2011-04-20 21:17:59 +01:00
Tom Hughes
8980da4381 Merge branch 'master' into openstreetbugs 2011-04-20 19:23:39 +01:00
Matt Amos
c21aa5933a Added flash notice for CTs decline 
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
 2011-04-18 00:29:15 +01:00
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Tom Hughes
452879ee03 Don't run the user terms tests unless REQUIRE_TERMS_SEEN is set 2011-04-03 13:46:16 +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
11aff90f63 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	public/stylesheets/common.css
 2011-02-10 14:10:19 +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
Kai Krueger
426778dd2a Start the rots server if it isn't already running 2010-12-06 00:38:42 +00:00
Tom Hughes
0ea9f92be5 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-12-05 15:15:55 +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
e09b187cae Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-10-17 10:59:29 +01:00
Tom Hughes
7b3e8871d5 There are five trace fixtures now 2010-10-11 23:35:44 +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
c1b65d11fd Fixup openid test to reflect changes merged from master 2010-10-05 00:45:03 +01:00
Tom Hughes
c016bf6c15 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-10-05 00:23:04 +01:00
Tom Hughes
bddf524c88 Allow users to send themselves a new confirmation email 
Add a method which generates a new confirmation email, and provide
links to it from appropriate places.
 2010-10-04 21:52:58 +01:00
Kai Krueger
a0b76fc2c5 Test openid based user creation right through to the final save 2010-10-01 21:29:23 +01:00
Tom Hughes
7c73eca63d Add monkey patch to make openid tests work with rails 2 2010-10-01 21:07:35 +01:00
Kai Krueger
ce1e788f82 Add a test for openid failure during user creation 2010-10-01 21:06:57 +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
Tom Hughes
dd7ef37ec0 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	config/locales/en.yml
 2010-09-06 12:49:10 +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
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +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
406b46e49b Revert "Switch to using oauth-plugin as a gem" 
This reverts commit 41a123334b.
 2010-06-07 16:01:04 +01:00
Tom Hughes
41a123334b Switch to using oauth-plugin as a gem 
Use the oauth-plugin as a gem instead of carrying a local copy.

This also required that commit eff06faf46 be
reverted as it changed the plugin. I don't think the cosmetic improvement
from that patch is worth the hassle of carrying local changes to the plugin.
 2010-05-24 12:58:27 +01:00
Tom Hughes
bffc0377dd Fix user creation tests to handle terms screen 2010-05-11 22:25:06 +01:00
Tom Hughes
64f373dc59 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css
 2010-05-11 21:22:43 +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
c6609cce24 Fixup tests to work after changes to user controller 2010-05-11 14:12:57 +01:00
Tom Hughes
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +01:00
Tom Hughes
f85681c5ce Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-07 22:28:07 +01:00
Tom Hughes
20cc601f85 Fix tests for changes to user model 2010-05-06 22:11:55 +01:00
Kai Krueger
92af0eccd5 Add test for OpenID login and signup 
The tests need the ROTS (Ruby OpenID Test Server) running.
ROTS can be found at http://github.com/roman/rots
If ROTS is not running, there will be 4 failed test cases, but otherwise
things should work
 2010-05-02 11:04:51 +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