aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Call logger explicitly because it's not in scope hereHenare Degan2015-04-16-1/+1
| | | | | Prevents exception `undefined local variable or method 'logger' for AlaveteliTextMasker:Module` being thrown.
* Merge branch 'hotfix/0.21.0.16' into rails-3-developGareth Rees2015-04-15-26/+23
|\
| * Bump alaveteli versionhotfix/0.21.0.16Gareth Rees2015-04-15-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-15-25/+22
| |
| * Merge branch 'hotfix/0.21.0.15'0.21.0.15Gareth Rees2015-04-10-30/+30
| |\
* | | Add some notes on the ability to set production mail config.Louise Crow2015-04-14-0/+7
| | |
* | | Merge branch 'box-style' into rails-3-developLouise Crow2015-04-14-20/+16
|\ \ \
| * | | Apply box style to first describe_state_form.Louise Crow2015-04-14-1/+1
| | | |
| * | | remove stray whitespaceLuke Bacon2015-04-13-1/+0
| | | |
| * | | make box vertical and horizontal padding evenLuke Bacon2015-04-13-4/+3
| | | | | | | | | | | | | | | | | | | | Conflicts: app/assets/stylesheets/responsive/_global_layout.scss
| * | | reduce excess space above correspondence headingLuke Bacon2015-04-13-0/+1
| | | |
| * | | remove indentation of comment textLuke Bacon2015-04-13-4/+0
| | | |
| * | | replace individual padding styles with generic box classLuke Bacon2015-04-13-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on correspondence boxes, comment boxes, the state form and the "followup" notice that shared the state form styles. This makes these styles, which are meant to be consistent, easier to maintain and overrider if necessary for theme developers.
| * | | add generic style for box paddingLuke Bacon2015-04-13-0/+8
| | | |
* | | | Merge branch 'smtp-mailer-configuration' into rails-3-developLouise Crow2015-04-14-3/+51
|\ \ \ \
| * | | | Make clear that it is only the production delivery method that is being set.Louise Crow2015-04-14-6/+6
| | | | |
| * | | | Fix some typosLouise Crow2015-04-14-3/+3
| | | | |
| * | | | Make clear that SMTP mail settings are SMTP-specific.Louise Crow2015-04-14-23/+23
| | | | |
| * | | | Allow configuration for SMTP settingsCaleb2015-04-09-2/+50
| | | | |
* | | | | Merge remote-tracking branch 'openaustralia_github/request-suggestion-link' ↵Louise Crow2015-04-14-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into rails-3-develop
| * | | | | Change link to browse other requests to one that has requestsHenare Degan2015-04-14-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you're starting a request to an authority that has no existing requests we display a handy link to "Browse other requests for examples of how to word your request". However this currently sends you to a page that has no requests (a blank request search page). This change sends you to the list of successful requests as these are most likely to have wording that will help the requester.
* | | | | Merge remote-tracking branch ↵Louise Crow2015-04-13-4/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'openaustralia_github/fix-admin-public-body-edit-test' into rails-3-develop
| * | | | | Make method more conciseHenare Degan2015-04-11-4/+1
| | | | | |
| * | | | | Use symbolic operator - only use "and" for control-flowHenare Degan2015-04-11-1/+1
| | | | | |
| * | | | | Check for blank values, not just an empty stringHenare Degan2015-04-11-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On my machine the integration test "Editing a Public Body can add a translation for multiple locales" (http://git.io/vvv9t) was failing because when it submitted the form to update one locale it created empty records for all locales resulting in the test (http://git.io/vvv93) for a nil locale to fail. It was doing this because when it submitted the form it included a notes field with a single newline character and so this method evaluated as false and therefore a largely blank translation was created.
* | | | | Merge branch 'fix-xapian-spec-failures' into rails-3-developLouise Crow2015-04-13-7/+4
|\ \ \ \ \
| * | | | | Make sure xapian index is initialized before specs run.Louise Crow2015-04-13-0/+4
| | | | | |
| * | | | | Remove duplicate method.Louise Crow2015-04-13-7/+0
| |/ / / / | | | | | | | | | | | | | | | Also defined in spec/support/xapian_index.rb
* | | | | Merge remote-tracking branch 'mysociety_github/remove-extra-full-stop' into ↵Louise Crow2015-04-13-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | rails-3-develop
| * | | | | Remove extra full stop after question markHenare Degan2015-04-13-1/+1
| |/ / / / | | | | | | | | | | It looks clumsy to me and I'm pretty sure it's unnecessary.
* | | | | Merge remote-tracking branch 'openaustralia_github/remove-rspec-tags' into ↵Louise Crow2015-04-13-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | rails-3-develop
| * | | | Remove presumably accidentally committed RSpec focus tagsHenare Degan2015-04-11-4/+4
|/ / / /
* | | | Merge branch 'rails-3-develop' of ↵Louise Crow2015-04-10-30/+30
|\ \ \ \ | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ \ Merge branch 'hotfix/0.21.0.15' into rails-3-developGareth Rees2015-04-10-30/+30
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bump alaveteli versionhotfix/0.21.0.15Gareth Rees2015-04-10-1/+1
| | | | |
| | * | | Update nicaragua translationsGareth Rees2015-04-10-29/+29
| | | |/ | | |/|
* | / | New icons from @wrightmartin.Louise Crow2015-04-10-0/+0
|/ / /
* | | Merge branch 'hotfix/0.21.0.14' into rails-3-developLouise Crow2015-04-10-13/+49
|\| |
| * | Bump alaveteli version.0.21.0.14hotfix/0.21.0.14Louise Crow2015-04-10-1/+1
| | |
| * | Only use CSRF protection for logged-in users.Louise Crow2015-04-10-1/+12
| | |
| * | Add warning about updating search forms to release notes.Louise Crow2015-04-10-0/+4
| | |
| * | Use GET for search forms, not POST.Louise Crow2015-04-10-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we use global CSRF authenticity checks, searches were logging logged-in users out as the form is an HTML form, not a Rails-generated form with a CSRF token. So form submission raised an InvalidAuthenticityToken error and reset their session. We could generate the form in Rails, but we also want to minimise the number of non-logged in people who have a session cookie, so that varnish can cache pages extensively. So we don't want to put the CSRF token for the search form in everyone's session.
| * | Merge branch 'hotfix/0.21.0.13'0.21.0.13Gareth Rees2015-04-09-6/+6
| |\ \
* | \ \ Merge remote-tracking branch 'origin/issues/2268-definition-list-spacing' ↵Louise Crow2015-04-10-3/+0
|\ \ \ \ | | | | | | | | | | | | | | | into rails-3-develop
| * | | | remove para declarationMartin Wright2015-04-07-3/+0
| | | | | | | | | | | | | | | | | | | | Not needed, causing spacing problems on themes, so they just revert it anyway
* | | | | Merge branch 'hotfix/0.21.0.13' into rails-3-developGareth Rees2015-04-09-6/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bump alaveteli versionhotfix/0.21.0.13Gareth Rees2015-04-09-1/+1
| | | | |
| * | | | Update nicaragua translationsGareth Rees2015-04-09-5/+5
| | |/ / | |/| |
| * | | Merge branch 'hotfix/0.21.0.12'0.21.0.12Gareth Rees2015-04-09-13/+13
| |\ \ \
* | \ \ \ Merge branch 'hotfix/0.21.0.12' into rails-3-developGareth Rees2015-04-09-13/+13
|\ \ \ \ \ | | |/ / / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-15 01:46:09 +0000