aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/user
Commit message (Expand)AuthorAgeLines
* Disable profile_photo file field if user is bannedGareth Rees2015-02-24-1/+3
* Disable about_me text field if user is bannedGareth Rees2015-02-24-2/+6
* Add User#banned?Gareth Rees2015-02-24-1/+1
* Increase target size of remember_me checkboxGareth Rees2015-02-18-3/+6
* Design and wording changes to sign-in/sign-up screenMartin Wright2015-02-05-30/+30
* Merge branch '1680-sign-up-form' into rails-3-developGareth Rees2015-01-09-31/+30
|\
| * Make sign up more prominent than sign inGareth Rees2015-01-06-4/+4
| * Consistent indentationGareth Rees2014-11-04-31/+30
* | Extract rss_feed in to its own partialGareth Rees2015-01-08-0/+1
* | Merge branch 'brakeman_fixes' into rails-3-developLouise Crow2014-12-18-1/+1
|\ \
| * | Fix Cross Site Scripting in user/_signinGareth Rees2014-12-18-1/+1
| |/
* | Use RESTful routes for CRUD admin user actionsLouise Crow2014-12-18-1/+1
* | Don't allow autocomplete.Louise Crow2014-12-05-4/+4
|/
* User profile option to filter requests by statusGareth Rees2014-10-14-0/+3
* Remove DateTimeHelper#year_from_dateGareth Rees2014-06-05-2/+2
* Make header_left an id, not a class.Louise Crow2014-04-24-1/+1
* Merge branch 'feature/1310-better-track-translation' into rails-3-developLouise Crow2014-04-04-1/+1
|\
| * Move track descriptions to a helper.Louise Crow2014-03-24-1/+1
* | Only pass InfoRequestEvent to _request_listing_via_event templateLouise Crow2014-03-17-4/+3
|/
* Merge branch 'feature/batch-requests' into rails-3-developLouise Crow2014-01-29-0/+11
|\
| * Display batch requests for user on 'my requests' pageLouise Crow2013-12-04-0/+11
* | Merge remote-tracking branch 'origin/emergency-signin-prompt-translatable' in...Louise Crow2014-01-27-1/+1
|\ \
| * | Make the "emergency user" sign-in prompt translatableMark Longair2014-01-03-1/+1
| |/
* | Merge branch 'atlatszo_dev' into rails-3-developLouise Crow2014-01-09-11/+14
|\ \ | |/ |/|
| * Update wall.html.erbGyörgy Peng2014-01-06-1/+1
| * Adding headers to wallGyörgy Peng2014-01-06-11/+14
|/
* Fix links to /images to use image_tag insteadMark Longair2013-11-19-1/+1
* Move angle brackets to within translation string to avoid double escaping and...Louise Crow2013-05-08-1/+1
* Restore load of config (AlaveteliConfiguration is required in forward_on) - u...Louise Crow2013-05-08-1/+1
* Merge branch 'release/0.9' into rails-3-developLouise Crow2013-04-24-13/+13
|\
| * Merge branch 'feature/final-consistent-translation-interpolation' into developLouise Crow2013-04-16-13/+13
| |\
| | * Replace %s with {{}} in translations.Louise Crow2013-04-10-3/+3
| | * Replace %s with {{}} in translation.Louise Crow2013-04-10-1/+1
| | * Replace %s with {{}} in translation.Louise Crow2013-04-10-1/+1
| | * Replace %s with {{}} in translation.Louise Crow2013-04-10-2/+2
| | * Replace %s with {{}} in translation.Louise Crow2013-04-10-1/+1
| | * In translation strings replace %d with {{}} formattingMatthew Landauer2013-04-09-1/+1
| | * In translation strings replace %d with {{}} formattingMatthew Landauer2013-04-09-1/+1
| | * In translation strings replace %d with {{}} formattingMatthew Landauer2013-04-09-1/+1
| | * In translation strings replace %d with {{}} formattingMatthew Landauer2013-04-09-1/+1
| | * Use {{}} instead of %s in url string interpolation.Louise Crow2013-04-09-4/+4
* | | The configuration class was previously renamed from Configuration to Alavetel...Matthew Landauer2013-03-28-1/+1
* | | Merge branch 'develop' into rails-3-developLouise Crow2013-03-19-1/+3
|\| |
| * | Allow the emergency user account to be disabled.Louise Crow2013-03-19-1/+3
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-15/+15
|\| |
| * | Merge remote-tracking branch 'vjpr_github/fix-signup-chrome' into developLouise Crow2013-03-08-3/+3
| |\ \
| | * | Disable auto-complete for signup fields to fix a bug with Chrome auto-filling.Vaughan Rouesnel2012-11-18-3/+3
| * | | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ...Louise Crow2013-03-06-11/+11
| |\ \ \
| | * | | Make internal links relativeMatthew Landauer2013-02-15-1/+1
| | * | | Inline helper methodMatthew Landauer2013-02-15-1/+1