Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'allow-custom-state-testing' into rails-3-develop | Louise Crow | 2015-02-24 | -10/+6 |
|\ | ||||
| * | Allow custom states to be tested. | Louise Crow | 2015-02-09 | -10/+6 |
| | | | | | | | | | | | | Since https://github.com/mysociety/alaveteli/commit/80ad2d4c31075ffc994e8c48ea25e6e3c486c364 no themes have been loaded by tests unless explicitly specified, so I think it's safe to remove the code added in https://github.com/mysociety/alaveteli/commit/3dfc53f6b82b3c5da79a4c710d45b859f61f4f5f | |||
* | | Merge branch '2134-fix-same-attribute-value-across-locales' into rails-3-develop | Louise Crow | 2015-02-23 | -84/+390 |
|\ \ | ||||
| * | | 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 | -91/+85 |
| | | | ||||
| * | | Use standard spacing for hashes, new lines for comments | Louise Crow | 2015-02-23 | -2/+3 |
| | | | ||||
| * | | Test localised value for import against existing localised value | Louise Crow | 2015-02-23 | -2/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||
* | | | Merge branch 'add-make-request-button-to-search-results' into rails-3-develop | Gareth Rees | 2015-02-20 | -75/+292 |
|\ \ \ | ||||
| * | | | Refactor showing the Make Request button | Gareth Rees | 2015-02-20 | -21/+98 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | | | Add a warning class for elements that need to be noticed. | Louise Crow | 2015-02-20 | -2/+2 |
| | | | | | | | | | | | | | | | | Make it a class as multiple warning elements on a page. | |||
| * | | | Put warning in the form that you actually use to make a request. | Louise Crow | 2015-02-20 | -6/+6 |
| | | | | ||||
| * | | | Show a 'make a request' button in the new request process. | Louise Crow | 2015-02-20 | -7/+13 |
| | | | | | | | | | | | | | | | | | | | | When we know the intent is to make a new request, make it possible to do straight from the list of authorities. | |||
| * | | | Move logic to model | Louise Crow | 2015-02-20 | -23/+50 |
| | | | | ||||
| * | | | Remove spec redundancy following code refactor. | Louise Crow | 2015-02-20 | -30/+31 |
| | | | | ||||
| * | | | Use correct method name in error. | Louise Crow | 2015-02-20 | -2/+2 |
| | | | | ||||
| * | | | Refactor common logic | Louise Crow | 2015-02-20 | -21/+13 |
| | | | | ||||
| * | | | Standard separation of methods. | Louise Crow | 2015-02-20 | -1/+3 |
| | | | | | | | | | | | | | | | | Comment above a method should apply to that method only | |||
| * | | | Add some specs for current behaviour | Louise Crow | 2015-02-20 | -0/+102 |
| | | | | ||||
| * | | | Use new style when we do display a request link. | Louise Crow | 2015-02-20 | -14/+15 |
| | | | | | | | | | | | | | | | | | | | | Move reasons for not having a link to a similar position to the link, after the rest of the text. | |||
| * | | | Cover both not_requestable reasons. | Louise Crow | 2015-02-20 | -2/+4 |
| | | | | ||||
| * | | | make a request button will now appear next to each authority in search ↵ | Martin Wright | 2015-02-20 | -2/+9 |
|/ / / | | | | | | | | | | results, part of #1526 | |||
* | | | Merge branch 'rails-3-develop' of ↵ | Louise Crow | 2015-02-20 | -6/+21 |
|\ \ \ | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop | |||
| * \ \ | Merge branch '2129-remember-me' into rails-3-develop | Gareth Rees | 2015-02-19 | -3/+6 |
| |\ \ \ | ||||
| | * | | | Increase target size of remember_me checkbox | Gareth Rees | 2015-02-18 | -3/+6 |
| | | | | | ||||
| * | | | | Merge branch '2101-country-specific-select-authority' into rails-3-develop | Gareth Rees | 2015-02-19 | -3/+15 |
| |\ \ \ \ | | |/ / / | |/| | | | ||||
| | * | | | Remove country-specific string | Gareth Rees | 2015-02-19 | -1/+1 |
| | | | | | ||||
| | * | | | Add AUTHORITY_MUST_RESPOND configuration option | Gareth Rees | 2015-02-19 | -2/+14 |
| | | | | | ||||
* | | | | | Merge branch 'issues/1682-redesign-final-screen' into rails-3-develop | Louise Crow | 2015-02-20 | -4/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | remove link to non-existent functionality on final screen request screen | Martin Wright | 2015-02-06 | -4/+0 |
| | | | | | ||||
* | | | | | Merge branch 'hotfix/0.20.0.14' into rails-3-develop | Louise Crow | 2015-02-16 | -3/+3 |
|\ \ \ \ \ | ||||
| * | | | | | Bump Alaveteli version.0.20.0.14hotfix/0.20.0.14 | Louise Crow | 2015-02-16 | -1/+1 |
| | | | | | | ||||
| * | | | | | Latest translations from Transifex. | Louise Crow | 2015-02-16 | -2/+2 |
| | | | | | | ||||
* | | | | | | Merge branch 'hotfix/0.20.0.13' into rails-3-develop | Louise Crow | 2015-02-16 | -81/+81 |
|\| | | | | | ||||
| * | | | | | Bump Alaveteli version number.0.20.0.13hotfix/0.20.0.13 | Louise Crow | 2015-02-16 | -1/+1 |
| | | | | | | ||||
| * | | | | | Latest translations from Transifex. | Louise Crow | 2015-02-16 | -80/+80 |
| | | | | | | ||||
* | | | | | | Merge branch 'hotfix/0.20.0.12' into rails-3-develop | Louise Crow | 2015-02-16 | -1027/+975 |
|\| | | | | | ||||
| * | | | | | Bump Alaveteli version.0.20.0.12hotfix/0.20.0.12 | Louise Crow | 2015-02-16 | -1/+1 |
| | | | | | | ||||
| * | | | | | Latest translations from Transifex. | Louise Crow | 2015-02-16 | -1026/+974 |
| | | | | | | ||||
| * | | | | | Merge branch 'hotfix/0.20.0.11'0.20.0.11 | Louise Crow | 2015-02-13 | -5/+17 |
| |\ \ \ \ \ | ||||
* | \ \ \ \ \ | Merge branch 'hotfix/0.20.0.11' into rails-3-develop | Louise Crow | 2015-02-13 | -5/+17 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| * | | | | | | Bump Alaveteli versionhotfix/0.20.0.11 | Louise Crow | 2015-02-13 | -1/+1 |
| | | | | | | | ||||
| * | | | | | | Set binary mode to false in call to pdftohtml | Louise Crow | 2015-02-13 | -4/+16 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.10'0.20.0.10 | Louise Crow | 2015-02-10 | -874/+888 |
| |\ \ \ \ \ | ||||
| * \ \ \ \ \ | Merge branch 'hotfix/0.20.0.9'0.20.0.9 | Gareth Rees | 2015-02-09 | -106/+106 |
| |\ \ \ \ \ \ | ||||
* | \ \ \ \ \ \ | Merge branch 'issues/1682-redesign-final-screen' into rails-3-develop | Gareth Rees | 2015-02-11 | -16/+127 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||
| * | | | | | | | Add sharing links. | Louise Crow | 2015-02-06 | -1/+19 |
| | | | | | | | |