Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | | | | | Merge branch 'issues/1969-inconsistent-public-body-admin-interface' into ↵ | Gareth Rees | 2014-11-19 | -7/+16 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | rails-3-develop | ||||
| * | | | | | Remove restricton on deleting PublicBodyHeadings with associated ↵ | lizconlan | 2014-11-19 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PublicBodyCategories | ||||
| * | | | | | Fix view bug preventing PublicBodyCategories being deleted in the admin ↵ | lizconlan | 2014-11-19 | -4/+10 | |
| | |/ / / | |/| | | | | | | | | | | | | | interface | ||||
* | | | | | Remove stubs of removed method | Gareth Rees | 2014-11-18 | -5/+0 | |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | PublicBodyCategory#load_categories no longer exists, so don't try to stub it. Fixes https://github.com/mysociety/alaveteli/issues/1970 | ||||
* | | | | Use flash[:error] for error condition | Gareth Rees | 2014-11-18 | -1/+3 | |
| | | | | | | | | | | | | Also use double quotes rather than string escaping | ||||
* | | | | Add specs to cover unsuccessful creation | Gareth Rees | 2014-11-17 | -1/+12 | |
| | | | | |||||
* | | | | Add coverage to ensure ‘new’ templates are rendered | Gareth Rees | 2014-11-17 | -0/+11 | |
| | | | | |||||
* | | | | Add expectation to #index spec | Gareth Rees | 2014-11-17 | -0/+1 | |
| | | | | | | | | | | | | | | | | The spec that covers AdminPublicBodyCategoriesController#index did not have an expectation | ||||
* | | | | Redirect to #edit after updating | Gareth Rees | 2014-11-17 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | On an unsuccessful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should render the #edit action. | ||||
* | | | | Redirect to #edit after updating | Gareth Rees | 2014-11-17 | -0/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 specs | Gareth Rees | 2014-11-17 | -4/+17 | |
|/ / / | | | | | | | | | | This commit adds expectations to AdminPublicBodyCategoriesController and AdminPublicBodyHeadingsController edit actions | ||||
* | | | Merge branch 'issues/1437-apple-mail-attachment-parsing' into rails-3-develop | Gareth Rees | 2014-11-10 | -0/+13962 | |
|\ \ \ | |||||
| * | | | Add fix for Apple Mail with attachments | Gareth Rees | 2014-11-04 | -0/+13817 | |
| | | | | |||||
| * | | | Add some specs to MailBackend | Gareth Rees | 2014-11-04 | -0/+145 | |
| |/ / | |||||
* / / | Redirect /help to /help/about | Gareth Rees | 2014-11-05 | -0/+9 | |
|/ / | | | | | | | Shouldn't really 404 on an important/accessible URL | ||||
* | | Merge branch 'hotfix/0.19.0.9' into rails-3-develop | Louise Crow | 2014-10-31 | -6/+9 | |
|\| | |||||
| * | Comment out spec which sends an invalid utf-8 param.0.19.0.9hotfix/0.19.0.9 | Louise Crow | 2014-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. | ||||
* | | Merge branch 'issues/1457-close-change-request-without-email' into ↵ | Louise Crow | 2014-10-30 | -16/+26 | |
|\ \ | | | | | | | | | | rails-3-develop | ||||
| * | | Remove redirect to trailing slash URL. | Louise Crow | 2014-10-30 | -6/+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 Crow | 2014-10-30 | -10/+25 | |
| |/ | |||||
* | | Merge branch 'code_tidying' into rails-3-develop | Gareth Rees | 2014-10-29 | -0/+124 | |
|\ \ | |||||
| * | | Add ChangeEmailValidator spec | Gareth Rees | 2014-10-29 | -0/+124 | |
| | | | |||||
* | | | Merge branch 'fix_transient_locale_integration_errors' into rails-3-develop | Louise Crow | 2014-10-28 | -7/+22 | |
|\ \ \ | |/ / |/| | | |||||
| * | | Use factories, not fixtures, in integration spec. | Louise Crow | 2014-10-28 | -7/+22 | |
| | | | | | | | | | | | | Removes the dependency on fixtures having been loaded. | ||||
* | | | Merge branch 'issues/1778-send-message' into rails-3-develop | Gareth Rees | 2014-10-17 | -7/+34 | |
|\ \ \ | |||||
| * | | | Remove now-unused OutgoingMessage#send_message | Gareth Rees | 2014-10-17 | -4/+7 | |
| | | | | | | | | | | | | | | | | Models should not send emails | ||||
| * | | | Extract initial and followup sending from model | Gareth Rees | 2014-10-17 | -3/+27 | |
| | | | | |||||
* | | | | Merge branch 'spam_address_routing' into rails-3-develop | Gareth Rees | 2014-10-14 | -2/+2 | |
|\ \ \ \ | |||||
| * | | | | Add admin prefix to spam_addresses resources | Gareth Rees | 2014-10-10 | -2/+2 | |
| |/ / / | |||||
* | | | | Merge branch 'issues/1830-batch-request-user-filter' into rails-3-develop | Gareth Rees | 2014-10-14 | -2/+14 | |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | User profile option to filter requests by status | Gareth Rees | 2014-10-14 | -2/+14 | |
| |/ / | | | | | | | | | | | | | Filters on `latest_status` because filtering by `status` searches all states a request has ever been in. | ||||
* | | | Merge branch 'issues/222-category-editing-add-order-interface' into ↵ | Louise Crow | 2014-10-14 | -57/+733 | |
|\ \ \ | |/ / |/| | | | | | rails-3-develop | ||||
| * | | fixup! Use RESTful routing. | Louise Crow | 2014-10-09 | -7/+7 | |
| | | | |||||
| * | | Require heading and category in PublicBodyCategoryLink. | Louise Crow | 2014-10-09 | -1/+16 | |
| | | | | | | | | | | | | Update default factory accordingly. | ||||
| * | | fixup! Remove old PublicBodyCategories calls. | Louise Crow | 2014-10-09 | -1/+1 | |
| | | | |||||
| * | | Remove old PublicBodyCategories calls. | Louise Crow | 2014-10-09 | -1/+1 | |
| | | | | | | | | | | | | | | | Add deprecation notice to draw attention to any place where PublicBodyCategories is called from themes. | ||||
| * | | Don't migrate categories automatically. | Louise Crow | 2014-09-26 | -10/+0 | |
| | | | | | | | | | | | | | | | It becomes confusing in the test environment, better to have a clean script. | ||||
| * | | Don't require a category description | Louise Crow | 2014-09-26 | -0/+20 | |
| | | | | | | | | | | | | | | | Some existing themes don't use one for categories like 'misc' and that seems reasonable usage. Add some specs for the things we do validate. | ||||
| * | | Use RESTful routing. | Louise Crow | 2014-09-26 | -73/+74 | |
| | | | |||||
| * | | Create module to clarify what code is just for migrating from files. | Louise Crow | 2014-09-25 | -2/+2 | |
| | | | |||||
| * | | fixup! Use translation tables for PublicBodyCategory and PublicBodyHeading | Louise Crow | 2014-09-25 | -2/+2 | |
| | | | |||||
| * | | fixup! Basic category admin screen | Louise Crow | 2014-09-25 | -8/+0 | |
| | | | |||||
| * | | fixup! Replace existing PublicBodyCategories functionality with db models ↵ | Louise Crow | 2014-09-24 | -85/+101 | |
| | | | | | | | | | | | | PublicBodyCategory and PublicBodyHeading | ||||
| * | | fixup! New heading associations should be added on category create. | Louise Crow | 2014-09-24 | -7/+4 | |
| | | | |||||
| * | | fixup! Add actions for reordering public body headings and categories. | Louise Crow | 2014-09-24 | -12/+35 | |
| | | | |||||
| * | | fixup! Add actions for reordering public body headings and categories. | Louise Crow | 2014-09-24 | -20/+24 | |
| | | | |||||
| * | | fixup! Remove dependence on default public bodies. | Louise Crow | 2014-09-24 | -88/+48 | |
| | | | |||||
| * | | fixup! Validation of display order, default setting callbacks. | Louise Crow | 2014-09-24 | -44/+49 | |
| | | | |||||
| * | | New heading associations should be added on category create. | Louise Crow | 2014-09-22 | -0/+16 | |
| | | | |||||
| * | | Add actions for reordering public body headings and categories. | Louise Crow | 2014-09-22 | -1/+89 | |
| | | |