aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Allow new string to be translatedRobin Houston2012-09-28-1/+1
|
* Merge remote-tracking branch 'openaustralia/redirect_email_for_testing' into ↵Robin Houston2012-09-28-0/+35
|\ | | | | | | develop
| * override_request_email returns nil if configuration not setMatthew Landauer2012-09-27-3/+5
| |
| * When we are overriding the request emails show it just before you make a requestMatthew Landauer2012-09-27-0/+6
| |
| * Extract methodMatthew Landauer2012-09-27-4/+7
| |
| * Add option to override all public body request emailsMatthew Landauer2012-09-27-0/+24
| |
* | Wording improvementRobin Houston2012-09-28-2/+3
| | | | | | | | As suggested by @mlandauer in #641.
* | Merge remote-tracking branch 'openaustralia/themeable_suggested_summary' ↵Robin Houston2012-09-28-6/+6
|\ \ | | | | | | | | | into develop
| * | Extract partial for easy overriding in a themeMatthew Landauer2012-09-28-6/+6
| | |
* | | Remove unused partial viewsRobin Houston2012-09-28-2/+0
|/ / | | | | | | See issue #637.
* | Remove file checked in by mistake.Louise Crow2012-09-27-870/+0
| |
* | Adding memcache as a service doesn't work - back to disabling it.Louise Crow2012-09-27-1/+1
| |
* | Try adding memcache explicitly as a service.Louise Crow2012-09-27-1/+1
| |
* | Re-enable migration - it looks like the underlying bug is something to do ↵Louise Crow2012-09-27-56/+56
| | | | | | | | with interlock/memcached.
* | Use a -test extension instead of -example, and actually turn off caching ↵Louise Crow2012-09-27-1/+3
| | | | | | | | this time.
* | Try disabling caching via memcached in order to get travis builds working again.Louise Crow2012-09-27-0/+1
| |
* | Test commit to try to figure out what's wrong with the travis build - it ↵Louise Crow2012-09-27-56/+56
| | | | | | | | always fails on this migration.
* | Merge remote-tracking branch 'henare_github/public-authorities-title' into ↵Louise Crow2012-09-27-1/+1
|\ \ | | | | | | | | | develop
| * | Don't display extra hyphen in public body pageHenare Degan2012-09-27-1/+1
| |/ | | | | | | Otherwise the title is "Public authorities - - WhatDoTheyKnow"
* | Merge remote-tracking branch 'henare_github/arguable-formatting' into developLouise Crow2012-09-27-1/+1
|\ \
| * | Probably controversial but I think a full stop after a question mark looks ↵Henare Degan2012-09-27-1/+1
| |/ | | | | | | clumsy, don't you?.
* / Add spec fixtures for theme views, missing from ↵Louise Crow2012-09-27-0/+6
|/ | | | 6b6e943ab17b53ef4b20e303a079e4f4f6a0c300.
* Allow translation of 'Upload FOI response'Louise Crow2012-09-26-1/+1
|
* Allow the descriptive strings for track types to be translated.Louise Crow2012-09-26-9/+9
|
* Add a couple of email subject lines to the translations.Louise Crow2012-09-26-2/+872
|
* Merge branch 'feature/preview_emails' into developLouise Crow2012-09-26-24/+222
|\
| * Better line formatting.Louise Crow2012-09-26-5/+13
| |
| * Add a rake task to generate a file with an example of every email sent by ↵Louise Crow2012-09-26-0/+184
| | | | | | | | the application.
| * Merge branch 'develop', remote-tracking branch 'origin' into ↵Louise Crow2012-09-26-26/+292
| |\ | |/ |/| | | feature/preview_emails
* | Merge remote-tracking branch ↵Louise Crow2012-09-26-15/+5
|\ \ | | | | | | | | | 'openaustralia_github/internationalise_contact_page' into develop
| * | Internationalise the contact form by removing campaigning links and UK ↵Matthew Landauer2012-09-26-15/+5
| | | | | | | | | | | | references to data protection
* | | Merge remote-tracking branch 'openaustralia_github/configuration_patch' into ↵Louise Crow2012-09-26-0/+1
|\ \ \ | | | | | | | | | | | | develop
| * | | Added small comment for general.yml-example to help people who are starting outMatthew Landauer2012-09-26-0/+1
| |/ /
* | | Use new info_requests_count counter cache column on public body when ↵Louise Crow2012-09-26-6/+5
| | | | | | | | | | | | generating front page.
* | | Remove debug line.Louise Crow2012-09-26-1/+0
| | |
| | |
| \ \
*-. \ \ Merge branch 'feature/flexible_mail_templates', remote-tracking branch ↵Louise Crow2012-09-25-4/+278
|\ \ \ \ | | | | | | | | | | | | | | | 'origin' into develop
| | * | | Make template finding for themes work with multipart mails. Fixes #628.Louise Crow2012-09-25-3/+277
| |/ / / |/| | |
* | | | Test for the presence of the explanatory text as well when checking the ↵Louise Crow2012-09-25-1/+4
| |/ / |/| | | | | | | | response to an email to a fully closed request.
| * | Send travis errors to cron addressLouise Crow2012-09-24-1/+1
| | |
| * | Merge branch 'release/0.6.6'0.6.6Louise Crow2012-09-20-228/+899
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: locale/cs/app.po locale/es/app.po
| * | | Latest translations from Transifex.Louise Crow2012-09-19-201/+202
| | | |
| * | | Merge branch 'master', remote-tracking branch 'origin'Louise Crow2012-09-19-0/+0
| | | |
| * | | Merge branch 'hotfix/0.6.5.1'Robin Houston2012-09-07-1/+1
| |\ \ \
| | | | * Move the usage notice functions to a module so they can be used elsewhere.Louise Crow2012-09-25-22/+28
| | | | |
| | | | * Tweak to Czech date format.Louise Crow2012-09-24-2/+2
| |_|_|/ |/| | |
* | | | Tweak to translations to get initial request subject as required.Louise Crow2012-09-24-3/+3
| | | |
* | | | Use simple date format.Louise Crow2012-09-24-2/+2
| | | |
* | | | Merge remote-tracking branch 'origin/feature/create-init-files' into developLouise Crow2012-09-24-19/+108
|\ \ \ \
| * | | | Add some doc about the new rake task.Louise Crow2012-09-20-4/+7
| | | | |
| * | | | Add task config_files:convert_init_script - it does the ugly variable ↵Louise Crow2012-09-20-0/+76
| | | | | | | | | | | | | | | | | | | | replacement and uncomments the RAILS_ENV setting and exporting (substituting in the current RAILS_ENV) if there's no config/rails_env.rb