aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'hotfix/0.11.0.14' into rails-3-developLouise Crow2013-06-19-1/+11
|\
| * Allow the HTML display of the body of an email to handle the case where the ↵0.11.0.14hotfix/0.11.0.14Louise Crow2013-06-19-1/+11
| | | | | | | | body is only quoted text and there is no subject.
* | Merge remote-tracking branch 'openaustralia_github/app_version_api_feature' ↵Louise Crow2013-06-18-1/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into rails-3-develop Conflicts: app/controllers/application_controller.rb app/controllers/general_controller.rb config/routes.rb
| * | Add publicly accesible json api to query alaveteli and ruby version. ↵Matthew Landauer2013-02-24-1/+10
| | | | | | | | | | | | Implements #834
| * | Extract methodMatthew Landauer2013-02-24-1/+6
| | |
* | | Use daemon_name as service name rather than hardcoding to give more ↵Louise Crow2013-06-18-6/+6
| | | | | | | | | | | | flexibility in running multiple instances on a server.
* | | Ignore a crontab file in the config directoryLouise Crow2013-06-18-0/+1
| | |
* | | Add a symlink to an httpd.conf file in the shared directory.Louise Crow2013-06-18-0/+1
| | |
* | | Merge branch 'hotfix/0.11.0.13' into rails-3-developLouise Crow2013-06-17-5/+33
|\ \ \ | | |/ | |/| | | | | | | Conflicts: spec/mailers/outgoing_mailer_spec.rb
| * | Explicitly set I18n.locale in set_gettext_locale in order to get Rails to ↵0.11.0.13hotfix/0.11.0.13Louise Crow2013-06-17-3/+31
| | | | | | | | | | | | expire the template cache and trigger a lookup.
| * | Fix a security vulnerability: eval used in quoting display name0.11.0.12Mark Longair2013-06-17-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This use of eval allows arbitrary remote code execution on parsing of a maliciously formed email. Two tests are updated to match the behaviour of the new code to return the display name - these introduce extra escaping, so should be innocous.
| * | Merge branch 'hotfix/0.11.0.11'Louise Crow2013-06-12-1/+1
| |\ \
* | | | Remove obsolete comment.Louise Crow2013-06-17-1/+0
| | | |
* | | | Merge branch 'feature/crontab-example' into rails-3-developLouise Crow2013-06-17-6/+6
|\ \ \ \
| * | | | Move crontab.ugly to crontab-exampleLouise Crow2013-06-12-6/+6
| | | | |
* | | | | Fix typoLouise Crow2013-06-12-1/+1
| | | | |
* | | | | Make sure raw emails are loaded before running test.Louise Crow2013-06-12-0/+4
| | | | |
* | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2013-06-12-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ \ \ Merge branch 'hotfix/0.11.0.11' into rails-3-developMark Longair2013-06-12-0/+22
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add a rake task to re-extract any missing attachmentsMark Longair2013-06-12-0/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can see the number of emails that would be reparsed by doing: bundle exec rake temp:reextract_missing_attachments To actually reparse the incoming emails and rextract attachments for any that were missing, you would do: bundle exec rake temp:reextract_missing_attachments[commit] (In fact, the 'commit' can be any non-empty string.)
* | | | | Merge branch 'hotfix/0.11.0.11' into rails-3-developLouise Crow2013-06-12-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Allow an item to have an author, not a creatorhotfix/0.11.0.11Louise Crow2013-06-12-1/+1
| |/ /
| * | Merge branch 'hotfix/0.11.0.10'Louise Crow2013-06-12-1/+1
| |\ \
* | \ \ Merge branch 'hotfix/0.11.0.10' into rails-3-developLouise Crow2013-06-12-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Now that we removed the readlink command to allow rails-post-deploy to be ↵hotfix/0.11.0.10Louise Crow2013-06-12-1/+1
| |/ / | | | | | | | | | easily run on e.g. OSX, use a relative path for the softlink.
| * | Merge branch 'hotfix/0.11.0.9'0.11.0.9Louise Crow2013-06-11-9/+7
| |\ \
* | \ \ 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
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 11:46:43 +0000