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

395 commits

Author SHA1 Message Date
Tom Hughes
832b96b75a Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
 2011-05-21 12:14:56 +01:00
Tom Hughes
9cb8311f02 Merge branch 'openID' of git://git.openstreetmap.org/rails into openid 2011-05-21 12:11:40 +01:00
Tom Hughes
f4928d0e95 Rename a number of methods in the map_bugs controller 2011-05-18 00:36:02 +01:00
Tom Hughes
882700c5c8 Rename some columns and indexes in the bug tables 2011-05-18 00:36:00 +01:00
Tom Hughes
d2cf09f389 Make sure the ruby quadtile code give the same result as the C version 2011-05-18 00:36:00 +01:00
Tom Hughes
22bef89d1a Use quad tiling to select bugs in an area 
Remove the _no_quadtile versiond of the selection routines and switch
to using the ordinary ones but with a (large) limit applied on the size
of the area to prevent us spending ages working out the list of tiles
to be selected.
 2011-05-18 00:35:56 +01:00
Tom Hughes
b42a28067d Make sure the ruby quadtile code give the same result as the C version 2011-05-08 15:18:03 +01:00
Tom Hughes
fb4d003ebe Tidy up some of the map bugs code 2011-05-07 13:05:39 +01:00
Tom Hughes
e7cd90f4b4 Merge branch 'master' into openstreetbugs 2011-05-06 22:56:47 +01:00
Tom Hughes
e098d52424 Rearrange changeset list page to put the map beside the list 2011-05-05 20:25:53 +01:00
Matt Amos
3700b534e4 Change the test for whether the CTs have been seen to use the 
user preferences API call rather than user details, as that one
is no longer blocked.
 2011-05-01 02:34:38 +01:00
Tom Hughes
af68e07272 Merge branch 'master' into openstreetbugs 2011-04-29 17:05:59 +01:00
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