aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Correct the mutt syntax, for sending notification mails about import errors.Robin Houston2011-07-26-1/+1
| | | | Closes #90.
* added missing outgoing_messages fixture to testDavid Cabo2011-07-26-1/+1
|
* Clarify alert logic in a commentSeb Bacon2011-07-26-1/+5
|
* Don't bother stripping whitespace when checking old requests: it's an ↵Seb Bacon2011-07-26-8/+1
| | | | expensive operation with a relatively small benefit.
* catch MissingSourceFile instead of NameError when including custom states, ↵David Cabo2011-07-26-2/+2
| | | | in order to handle the case when file is not present
* ignore things in `files/`Seb Bacon2011-07-26-0/+1
|
* drop strange, stray commentRobin Houston2011-07-26-1/+0
| | | | | | Conflicts: app/models/raw_email.rb
* Drop post_redirects older than 2 months. The 6 month limit meant we had far ↵Seb Bacon2011-07-26-1/+1
| | | | too much redundant data that we were needlessly backing up.
* Avoided a repeated mention of ADMIN_BASE_URLRobin Houston2011-07-26-4/+1
|
* Add the ADMIN_BASE_URL variable to general.yml-example, and make the codeRobin Houston2011-07-26-1/+5
| | | | | treat an empty value the same as if the variable were absent (i.e. to use the default admin path).
* YAML wants a newline at the end of a fileSeb Bacon2011-07-25-1/+1
|
* Add a flag to turn off logging memory usage, as (a) this is a debug setting, ↵Seb Bacon2011-07-25-6/+17
| | | | and (b) it's not cross-platform anyway (causes issues for people developing on OS X)
* Merge branch 'master' into wdtkRobin Houston2011-07-21-7/+25
|\
| * Fix the routing so that censor rules can be edited through the admin interface.Robin Houston2011-07-21-1/+1
| |
| * Merge branch 'master' of github.com:sebbacon/alaveteliSeb Bacon2011-07-19-47/+29
| |\
| * | improve documentation of ugly filesSeb Bacon2011-07-19-6/+24
| | |
* | | Merge branch 'master' into wdtkRobin Houston2011-07-18-47/+29
|\ \ \ | | |/ | |/|
| * | Add another template hook _before_head_end, for themes to override.Robin Houston2011-07-18-47/+29
| |/
* | Merge branch 'master' into wdtkRobin Houston2011-07-17-4/+40
|\| | | | | | | | | Conflicts: config/routes.rb
| * Add a comment to the _before_body_end template, explaining that it can be ↵Robin Houston2011-07-17-1/+1
| | | | | | | | overridden in a theme for analytics
| * Merge remote branch 'origin/master'Seb Bacon2011-07-15-1/+1
| |\
| | * changed git-code to git-corevalon2011-07-14-1/+1
| | |
| * | Only prepend locales to paths when there's more than one locale to choose from.Seb Bacon2011-07-15-2/+37
| |/ | | | | | | Replaces core "locale" filter with customised one. Fixes #82
| * Merge branch 'master' of github.com:sebbacon/alaveteliSeb Bacon2011-07-14-18/+28
| |\
| * | Make test description be accurateSeb Bacon2011-07-14-1/+1
| | |
* | | Merge branch 'master' into wdtkRobin Houston2011-07-14-3/+3
|\ \ \ | | |/ | |/|
| * | The sense of the "is admin" test was accidentally reversed on the request ↵Robin Houston2011-07-14-3/+3
| | | | | | | | | | | | page template
* | | Merge branch 'master' into wdtkRobin Houston2011-07-14-2/+5
|\| |
| * | Do not specify ADMIN_BASE_URL in the example config file,Robin Houston2011-07-14-2/+5
| | | | | | | | | | | | | | | because the dynamic default value will be correct for most installations.
* | | Merge branch 'master' into wdtkRobin Houston2011-07-14-1/+1
|\| |
| * | Use the ADMIN_BASE_URL config variable if present, rather than ignoring itRobin Houston2011-07-14-1/+1
| | |
* | | Merge branch 'master' into wdtkRobin Houston2011-07-14-2/+2
|\| |
| * | 1) You can’t call an instance method from a class method (d’oh)Robin Houston2011-07-14-2/+2
| | | | | | | | | | | | | | | | | | 2) The test coverage is less good than I imagined. XXXX need test for zip file attachments
* | | Oh! Is this going to be reverted every time I merge from master? That’s ↵Robin Houston2011-07-14-1/+1
| | | | | | | | | | | | not what I hoped would happen.
* | | Merge branch 'master' into wdtkRobin Houston2011-07-14-6/+13
|\| |
| * | Reinstate the additional admin links.Robin Houston2011-07-14-5/+12
| | |
| * | That is only supposed to be disabled in the wdtk branch, not in master.Robin Houston2011-07-14-1/+1
| | |
| * | Merge branch 'master' of git@github.com:sebbacon/alaveteliRobin Houston2011-07-14-5/+54
| |\|
| * | Merge branch 'wdtk' of git@github.com:sebbacon/alaveteliRobin Houston2011-07-14-1/+1
| |\ \
* | | | Merge branch 'master' into wdtkRobin Houston2011-07-14-6/+6
|\| | |
| * | | Rationalise unholy mixture of tabs and spacesRobin Houston2011-07-14-6/+6
| | | |
* | | | Merge branch 'master' of git@github.com:sebbacon/alaveteli into wdtkRobin Houston2011-07-14-5/+54
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of github.com:sebbacon/alaveteliSeb Bacon2011-07-14-114/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/request/_request_listing_single.rhtml
| * | | | Fix bug on categorisation page that was stopping game from workingSeb Bacon2011-07-14-1/+50
| | | | |
* | | | | Merge branch 'master' into wdtkRobin Houston2011-07-14-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Putting a space before the parenthesis causes a mandatory Ruby warningRobin Houston2011-07-14-2/+2
| | |/ | |/| | | | | | | "warning: don't put space before argument parentheses"
* / | Disable the locale-specific routing, at least till it actually works.Robin Houston2011-07-13-1/+1
|/ /
* | Inconsistent whitespaceRobin Houston2011-07-13-8/+8
| |
* | Make the tests work with authenticationRobin Houston2011-07-13-1/+4
| |
* | Update commonlibRobin Houston2011-07-13-0/+0
| |