aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/user.rb
Commit message (Collapse)AuthorAgeLines
* Merge branch 'develop' into rails-3-spikeHenare Degan2013-02-15-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/general_controller.rb app/controllers/track_controller.rb app/models/outgoing_message.rb app/models/public_body.rb app/models/user.rb app/views/general/frontpage.rhtml config/environment.rb config/initializers/inflections.rb config/initializers/mime_types.rb db/migrate/094_remove_old_tags_foreign_key.rb lib/timezone_fixes.rb spec/models/request_mailer_spec.rb spec/views/request/list.rhtml_spec.rb
| * Don't escape links that are automatically added in user biosMatthew Landauer2013-02-11-1/+2
| |
| * User model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-9/+11
| |
* | Merge branch 'i18n_rails3_preparation' into rails-3-spikeMatthew Landauer2013-01-31-6/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/general_controller.rb app/controllers/public_body_controller.rb spec/controllers/public_body_controller_spec.rb
| * | Small refactorMatthew Landauer2013-01-17-6/+1
| |/
* | Errors#add_to_base(msg) has been deprecated, use Errors#add(:base, msg) insteadHenare Degan2012-12-12-2/+2
| |
* | Overwriting validate in your models has been deprecatedHenare Degan2012-12-12-9/+11
| |
* | Method-style callbacks are deprecated for after_initializeHenare Degan2012-12-11-11/+14
|/
* Move address_from_name_and_email to mail handler.Louise Crow2012-11-15-1/+1
|
* Given that MAX_REQUESTS_PER_USER_PER_DAY is documented as an optional ↵Louise Crow2012-10-25-1/+1
| | | | variable, but that commonlib/rblib/config.rb does not allow nil defaults, replace nil value clause (which can never be reached) with blank value condition(blank now returned by default by lib/configuation.rb)
* Extract method for finding whether user is a superuserMatthew Landauer2012-10-18-3/+8
|
* Extract configuration with defaults into one moduleMatthew Landauer2012-09-25-9/+6
|
* Add an option to disable comments on a requestRobin Houston2012-09-19-7/+1
| | | | Closes #30.
* WIP new requests feedRobin Houston2012-07-04-3/+0
|
* Only invalidate a user's cached requests when their *name* changes. ↵Seb Bacon2012-06-20-2/+3
| | | | Otherwise we issue PURGEs every time, for example, we send out email alerts.
* Return column name when iterating over admin fields.Seb Bacon2012-06-12-1/+1
|
* Further annotation correctionsSeb Bacon2012-05-24-25/+26
|
* Re-annotate modelsSeb Bacon2012-05-24-24/+26
|
* Merge from wombleton:feature/440_sparkly_admin_cssSeb Bacon2012-05-23-1/+11
| | | | | | | Includes a couple of additional fixes: * Remember to HTML-quote things that could come from users * Fix form post action for editing users
* Remove trailing whitespace (to make a cleaner forthcoming merge with ↵Seb Bacon2012-05-15-26/+26
| | | | wombleton:feature/440_sparkly_admin_css)
* first stab at sending PURGE requests to upstream varnish for request pages. ↵Seb Bacon2012-03-13-0/+7
| | | | Next step: making it asynchronous, e.g. with a queue of things to purge via a cron job.
* Don’t index unconfirmed usersRobin Houston2012-02-06-1/+6
| | | | Closes #415.
* Let admin users use auto-login URLsRobin Houston2012-02-06-0/+6
| | | | | | Don't change logged-in user from an admin when visiting a auto-login URL. Closes #306.
* Change wording of rate-limited pageRobin Houston2012-02-05-0/+10
| | | | | Include information about what the per-day limit is, and when the user can next make a request. Fixes #412.
* Change (Banned) to (Account suspended)Robin Houston2012-01-31-1/+1
| | | | | | | | When a user account has been suspended, we write (Banned) after their user name. But sometimes we need to suspend accounts temporarily, such as pending the result of a discussion, and it is misleading to write (Banned) in such cases; so let’s change it to (Account suspended) instead.
* Rate limitingRobin Houston2012-01-29-3/+19
| | | | | | Add the capability to specify a limit to the number of requests a user can make per day, which can be turned off for specific users in the admin interface.
* Ensure model schema documentation is up to date.Seb Bacon2012-01-09-3/+4
|
* Merge branch 'wdtk' into developRobin Houston2011-09-08-3/+27
|\ | | | | | | | | | | Conflicts: config/general.yml-example spec/models/track_mailer_spec.rb
| * Fix User.should_be_emailed?Robin Houston2011-09-08-8/+10
| | | | | | | | | | The User.should_be_emailed? method needs to be public. It should also be tested.
| * Fix “email bounced” recordingRobin Houston2011-09-07-8/+8
| | | | | | | | | | Add tests for the User.record_bounce_for_email method and (not coincidentally) make it actually work.
| * Change the type of User.email_bounce_message to :text, because weRobin Houston2011-09-07-1/+1
| | | | | | | | are storing the entire bounce email in there now.
| * Record bouncesRobin Houston2011-09-07-0/+22
| | | | | | | | | | | | Add information to the users model recording whether email to a user has bounced hard (meaning we should not try to send further messages to that email address).
* | Store user's locale against profile, so we can send them localised track ↵Seb Bacon2011-09-03-0/+9
|/ | | | emails. Also internationalize more strings at the same time. Fixes #163.
* User's display name should indicate if they've been banned. Fixes #100.Seb Bacon2011-08-01-0/+3
|
* Changes required to get selishta (Kosovo) fork merges to pass tests. ↵Seb Bacon2011-07-06-1/+1
| | | | Includes new "REPLY_LATE_AFTER_DAYS" config option.
* I18n string for modelsFaton Selishta2011-06-30-8/+8
|
* Add explicit error messages for the validations that were using defaults.Louise Crow2011-02-24-1/+1
|
* Updating validations so that none expect automatic interpolation of the ↵Louise Crow2011-02-24-6/+6
| | | | attribute.
* Factor out some of the JSON generationFrancis Irving2010-10-20-0/+11
|
* Annotate models.Francis Irving2010-10-09-1/+1
|
* Update model annotations.Francis Irving2010-09-15-1/+1
|
* Do censoring of whole users if the rules are there.Francis Irving2010-08-04-0/+1
|
* Update model annotations.Francis Irving2010-07-27-1/+2
|
* Show ban text in public.Francis Irving2010-07-25-3/+1
|
* Show banned in public.Francis Irving2010-07-20-0/+7
|
* Search index about me text, and tests to check that worksFrancis Irving2010-07-18-1/+1
|
* Editable about me textFrancis Irving2010-07-18-0/+12
|
* Add specific draft attribute.Francis Irving2010-07-15-1/+1
|
* Update model annotations.Francis Irving2010-07-15-2/+1
|
* Get key dependency right. Test for draft pictures.Francis Irving2010-07-15-9/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-22 20:24:53 +0000