aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Use badge to show number of categories in headingGareth Rees2014-11-18-3/+6
| | | | | | | | | | | | The chevron didn't illustrate that the heading had any category children. The app uses the badge pattern elsewhere. Adds minor style improvements: - Pad erb tags - Use each instead of for Fixes https://github.com/mysociety/alaveteli/issues/1962
* Merge branch '1968-disable-category-tag-field' into rails-3-developGareth Rees2014-11-18-9/+16
|\
| * Disable rather than hide form fields that can’t be modifiedGareth Rees2014-11-17-9/+16
| | | | | | | | | | | | | | | | Not clear to the user why the form field is sometimes present and sometimes not present. The Category tag field may only be modified if authorities have not yet been assigned to the Category. This commit explains this and disables the field if this is true.
* | Merge branch '1977-update-categories-redirect-to-edit' into rails-3-developGareth Rees2014-11-18-10/+82
|\ \
| * | Use flash[:error] for error conditionGareth Rees2014-11-18-2/+4
| | | | | | | | | Also use double quotes rather than string escaping
| * | Add specs to cover unsuccessful creationGareth Rees2014-11-17-1/+12
| | |
| * | Add coverage to ensure ‘new’ templates are renderedGareth Rees2014-11-17-0/+11
| | |
| * | Add expectation to #index specGareth Rees2014-11-17-0/+1
| | | | | | | | | | | | The spec that covers AdminPublicBodyCategoriesController#index did not have an expectation
| * | Redirect to #edit after updatingGareth Rees2014-11-17-4/+21
| | | | | | | | | | | | | | | On an unsuccessful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should render the #edit action.
| * | Redirect to #edit after updatingGareth Rees2014-11-17-2/+19
| | | | | | | | | | | | | | | | | | | | | On a successful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should redirect to the #edit action rather than simply rendering the ‘edit’ template. Fixes https://github.com/mysociety/alaveteli/issues/1977
| * | Provide expectations for controller specsGareth Rees2014-11-17-4/+17
| |/ | | | | | | This commit adds expectations to AdminPublicBodyCategoriesController and AdminPublicBodyHeadingsController edit actions
* | Update translationsGareth Rees2014-11-18-718/+7548
| |
* | Clean translationsGareth Rees2014-11-18-50/+44
| | | | | | | | Cleans translations added in df11360
* | Update translationsGareth Rees2014-11-18-246/+256
| |
* | Update newrelic_rpmGareth Rees2014-11-18-1/+1
| |
* | Merge branch 'hotfix/0.19.0.10' into rails-3-developLouise Crow2014-11-17-26/+26
|\ \ | |/ |/|
| * Upgrade to Rails 3.2.210.19.0.10hotfix/0.19.0.10Louise Crow2014-11-17-26/+26
| | | | | | | | Provides fix for CVE-2014-7829.
* | Fix missing translation introduced in 962357cGareth Rees2014-11-12-3/+3
| | | | | | | | | | 962357c tidied the translation but left the translation call (`_()`) around the variable rather than the string literal.
* | Revert text changes in bf31b10Gareth Rees2014-11-12-2/+2
| | | | | | | | | | | | Further work on redesigning the request process [1] will reword these lines, so don't make the translators do work for no gain. [1] https://github.com/mysociety/alaveteli/issues/1526
* | Revert text changes in 8a21f27Gareth Rees2014-11-12-2/+2
| | | | | | | | | | | | | | Further work on redesigning the request process [1] will reword these lines, so don't make the translators do work for no gain. [1] https://github.com/mysociety/alaveteli/issues/1526
* | Merge branch '1433-admin-bottom-margin' into rails-3-developGareth Rees2014-11-11-1/+1
|\ \
| * | Add margin to bottom of admin viewsGareth Rees2014-11-05-1/+1
| | | | | | | | | Prevents the pagination being squashed up against the window edge
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-11-10-103/+14055
|\ \ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ Merge branch '1663-split-select-authority-page' into rails-3-developGareth Rees2014-11-10-101/+71
| |\ \ \
| | * | | Move “Can’t find an authority” to sidebarGareth Rees2014-10-30-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Move the “Can’t find an authority” actions on the /select_authority page to the right of the search results
| | * | | Improve /select_authority search boxGareth Rees2014-10-30-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make it wider - Add a placeholder - Translate placeholder and title text
| | * | | Tidy up request/select_authority.html.erbGareth Rees2014-10-30-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Align indentation - Use named path for form url - Use %Q() to avoid string escaping - Use :anchor option to link to help page section - Use symbols for form tag names
| | * | | Remove authority preview from /select_authorityGareth Rees2014-10-30-88/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking a search result now takes the user directly to the authority show page. Removes the step numbers from the headers as the show page interrupts the flow and seems pointless to add workarounds in public_body/show just for this.
| * | | | Merge branch 'issues/1437-apple-mail-attachment-parsing' into rails-3-developGareth Rees2014-11-10-2/+13970
| |\ \ \ \
| | * | | | Add fix for Apple Mail with attachments Gareth Rees2014-11-04-2/+13825
| | | | | |
| | * | | | Add some specs to MailBackendGareth Rees2014-11-04-0/+145
| | | |/ / | | |/| |
| * | | | Merge branch 'help_page_redirect' into rails-3-developGareth Rees2014-11-10-0/+14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Redirect /help to /help/aboutGareth Rees2014-11-05-0/+14
| |/ / / | | | | | | | | | | | | Shouldn't really 404 on an important/accessible URL
* | | | Merge branch 'update-compass-rails-conservatively' into rails-3-developLouise Crow2014-11-10-11/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Upgrade compass-rails to version 2.0.0Louise Crow2014-11-07-5/+5
| | | | | | | | | | | | | | | | | | | | 2.0.1 depends on sass 3.3.13 (as described here), which causes segfaults under ruby 1.8.7 on asset precompilation.
| * | | Use mysociety's version of ruby-msg.Louise Crow2014-11-06-6/+11
|/ / / | | | | | | | | | | | | | | | | | | A temporary measure until https://github.com/aquasync/ruby-msg/pull/10 can be merged. ruby-msg and sass (>=3.3) both define their own versions of OrderedHash (sass only uses its version under Ruby 1.8.7) and they conflict.
* | | Merge branch 'hotfix/0.19.0.9' into rails-3-developLouise Crow2014-10-31-478/+4347
|\ \ \ | | |/ | |/|
| * | Comment out spec which sends an invalid utf-8 param.0.19.0.9hotfix/0.19.0.9Louise Crow2014-10-31-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original error `ActionView::Template::Error` that this spec was written to represent (#1406) occurred under ruby 1.8 when the decoded non-utf-8 string was used in the locale switcher on the 'not found' error page to generate a url for the alternative locales. Under Ruby >= 1.9, the error thrown in that situation is an `invalid byte sequence in UTF-8` error, thrown in the same place - the locale switcher. However, no error seems to be thrown when the same param is used in a request in production. The upgrade to Rails 3.2.20 causes `String.split` to be called on the request path in `actionpack/lib/action_dispatch/middleware/static.rb` in order to check for attempts to access files outside the `public` directory. This means that under Ruby >= 1.9, an `invalid byte sequence in UTF-8` error will be thrown there in running this spec. I think a possible solution is to use the `rack-utf8_sanitizer` gem to provide middleware to strip invalid utf-8 from request URIs and headers before they're processed by Rails, but it's currently unclear whether that would have any undesirable side-effects.
| * | Upgrade to Rails 3.2.20 - fixes CVE-2014-7818Louise Crow2014-10-31-26/+26
| | | | | | | | | | | | Arbitrary file existence disclosure in Action Pack
| * | Results of running 'bundle update rails'Louise Crow2014-10-31-3/+3
| | |
| * | Latest translations from Transifex0.19.0.8hotfix/0.19.0.8Louise Crow2014-10-27-12/+3876
| | |
| * | Latest translations from transifex.0.19.0.7hotfix/0.19.0.7Louise Crow2014-10-24-433/+435
| | |
| * | Merge branch 'hotfix/0.19.0.6'0.19.0.6Gareth Rees2014-09-24-1/+2
| |\ \
* | \ \ Merge branch '875-remove-charities' into rails-3-developGareth Rees2014-10-30-10/+0
|\ \ \ \
| * | | | Remove WDTK-specific charity linksGareth Rees2014-10-29-10/+0
| | |_|/ | |/| | | | | | These will be moved to whatdotheyknow-theme
* | | | Merge branch 'issues/1457-close-change-request-without-email' into ↵Louise Crow2014-10-30-27/+38
|\ \ \ \ | |/ / / |/| | | | | | | rails-3-develop
| * | | Remove redirect to trailing slash URL.Louise Crow2014-10-30-13/+1
| | | | | | | | | | | | | | | | | | | | Introduced in 4f501309ade230f65f4ba45e1d0161e89587d755 but no longer needed as we don't proxy the admin interface.
| * | | Allow closure of a change request without sending an email.Louise Crow2014-10-30-14/+37
| |/ /
* | | Merge branch 'code_tidying' into rails-3-developGareth Rees2014-10-29-564/+716
|\ \ \
| * | | Remove extra newlinesGareth Rees2014-10-29-3/+0
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 16:00:08 +0000