aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'hotfix/0.11.0.9' into rails-3-developLouise Crow2013-06-11-9/+7
|\
| * Only do time calculation once.hotfix/0.11.0.9Louise Crow2013-06-11-1/+2
| |
| * Get user records in batches, remove unneeded clause.Louise Crow2013-06-11-8/+5
| |
* | Merge commit '0.11.0.8' into rails-3-developLouise Crow2013-06-11-7/+4
|\|
| * Merge branch 'hotfix/0.11.0.8'0.11.0.8Louise Crow2013-06-11-7/+4
| |\
| | * Cache a user's profile photo rather than repulling it each time.hotfix/0.11.0.8Louise Crow2013-06-11-0/+1
| | |
| | * Only render the popup banner in the layout where it's actually used.Louise Crow2013-06-11-7/+3
| |/
| * Merge branch 'hotfix/0.11.0.7'Louise Crow2013-06-10-39/+69
| |\
* | | Better spec isolation - these specs require raw emails, so make sure they're ↵Louise Crow2013-06-10-0/+1
| | | | | | | | | | | | loaded.
* | | Merge branch 'hotfix/0.11.0.7' into rails-3-developLouise Crow2013-06-10-64/+106
|\ \ \ | | |/ | |/| | | | | | | Conflicts: spec/models/info_request_spec.rb
| * | Add extra debug linehotfix/0.11.0.7Louise Crow2013-06-10-0/+1
| | |
| * | Merge branch 'fix-emails-with-spaces' into hotfix/0.11.0.7Louise Crow2013-06-10-39/+68
| |\ \
| | * | Fix syntax errors, add some debug output.Louise Crow2013-06-10-8/+22
| | | |
| | * | Add a task for cleaning up user accounts that were created with a space in ↵Louise Crow2013-06-10-0/+65
| | | | | | | | | | | | | | | | the email address.
| | * | Remove old temp tasks.Louise Crow2013-06-10-50/+0
| | |/
| * / Update commonlib to get fix for email addresses with spaces in them being ↵Louise Crow2013-06-10-0/+0
| |/ | | | | | | considered valid.
| * Cope with replying to a message with a missing or empty SubjectMark Longair2013-06-07-1/+13
| | | | | | | | | | | | Conflicts: spec/models/info_request_spec.rb
| * Merge branch 'hotfix/0.11.0.4'Louise Crow2013-06-05-0/+15
| |\
* | \ Merge branch 'hotfix/0.11.0.4' into rails-3-developLouise Crow2013-06-10-4/+17
|\ \ \ | | |/ | |/|
| * | We're assuming feed urls without format suffixes should serve up atom/xml, ↵0.11.0.4hotfix/0.11.0.4Louise Crow2013-06-05-0/+15
| |/ | | | | | | so ignore any format from content negotiation in favour of that default.
| * Merge branch 'release/0.11'0.11.0.3Louise Crow2013-06-04-16489/+11776
| |\
| * \ Merge branch 'hotfix/0.9.0.6'Louise Crow2013-05-28-1/+1
| |\ \
| | * | Use class instead of type - type is removed in Ruby 1.90.9.0.6hotfix/0.9.0.6Louise Crow2013-05-28-1/+1
| |/ /
| * | Merge branch 'hotfix/0.9.0.5'0.9.0.5Louise Crow2013-05-28-4/+17
| |\ \
| | * | Return a string from user.name always to avoid any complications with other ↵hotfix/0.9.0.5Louise Crow2013-05-28-4/+17
| |/ / | | | | | | | | | functions calling gsub on the result. SafeBuffer won't work with gsub until Rails 3.2 https://github.com/rails/rails/commit/b4a6e2f8442ceda118367f9a61c38af754be1cbf
| * | Merge branch 'hotfix/0.9.0.4'Mark Longair2013-05-23-1/+1
| |\ \
| | * | Fix a typo in a view name0.9.0.4hotfix/0.9.0.4Mark Longair2013-05-23-1/+1
| |/ / | | | | | | | | | | | | | | | _path was missing from the end of admin_user_show_bounce_path which created a missing method error when viewing any user in the admin interface who had a non-empty email_bounce_message.
| * | Merge remote-tracking branch 'origin/hotfix/0.9.0.3'0.9.0.3Louise Crow2013-05-16-1/+9
| |\ \
* | | | Remove reference to incoming message from purge request test - it brings in ↵Louise Crow2013-06-07-1/+1
| | | | | | | | | | | | | | | | a requirement to have loaded the raw emails, which is tangential to what we're testing.
* | | | Replace specs that left raw email (stored in a file, so not cleaned up ↵Louise Crow2013-06-07-59/+52
| | | | | | | | | | | | | | | | automatically) in a dirty state. The functionality of the old specs is tested in spec/lib/mail_handler.rb, so remove them and add some new specs that just test the OutgoingMailer methods.
* | | | Allow the donation url to be configured. Closes #909.Louise Crow2013-06-07-2/+46
| | | |
* | | | Add some context blocks to group together tests with the same status.Louise Crow2013-06-07-57/+103
| | | |
* | | | Handle request for json for an external request. Closes #973.Louise Crow2013-06-07-1/+34
| | | |
* | | | We're assuming feed urls without format suffixes should serve up atom/xml, ↵Louise Crow2013-06-05-0/+15
| | | | | | | | | | | | | | | | so ignore any format from content negotiation in favour of that default.
* | | | Merge remote-tracking branch 'origin/themes-install-refactor' into ↵Louise Crow2013-06-05-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | rails-3-develop
| * | | | themes:install: minor refactoring of checking out a refMark Longair2013-05-24-5/+7
| | | | |
* | | | | Remove support for theme stylesheet inclusion via template deprecated in ↵Louise Crow2013-06-05-25/+7
| | | | | | | | | | | | | | | | | | | | version 0.5. Closes #972.
* | | | | No need to add the rails-3 branch now - has been merged to master.Louise Crow2013-06-05-6/+6
| | | | |
* | | | | Base the coveralls badge on the main development branch for more immediate ↵Louise Crow2013-06-04-1/+1
| | | | | | | | | | | | | | | | | | | | feedback.
* | | | | Restore coveralls config.Louise Crow2013-06-04-0/+12
| | | | |
* | | | | No need to downgrade rubygems now we're on Rails 3.Louise Crow2013-06-04-2/+0
| | | | |
* | | | | Merge branch 'release/0.11' into rails-3-developLouise Crow2013-06-04-34/+167
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Backport ruby 1.9 fix for trailing = sign in message headers from mail 2.5release/0.11Louise Crow2013-06-04-0/+16
| | | | |
| * | | | Add exim config change to upgrade notes and exim install info.0.11.0.2Louise Crow2013-06-04-5/+7
| | | | |
| * | | | Merge branch 'hotfix/0.11.0.1' into release/0.110.11.0.1Louise Crow2013-06-03-26/+130
| |\ \ \ \
| | * | | | Restore public body edit form.hotfix/0.11.0.1Louise Crow2013-06-03-1/+1
| | | | | |
| | * | | | Handle json requests for hidden info requests.Louise Crow2013-06-03-19/+51
| | | | | |
| | * | | | For non-HTML requests, just return the response code for now.Louise Crow2013-06-03-1/+21
| | | | | |
| | * | | | Replace backticks with call to exec(), the former spawns a new process, and ↵Louise Crow2013-06-03-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | the latter replaces the current process. In the daemon context we care about the process id so that calls to startstopdaemon won't spawn a new daemon.
| | * | | | Parse the 'to' address as if on a real mail to trigger quoted string encoding.Louise Crow2013-06-03-1/+19
| | | | | |