aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Use two forms, one for changing the search term, and one for applying ↵hotfix/0.11.0.16Louise Crow2013-06-25-4/+11
| | | | filters to the current search term. Fixes #511.
* Remove unused method.Louise Crow2013-06-25-3/+0
|
* Remove unused code. Let's re-add it when we need it.Louise Crow2013-06-25-12/+0
|
* Latest translations pulled from Transifex.0.11.0.15hotfix/0.11.0.15Louise Crow2013-06-24-492/+3898
|
* 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.
* 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
|\
| * 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
|\
| * 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
|\
| * 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 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
|\
| * 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
|\
| * 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
|\
| * 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
| | |
| | * Fix for subject lines with invalid UTF-8 as the last characterMark Longair2013-06-03-2/+35
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to be the bug mentioned here: http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/ That explains that some versions of Iconv don't ignore invalid characters when converting to UTF-8 even with //IGNORE if that invalid character happens to be at the end of the string. In fact, as Matthew Somerville pointed out, with some versions of iconv (e.g. 1.14 on Mac OS, apparently) it's necessary to add and remove more than one space at the end, in case the first character of the byte sequence indicates a long sequence. We add and remove 4 to be on the safe side.
| * Merge branch 'release/0.11' of ↵0.11Louise Crow2013-06-03-2/+3
| |\ | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into release/0.11
| | * Merge branch 'rails-3-develop' into release/0.11Mark Longair2013-05-30-2/+3
| | |\
| | | * Merge branch 'feed-content-type' into rails-3-developMark Longair2013-05-30-1/+2
| | | |\
| | | | * Make sure Atom feeds are served with content type application/atom+xmlMark Longair2013-05-29-1/+2
| | | | | | | | | | | | | | | | | | | | Fixes #961
| | | * | Fix typo.Louise Crow2013-05-30-1/+1
| | | | |
| * | | | Bump version number.Louise Crow2013-06-03-1/+1
| |/ / /
| * | | Add note about config/httpd.confLouise Crow2013-05-30-1/+2
| | | |
| * | | Add some upgrade notes for the 0.11 release.Louise Crow2013-05-30-0/+8
| | | |
| * | | Merge branch 'rails-3-develop' into release/0.11Louise Crow2013-05-30-866/+1250
| |\| |
| | * | Update of strings for translation by running rake ↵Louise Crow2013-05-30-838/+1207
| | | | | | | | | | | | | | | | gettext:store_model_attributes, and rake gettext:find
| | * | Restore tabs to keep string for translation the same as previouslyLouise Crow2013-05-30-35/+50
| | | |
| * | | Merge branch 'release/0.11' of ↵Louise Crow2013-05-29-0/+0
| |\ \ \ | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into release/0.11
| | * \ \ Merge branch 'rails-3-develop' into release/0.11Mark Longair2013-05-29-63/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Merge in some updates to the 0.11 release, discovered on further testing on a development server with the full data set.