aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/user
Commit message (Collapse)AuthorAgeLines
* Disable profile_photo file field if user is bannedGareth Rees2015-02-24-1/+3
| | | | | | | | | | Stops the user editing their profile photo if they have been banned. https://www.righttoknow.org.au/ reported that spam accounts were being created and even though the user accounts were getting banned, the spam user/bots couls still edit the about me field to propagate more spam. This prevents the profile photo being modified so that they cannot add offensive images.
* Disable about_me text field if user is bannedGareth Rees2015-02-24-2/+6
| | | | | | | Stops the user editing their about me if they have been banned. https://www.righttoknow.org.au/ reported that spam accounts were being created and even though the user accounts were getting banned, the spam user/bots could still edit the about me field to propagate more spam.
* Add User#banned?Gareth Rees2015-02-24-1/+1
| | | | | | | - Redefined User#public_banned? to User#banned? - Add specs for User#banned? - Deprecate User#public_banned? - Replace use of User#public_banned? with User#banned?
* 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
| | | | | | | | | | | | | | | | > If you've got an account you're more invested, and likely to be logged in already This screen should be about making sign up an easier and more attractive proposition via Martin Wright (@wrightmartin)
| * 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
|/ | | | This prevents browsers from storing and filling passwords.
* User profile option to filter requests by statusGareth Rees2014-10-14-0/+3
| | | | | Filters on `latest_status` because filtering by `status` searches all states a request has ever been in.
* Remove DateTimeHelper#year_from_dateGareth Rees2014-06-05-2/+2
| | | | DateTime, Date and Time all have #year methods
* Make header_left an id, not a class.Louise Crow2014-04-24-1/+1
| | | | | I think this was a mistake, it seems to be an id in the other places it is used.
* Merge branch 'feature/1310-better-track-translation' into rails-3-developLouise Crow2014-04-04-1/+1
|\ | | | | | | | | Conflicts: spec/factories.rb
| * Move track descriptions to a helper.Louise Crow2014-03-24-1/+1
| | | | | | | | We can access url generation methods more easily here.
* | Only pass InfoRequestEvent to _request_listing_via_event templateLouise Crow2014-03-17-4/+3
|/ | | | The InfoRequest is always the one associated with the event.
* Merge branch 'feature/batch-requests' into rails-3-developLouise Crow2014-01-29-0/+11
|\ | | | | | | | | | | Conflicts: config/general.yml-example spec/factories.rb
| * Display batch requests for user on 'my requests' pageLouise Crow2013-12-04-0/+11
| | | | | | | | This is the most rudimentary possible way to give them access to the batch request urls, pending #1239
* | Merge remote-tracking branch 'origin/emergency-signin-prompt-translatable' ↵Louise Crow2014-01-27-1/+1
|\ \ | | | | | | | | | into rails-3-develop
| * | 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
| | | | | | '\' removed
| * Adding headers to wallGyörgy Peng2014-01-06-11/+14
|/ | | | | | | When a user has no activity and following nothing, his wall page contains nothing, an empty page appears. My suggestion to change the views/user/wall.html.erb: - adding headers to page with title text - adding paragraph with text "nothing to display"
* 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 ↵Louise Crow2013-05-08-1/+1
| | | | and to allow them to be replaced with suitable localised alternatives.
* Restore load of config (AlaveteliConfiguration is required in forward_on) - ↵Louise Crow2013-05-08-1/+1
| | | | update config to avoid redefinition of constant warnings.
* Merge branch 'release/0.9' into rails-3-developLouise Crow2013-04-24-13/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/public_body_controller.rb app/mailers/track_mailer.rb app/views/request/_hidden_correspondence.html.erb app/views/request/_sidebar.html.erb app/views/request/hidden.html.erb app/views/request/new_please_describe.html.erb app/views/request/preview.html.erb app/views/user/show.html.erb config/environment.rb config/routes.rb spec/controllers/public_body_controller_spec.rb
| * Merge branch 'feature/final-consistent-translation-interpolation' into developLouise Crow2013-04-16-13/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/outgoing_message.rb app/views/general/search.rhtml app/views/public_body/list.rhtml app/views/public_body/show.rhtml app/views/public_body/view_email.rhtml app/views/request/_after_actions.rhtml app/views/request/_followup.rhtml app/views/request/_sidebar.rhtml app/views/request/new.rhtml app/views/request/select_authority.rhtml app/views/request/upload_response.rhtml locale/aln/app.po locale/app.pot locale/ar/app.po locale/bs/app.po locale/ca/app.po locale/cs/app.po locale/cy/app.po locale/de/app.po locale/en/app.po locale/en_IE/app.po locale/es/app.po locale/eu/app.po locale/fr/app.po locale/gl/app.po locale/hu_HU/app.po locale/id/app.po locale/nb_NO/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sl/app.po locale/sq/app.po locale/sr@latin/app.po locale/tr/app.po locale/uk/app.po
| | * 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 ↵Matthew Landauer2013-03-28-1/+1
| | | | | | | | | | | | AlaveteliConfiguration
* | | Merge branch 'develop' into rails-3-developLouise Crow2013-03-19-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/views/admin_request/show.html.erb config/environment.rb
| * | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
| * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop Conflicts: app/controllers/admin_request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_public_body/_one_list.rhtml app/views/admin_public_body/_tags.rhtml app/views/admin_public_body/show.rhtml app/views/admin_request/show.rhtml app/views/admin_user/show.rhtml app/views/layouts/admin.rhtml app/views/public_body/show.rhtml app/views/request/new.rhtml
| | * | | Make internal links relativeMatthew Landauer2013-02-15-1/+1
| | | | |
| | * | | Inline helper methodMatthew Landauer2013-02-15-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 09:53:40 +0000