Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'hotfix/0.21.0.6'0.21.0.6 | Louise Crow | 2015-04-07 | -1/+1 |
|\ | | | | | | | | | Conflicts: config/initializers/alaveteli.rb | |||
| * | Fix failure to capitalise when non category tag precedes categories. | Louise Crow | 2015-04-07 | -1/+1 |
| | | | | | | | | Thanks to @RichardTaylor for reporting. | |||
* | | Limit the number of pages of requests shown for public bodies. | Louise Crow | 2015-04-07 | -0/+7 |
|/ | | | | Needs to be restored as part of https://github.com/mysociety/alaveteli/issues/2137. | |||
* | Handle the expected case where conversion fails and returns nil. | Louise Crow | 2015-04-02 | -0/+5 |
| | ||||
* | Merge branch 'add-frontpage-autodetect-feed' into rails-3-develop | Louise Crow | 2015-03-26 | -0/+8 |
|\ | ||||
| * | Add an autodetect feed for the frontpage list of requests | Louise Crow | 2015-03-19 | -0/+8 |
| | | | | | | | | Closes Â#434. | |||
* | | Merge branch '1472-simpler-external-process-management' into rails-3-develop | Louise Crow | 2015-03-24 | -7/+8 |
|\ \ | ||||
| * | | Set options via options hash only. | Louise Crow | 2015-03-23 | -7/+8 |
| | | | ||||
* | | | Fix translating Public Body Headings | Gareth Rees | 2015-03-18 | -106/+577 |
| | | | | | | | | | | | | | | | Fixes submission of form containing both existing and new translations | |||
* | | | Fix translating Public Body Categories | Gareth Rees | 2015-03-18 | -136/+763 |
| | | | ||||
* | | | Fix translating Public Bodies | Gareth Rees | 2015-03-18 | -298/+432 |
| |/ |/| | ||||
* | | Merge branch '59-localised-authority-links' into rails-3-develop | Louise Crow | 2015-03-05 | -108/+93 |
|\ \ | | | | | | | | | | | | | Conflicts: app/views/public_body/show.html.erb | |||
| * | | Use routing helper to generate localised urls. | Louise Crow | 2015-03-05 | -73/+93 |
| | | | ||||
| * | | Remove 'html' param. | Louise Crow | 2015-03-05 | -43/+8 |
| | | | | | | | | | | | | | | | There's only one call to this function in the rest of the code. That has 'html' set to true. | |||
* | | | Merge branch 'remove-public-body-categories' into rails-3-develop | Louise Crow | 2015-03-05 | -49/+0 |
|\ \ \ | ||||
| * | | | Remove deprecated code. Fixes #2015. | Louise Crow | 2015-02-26 | -49/+0 |
| |/ / | ||||
* | | | Exclude .bundle from coverage reports. | Louise Crow | 2015-03-02 | -0/+1 |
| | | | ||||
* | | | Remove specs for charity links | Gareth Rees | 2015-03-02 | -32/+0 |
| | | | | | | | | | | | | | | | This functionality has been moved to whatdotheyknow-theme: https://github.com/mysociety/whatdotheyknow-theme/commit/963d1453e94056eaf6f93a4f73a1f348a0817656 | |||
* | | | Fix body/show view spec after rewording | Gareth Rees | 2015-03-02 | -1/+1 |
|/ / | ||||
* | | Fully prevent banned users editing their photo | Gareth Rees | 2015-02-24 | -0/+28 |
| | | ||||
* | | Fully prevent banned users editing their about_me | Gareth Rees | 2015-02-24 | -0/+29 |
| | | ||||
* | | Add specs to AboutMeValidator | Gareth Rees | 2015-02-24 | -0/+53 |
| | | ||||
* | | Add User#banned? | Gareth Rees | 2015-02-24 | -0/+18 |
| | | | | | | | | | | | | | | - Redefined User#public_banned? to User#banned? - Add specs for User#banned? - Deprecate User#public_banned? - Replace use of User#public_banned? with User#banned? | |||
* | | Merge branch '2134-fix-same-attribute-value-across-locales' into rails-3-develop | Louise Crow | 2015-02-23 | -4/+291 |
|\ \ | ||||
| * | | Use before methods for object setup, model existing behaviour. | Louise Crow | 2015-02-23 | -50/+16 |
| | | | | | | | | | | | | | | | Existing behaviour seems to be that when a tag is specified, only bodies that already have that tag will be updated. | |||
| * | | Create bodies in before call. | Louise Crow | 2015-02-23 | -19/+25 |
| | | | ||||
| * | | Include tag_string from csv in tags expected. | Louise Crow | 2015-02-23 | -2/+2 |
| | | | | | | | | | | | | | | | As I understand it, the expectation is to replace any existing tags with both the tag from the UI and the tags from the csv. | |||
| * | | Comprehensive specs for CSV Import tag_string field | Gareth Rees | 2015-02-23 | -0/+297 |
| | | | ||||
| * | | Give example csv file .csv extension | Louise Crow | 2015-02-23 | -2/+2 |
| | | | ||||
| * | | Refactor massive import method into smaller instance level methods | Louise Crow | 2015-02-23 | -2/+2 |
| | | | ||||
| * | | Test localised value for import against existing localised value | Louise Crow | 2015-02-23 | -0/+18 |
| |/ | | | | | | | | | | | | | | | | | Previously the call to public_body.send would return the value for the default locale if no value was set in the current locale, meaning that translations for attributes that were the same as the attribute values in the default locale were not being loaded. Fixes #2134. | |||
* | | Refactor showing the Make Request button | Gareth Rees | 2015-02-20 | -0/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code here was hard to follow. Now we have a cleaner path to decide whether to show the Make Request button or not. - Always show any notes associated with the body - If a request can be made to the body - Show any tag-specific notes that may affect the request - Show the Make Request button - If a request cannot be made to the body - Show the most relevant reason why a request cannot be made Added PublicBodyHelper#public_body_not_requestable_reasons to extract the logic of finding the reason a user can’t request out of the template | |||
* | | Move logic to model | Louise Crow | 2015-02-20 | -10/+33 |
| | | ||||
* | | Remove spec redundancy following code refactor. | Louise Crow | 2015-02-20 | -30/+31 |
| | | ||||
* | | Use correct method name in error. | Louise Crow | 2015-02-20 | -1/+1 |
| | | ||||
* | | Refactor common logic | Louise Crow | 2015-02-20 | -6/+6 |
| | | ||||
* | | Add some specs for current behaviour | Louise Crow | 2015-02-20 | -0/+102 |
| | | ||||
* | | Merge branch 'hotfix/0.20.0.11' into rails-3-develop | Louise Crow | 2015-02-13 | -2/+15 |
|\ \ | ||||
| * | | Set binary mode to false in call to pdftohtml | Louise Crow | 2015-02-13 | -2/+15 |
| | | | | | | | | | | | | | | | We want the HTML to be encoding in the default encoding so that it can be combined with other strings. | |||
| * | | Merge branch 'hotfix/0.20.0.7'0.20.0.7 | Louise Crow | 2015-02-05 | -0/+6 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: config/initializers/alaveteli.rb | |||
* | \ \ | Merge branch 'issues/1680-changes-to-signin-signup-screen' into rails-3-develop | Gareth Rees | 2015-02-05 | -1/+1 |
|\ \ \ \ | ||||
| * | | | | Design and wording changes to sign-in/sign-up screen | Martin Wright | 2015-02-05 | -1/+1 |
| | | | | | ||||
* | | | | | Use correct paths for Editing a Public Body spec | Gareth Rees | 2015-02-05 | -5/+5 |
| | | | | | ||||
* | | | | | Merge branch 'hotfix/0.20.0.7' into rails-3-develop | Louise Crow | 2015-02-05 | -0/+6 |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Conflicts: config/initializers/alaveteli.rb | |||
| * | | | | Do not allow requests for search results after the first 500 | Louise Crow | 2015-02-03 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pages for these search results are extremely slow to load. This is not an ideal solution by any means. Really we want to dig into why high offsets are so slow, and whether there's anything we can do to fix that. | |||
* | | | | | Merge branch 'hotfix/0.20.0.6' into rails-3-develop | Louise Crow | 2015-02-05 | -12/+311 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | Conflicts: spec/models/public_body_spec.rb | |||
| * | | | Build available locales in the controller | Gareth Rees | 2015-02-03 | -81/+32 |
| | | | | | | | | | | | | | | | | | | | | Removes logic from views and obsoletes AdminPublicBodyHelper#public_body_form_object | |||
| * | | | Fix submission of form containing both existing and new translations | Louise Crow | 2015-02-03 | -74/+75 |
| | | | | ||||
| * | | | Add AdminPublicBodyController#update specs | Gareth Rees | 2015-02-03 | -0/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Covers core functionality. Could do with extracting multiple assertions in to individual specs. Strange that you need to call `reload` on the PublicBody instance when testing “updates an existing translation and adds a third translation” | |||
| * | | | Add specs for PublicBody#translated_versions= | Gareth Rees | 2015-01-30 | -0/+110 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes #empty_translation? to check for String and Symbol keys named 'locale'. Specs use a pre-change check to assert difference. For some reason rspec change matcher fails with 'nil is not a symbol'. |