aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/user_controller.rb
Commit message (Collapse)AuthorAgeLines
* Remove trailing whitespace (to make a cleaner forthcoming merge with ↵Seb Bacon2012-05-15-7/+7
| | | | wombleton:feature/440_sparkly_admin_css)
* Fix the "log in as" functionRobin Houston2012-03-20-1/+1
| | | | | | | | | | | | | | | Previously the "log in as" function after 3b6e5a692b852a88f55b21a7210f60a6f7cfc24b would attempt to log the admin user out before issuing the redirect. Unfortunately this approach does not work on WhatDoTheyKnow, where the admin pages are served via a different domain (secure.mysociety.org) and so do not share session information with the rest of the site. This commit changes it to mark the PostRedirect with circumstance == "login_as", which signals the user controller to log out the previous user even if they are an admin. In other words, the user is logged out on the main site rather than the admin site, skirting this problem. Closes #450.
* Let admin users use auto-login URLsRobin Houston2012-02-06-3/+5
| | | | | | Don't change logged-in user from an admin when visiting a auto-login URL. Closes #306.
* Return a 404 for missing user profile pictures. Fixes #363Seb Bacon2012-01-24-1/+2
|
* Don't give an error to users with an invalid postredirect token. Closes #334.Seb Bacon2012-01-11-2/+4
|
* Reintroduce a "my requests" link. Fixes #289.Seb Bacon2012-01-02-23/+35
|
* Merge branch 'develop' of github.com:sebbacon/alaveteli into developDavid Cabo2011-09-03-3/+10
|\
| * Provide a search function on the user profile pages. Closes #138.Seb Bacon2011-09-01-3/+10
| |
* | Merge branch 'asktheeu-new-design' into develop (update New Request workflow ↵David Cabo2011-09-01-1/+17
|\ \ | |/ |/| | | to match new wireframes)
| * Move log-in point to before Preview and fix modal sign-in and sign-up redirectsDavid Cabo2011-08-11-3/+6
| |
| * Select layout for User controller (modal/non-modal) using Rails baked-in ↵David Cabo2011-08-10-13/+13
| | | | | | | | mechanism, much cleaner and robust
| * New Request wireframe: implemente modal sign-in processDavid Cabo2011-08-02-5/+18
| |
| * Add cache headers to various pages (in three categories: short, medium, and ↵Seb Bacon2011-07-25-0/+1
| | | | | | | | long).
* | ensure recaptcha appears on register form, and move to end of formSeb Bacon2011-08-30-1/+1
| |
* | Merge branch 'develop' into feature/add-recaptchaSeb Bacon2011-08-30-3/+2
|\ \
| * | Additional changes omitted from commit ↵Seb Bacon2011-08-30-3/+2
| | | | | | | | | | | | 9d8388c03d0faeaca29d233a340c58bd65f28a97 (distinguish 404s and 500s), fixes #161.
* | | Present a reCaptcha on the signup form to foreign visitors (judging from ↵Seb Bacon2011-08-30-2/+7
|/ / | | | | | | their IP address). Fixes #157 (at least as a starter).
* / Add cache headers to various pages (in three categories: short, medium, and ↵Seb Bacon2011-07-26-0/+1
|/ | | | long).
* initial merge of Kosovan branch; still need to get tests passing, factor out ↵Seb Bacon2011-07-06-26/+26
|\ | | | | | | Kosovan-specific code
| * I18n string for controllersFaton Selishta2011-06-30-26/+26
| |
* | Don't store passwords in post_params.Louise Crow2011-05-16-3/+12
|/
* Add CSRF protection on state changing actions. Use default handler ↵Louise Crow2011-02-28-14/+21
| | | | handle_unverified_request which clears session.
* Factor out some of the JSON generationFrancis Irving2010-10-20-11/+1
|
* Link to Atom JSON equivalents in HTTP header. Document.Francis Irving2010-10-09-1/+1
|
* JSON for user pages.Francis Irving2010-10-09-0/+16
|
* Cross advertise about text and photo when you edit oneFrancis Irving2010-08-19-4/+17
|
* Fix up error handling.Francis Irving2010-07-20-5/+0
|
* Clear profile photo only in POSTFrancis Irving2010-07-20-0/+4
|
* Button for users to clear their profile photo.Francis Irving2010-07-20-0/+16
|
* Editable about me textFrancis Irving2010-07-18-0/+28
|
* Make profile photo upload work without javascript (for Matthew :)Francis Irving2010-07-15-0/+10
|
* Make cropping workFrancis Irving2010-07-15-1/+5
|
* Draft stageFrancis Irving2010-07-15-22/+36
|
* Show photo on profile pageFrancis Irving2010-07-14-0/+13
|
* Rename action to say it is setting photoFrancis Irving2010-07-14-1/+1
|
* Merge branch 'master' into francis-profile-photoFrancis Irving2010-07-13-18/+81
|\ | | | | | | | | | | | | Conflicts: app/views/user/show.rhtml commonlib spec/controllers/user_controller_spec.rb
| * Note on privacyFrancis Irving2010-03-10-0/+6
| |
| * Only change email address when they confirm the email, so there is noFrancis Irving2010-03-10-21/+39
| | | | | | | | security leak that someone is registered with an email
| * Use bob instead of silly as test user. Make it behave better if existingFrancis Irving2010-03-10-1/+6
| | | | | | | | email changed to.
| * Form for changing your email addressFrancis Irving2010-03-10-1/+35
| |
| * Rename signchange to signchangepasswordFrancis Irving2010-03-10-17/+17
| |
* | Basic form bits for profile photo (done on train over the weekend)Francis Irving2010-02-01-36/+36
| |
* | Part of profile photoFrancis Irving2009-11-01-5/+36
|/
* Make it show same name users where only case differs.francis2009-09-17-2/+2
|
* Don't allow numeric only URL names.francis2009-09-07-3/+3
| | | | Test the URL name code a bit.
* Do permanent redirects so old URLs aren't used.francis2009-09-02-2/+2
|
* Set cookie if it isn't set by sign in page.francis2009-08-19-1/+12
| | | | Improve text when cookies not working.
* Some (as yet unused) profile photo code done on a whim on the train while itfrancis2009-08-05-1/+7
| | | | was my birthday.
* Empty list of updates if not logged intony2009-04-23-2/+2
|
* First pass at 'river of news' style listing of what's been happeningtony2009-04-14-1/+7
| | | | with things you're tracking.