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
Andy Allan
7b8b9104cc
Already got -> already have
2011-01-31 11:02:38 +00:00
Andy Allan
51971248c1
Rework the login page to explain better what to do if you're new
2010-12-21 17:26:03 +00:00
Andy Allan
33a039e849
Show the latest changeset for each of the contacts on the user page
2010-12-17 13:36:53 +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
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
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
Tom Hughes
c246b91675
Stop prompts wrapping in OpenID login box
2010-10-03 14:40:54 +01:00
Tom Hughes
f69abaa9cf
Make terms page work during OpenID based signup
2010-10-01 21:07:34 +01:00
Kai Krueger
183a3e9d07
Yahoo appears to have changed their OpenID endpoint / discovery
2010-10-01 21:07:33 +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
Matt Amos
047027c95d
Added login banner letting users more aware of the license change
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
Frederik Ramm
9aaafcb425
Add new <contributor-terms> element to user details
2010-08-12 17:47:51 +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
03fb042591
Merge branch 'master' into openid
2010-07-28 21:39:46 +01:00
Tom Hughes
84b39122f1
Make the suspended user view work again
...
The suspended user view was broken in 2a2818d
2010-07-20 08:55:08 +01:00
Tom Hughes
403121334a
Allow the "remember me" label to wrap when showing OpenID URL field
2010-05-18 09:08:04 +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
2a2818d055
Change user.suspended.body so translators don't have to type out anchors
2010-05-17 00:10:27 +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
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
6ba75a3bb0
Mark OpenID "what is this?" prompt as a minor note
2010-05-10 14:21:22 +01:00
Tom Hughes
a53c7bf623
Rework the signup page
2010-05-09 17:03:51 +01:00
Tom Hughes
59a6b1973b
Rework the login page to make it a bit cleaner
2010-05-09 15:33:35 +01:00
Tom Hughes
ebd109c946
Replace openID.js with funky rails generated javascript
2010-05-09 12:25:50 +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
303e5d3eb9
Merge branch 'master' into terms
...
Conflicts:
config/application.yml
lib/osm.rb
public/stylesheets/common.css
2010-05-07 22:23:20 +01:00
Tom Hughes
d50cf2b102
Preserve parameters in pagination links
2010-05-07 14:08:07 +01:00
Tom Hughes
c86e52dee9
Preserve the page number when submitting the form
2010-05-07 14:07:39 +01:00
Tom Hughes
9230721a1f
Redirect suspended users to an information page
...
If the current session is for a logged in user and that user has
been suspended then log them out and redirect them to a page
explaining that their account has been suspended.
2010-05-07 10:00:24 +01:00
Tom Hughes
7211872790
Don't try and display IP address for users without one
2010-05-07 09:29:38 +01:00
Tom Hughes
b9deb68de1
Display total user count correctly in user list
2010-05-07 09:05:55 +01:00
Tom Hughes
fc7488f28a
Link the username in the user list to their profile
2010-05-07 09:03:12 +01:00
Tom Hughes
ae8c0b3baf
Add a user list view for administrators
2010-05-06 20:55:02 +01:00
Tom Hughes
552a647810
Merge all the user status changing methods into one
2010-05-06 17:18:34 +01:00
Tom Hughes
200a1ab5c7
Show administrators the status and spam score for a user
2010-05-06 17:18:34 +01:00
Tom Hughes
5a54630b57
Add support for suspended and confirmed users
...
Replace the existing "active" and "visible" with an enumerated status
that allows for extra cases. Currently we have "suspended" for users
who hve triggered the spam detector and "confirmed" for users that have
triggered the detector but have been confirmed as vald by an admin.
2010-05-06 17:18:34 +01:00
Ævar Arnfjörð Bjarmason
c7876b4477
Runaway HTML in f28f28f24a made all the interface BOLD
2010-05-03 16:47:26 +01:00
Kai Krueger
900fdde664
Make a missing string translatable. Add a note about not needing a password with OpenID
2010-05-02 01:06:30 +01:00
Tom Hughes
c079c1f574
Improve hiding of openid field on signup screen
2010-05-01 19:18:06 +01:00
Kai Krueger
799bbc3d9f
Hide OpenID url on signup page to make it less confusing
2010-05-01 18:48:20 +01:00
Kai Krueger
6159b48b8f
Remove a superfluous styling
2010-05-01 17:55:16 +01:00
Kai Krueger
058217bc69
Add the OpenID logo to all openid url entry textfields for clarity
2010-05-01 11:25:47 +01:00
Kai Krueger
65bcddf7a1
Replaced the Google and Yahoo logos with nicer ones
2010-04-27 22:06:10 +01:00
