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

184 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
02e186ee5b Allow user details to be fetched without agreeing terms 2011-04-20 21:17:59 +01:00
Tom Hughes
37b6418f72 Revert "Allow user details to be fetched without agreeing terms" 
This reverts commit ddd12b03e1.
 2011-04-18 23:04:42 +01:00
Tom Hughes
ddd12b03e1 Allow user details to be fetched without agreeing terms 2011-04-18 22:23:48 +01:00
Tom Hughes
6f7eb8f0e8 Don't require terms to be agreed when logging out 2011-04-18 09:04:57 +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
b77c6fe8ae Improve recognition of OAuth referers for triggering of slim mode 2011-04-06 13:24:08 +01:00
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Tom Hughes
097fb390b8 Only show login/signup in slim mode when used from oauth 2011-04-03 13:46:18 +01:00
Andy Allan
7b57119146 Another approach, but this time without scattering stuff all over the methods 2011-04-03 13:46:17 +01:00
Andy Allan
0531a7dfa1 Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect 2011-04-03 13:46:17 +01:00
Andy Allan
5531c0bf34 Use the slim layout on the login page 2011-04-03 13:46:16 +01:00
Tom Hughes
0169453855 Make sure the user is redirect correctly after seeing the terms 2011-04-03 13:46:16 +01:00
Tom Hughes
392aa71015 Tidy up a few things 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
Tom Hughes
0ea9f92be5 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-12-05 15:15:55 +00:00
Tom Hughes
9c2de4039c Add an explicit "default editor" option to the user settings 2010-11-29 12:20:23 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Tom Hughes
7f3d37867b Protect against interception of confirmation emails 
When processing an account confirmation email don't automatically
log the user in unless their browser session has a token that
matches the same user. Closes #3337.
 2010-11-15 21:41:32 +00: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
2f0ed54206 Handle attempts to agree terms by users with validation errors better 2010-10-12 20:34:49 +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
Tom Hughes
52e523cb0b Invite users to fill in their profile after confirming an account 2010-10-04 19:45:26 +01:00
Tom Hughes
483936772d Improve the flash message shown after a user signs up 
Make the message a bit more friendly and include the email address
the confirmation was sent to.
 2010-10-04 19:11:01 +01:00
Tom Hughes
0874c807e3 Use javascript to automatically submit confirmation forms 
In order to avoid forcing the user to press a confirm button, whilst
still not running into the problems we used to have with virus scanners
activating accounts we use javascript to hide and then automatically
submit the confirmation form.
 2010-10-04 19:11:01 +01:00
Kai Krueger
96b2a9bf16 Add support for fetching attributes via AX as well as SReg 2010-10-03 14:25:45 +01:00
Tom Hughes
bebb9203df Fix errors when an existing user tries to agree to the new terms 2010-10-01 21:07:34 +01:00
Tom Hughes
f70feedc65 Merge branch 'master' into openid 2010-09-24 09:35:36 +01:00
Tom Hughes
ef038fa5fe Only display the license notice if we don't already have a notice 2010-09-10 11:23:01 +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
Tom Hughes
b3d92954d3 Use normal notice system to display login banner 2010-08-13 15:13:30 +01:00
Tom Hughes
6c2089da2d Don't refer to the decline button when there isn't one 2010-08-12 18:09:36 +01:00
Tom Hughes
e055b8e2f8 Fix spelling of referer 2010-08-10 18:13:34 +01:00
Tom Hughes
a99b516962 Allow existing users to voluntarily sign up for the contributor terms 
Based on a patch from Frederik Ramm this change allows users to make a
voluntary decision to sign up for the new contributor terms.
 2010-08-10 18:08: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
6a3cadb52d Merge branch 'master' into openid 2010-06-16 21:18:44 +01:00
Tom Hughes
f973bee52b Make database offline work in production 2010-06-15 10:40:47 +01:00
Tom Hughes
362f237e91 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-17 00:30:43 +01:00
Ævar Arnfjörð Bjarmason
fe8a330fd6 user.login.account suspended so translators don't have to type out anchors 2010-05-17 00:10:41 +01:00
Tom Hughes
30693acc87 Make OpenID authentication work with the latest plugin 2010-05-16 12:07:23 +01:00
Tom Hughes
20c3bf6988 Report duplicate OpenID URLs cleanly 2010-05-11 22:08:52 +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
07f0dddc63 Add parentheses to avoid warning 2010-05-11 19:13:38 +01:00
Tom Hughes
155ed85bf5 Rework the signup and settings methods to make them a bit clearer 2010-05-11 13:36:51 +01:00
Tom Hughes
9b8e28f24b Rework the login method to make it a bit clearer 2010-05-10 14:21:28 +01:00
Tom Hughes
61e51f88cc Merge branch 'master' into terms 2010-05-09 17:16:43 +01:00
Tom Hughes
a53c7bf623 Rework the signup page 2010-05-09 17:03:51 +01:00
Tom Hughes
48d450060b Merge branch 'master' into openid 2010-05-09 12:26:40 +01:00
Tom Hughes
7e5c998a87 Only set pending users to active on a password reset 
When resetting a password only activate pending users, otherwise a
confirmed user's account gets set back to active and may then get
suspended by the spam scorer.
 2010-05-09 08:44:17 +01:00