aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | | | | | | | | | | | Merge branch 'hotfix/0.20.0.3' into rails-3-developGareth Rees2015-01-15-2755/+10055
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '2051-back-to-search' into rails-3-developGareth Rees2015-01-13-0/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add a “Back to search results” linkGareth Rees2015-01-13-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the search parameters in the flash when a search is made via the select_authority_path page. Stores the parameters for both POST and AJAX typeahead searches. The presence of stored search params renders the link on the PublicBodyController#show template. “keep”s the search params in PublicBodyController#show so that if the user clicks the browser’s back button the “Back to search results” link can still be rendered on the next search result they click. “keep”s all flash keys in ServicesController#other_country_message as it’s called through AJAX and ends up sweeping the flash. [1] [1] More details about this: http://mikenaberezny.com/2007/09/08/keep-the-flash-and-test-it-too/
| | * | | | | | | | | | | | | Add basic styles for “Back to search results” linkGareth Rees2015-01-09-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be used after making a search for a public body on /select_authority
| * | | | | | | | | | | | | | Merge branch '1682-just-made-a-request' into rails-3-developGareth Rees2015-01-13-17/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Use a partial to render batch sent messageGareth Rees2015-01-13-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropped the law_used_full interpolation: So I think there are two significant bits of context here. One is that the law_used_full attribute is derived from law_used, which in turn is set on InfoRequest initialisation based on the tags applied to the public body. So different requests in a batch could have different values for law_used_full - some of them might be to bodies that only accept environmental information requests. So using the value from the batch template is not really a good proxy for the whole collection. The second is that, in any case, the distinction between the two types of request is a UK-specific feature which should be moved to the UK theme (#2085). Given these two factors, I think the cleanest thing might be to drop law_used_full from this descriptive text, and just have it say "Your requests will be sent shortly", without specifying what law will be used. – Louise Crow (@crowbot)
| | * | | | | | | | | | | | | | Use a partial to render request sent messageGareth Rees2015-01-13-7/+35
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'update_json' into rails-3-developGareth Rees2015-01-13-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update and lock json gemGareth Rees2015-01-09-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'remove-duplicate-method' into rails-3-developLouise Crow2015-01-12-10/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Remove duplicate method.Louise Crow2015-01-12-10/+0
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch '1680-sign-up-form' into rails-3-developGareth Rees2015-01-09-39/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Make sign up more prominent than sign inGareth Rees2015-01-06-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > If you've got an account you're more invested, and likely to be logged in already This screen should be about making sign up an easier and more attractive proposition via Martin Wright (@wrightmartin)
| | * | | | | | | | | | | | | | | Scope AlaveteliDsl#login fields within signup_formGareth Rees2015-01-06-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fills in the first “Your e-mail:” field it finds, which could be the sign _up_ form if the view is overridden to swap the order of the sign in and sign up forms. Also compacts a simple conditional on to one line.
| | * | | | | | | | | | | | | | | Consistent indentationGareth Rees2014-11-04-31/+30
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'gem_updates' into rails-3-developGareth Rees2015-01-09-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | bundle update recaptchaGareth Rees2015-01-06-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Update and lock pg gemGareth Rees2015-01-06-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updates pg to the latest version with 1.8.7 support - Add version specifier
| * | | | | | | | | | | | | | | | | Merge branch '2032-extract-body-show-partials' into rails-3-developGareth Rees2015-01-08-55/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Use each instead of forGareth Rees2015-01-08-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Tidy indentationGareth Rees2015-01-08-14/+14
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Extract request filter fields to a partialGareth Rees2015-01-08-59/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extracts the filters to a separate partial. - Existing layout is maintained by rendering the new filters partial in to the search form partial through a local variable.
| | * | | | | | | | | | | | | | | | Rename request_filter_form to request_search_formGareth Rees2015-01-08-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prep work to extract status filters to a new partial
| | * | | | | | | | | | | | | | | | Extract rss_feed in to its own partialGareth Rees2015-01-08-5/+9
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch '2036-translation-strings' into rails-3-developGareth Rees2015-01-07-9/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Use translatable stringsGareth Rees2015-01-07-9/+10
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make strings to be translated full sentences rather than concatenating together. See http://mysociety.github.io/internationalization.html
| * | | | | | | | | | | | | | | Merge branch '2046-norwegian-translations' into rails-3-developGareth Rees2015-01-07-749/+1501
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update language mappingsGareth Rees2015-01-06-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [11:41:15] <louise> pere: did you decide if you'd prefer "Bokmål" to "Norsk Bokmål" as the description? [11:41:51] <pere> louise: yes. pull request will show up. We go with Bokmål and Nynorsk in the web page, as it is now on <URL: URL_REDACTED>.
| | * | | | | | | | | | | | | | | Remove nb_NO (replaced by nb)Gareth Rees2015-01-06-4703/+0
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add nb localeGareth Rees2015-01-06-0/+4703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from nb_NO
| | * | | | | | | | | | | | | | | Update nb_NOGareth Rees2015-01-06-746/+1498
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'hotfix/0.20.0.2' into rails-3-developLouise Crow2015-01-07-6/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'better-apache-locale-comment' into rails-3-developLouise Crow2015-01-06-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add a bit more explanation of the locale-specific bitLouise Crow2014-12-23-1/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix assumption of current year as 2014 in holiday import specsLouise Crow2015-01-05-3/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update table attribute metadataLouise Crow2014-12-23-24/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fields have moved to different models, or exist in translation tables.
| * | | | | | | | | | | | | | | | Remove focus tagLouise Crow2014-12-23-1/+1
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Revert "Use rack-utf8_sanitizer gem"Louise Crow2014-12-22-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 45f25290e2e4a1f33ec5d3df6ecfb40300318ece. Use of the :ruby_20 platform requires bundler 1.3, which is not available on all our supported OSes as a package. See https://github.com/mysociety/alaveteli/issues/1276 for details.
| * | | | | | | | | | | | | | | Fix bad merge in 92ba5052a21519af59c2aa904e1e28d9081179fbLouise Crow2014-12-19-51/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Escape responder name before marking notice as safeLouise Crow2014-12-19-1/+52
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use mail_to helperGareth Rees2014-12-19-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Cleanup syntaxGareth Rees2014-12-19-1/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add some release notesLouise Crow2014-12-18-0/+26
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'brakeman_fixes' into rails-3-developLouise Crow2014-12-18-28/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add brakeman config and ignore filesGareth Rees2014-12-18-0/+67
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Line lengthGareth Rees2014-12-18-1/+9
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add global protect_from_forgeryGareth Rees2014-12-18-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grepping the git logs didn’t bring up a good reason for this to be excluded. Seems like it came along after the app was initially created so it never got fully added for fear of regressions. The specs pass for this commit.
| | * | | | | | | | | | | | | | | Fix Cross Site Scripting in user/_signinGareth Rees2014-12-18-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Improve InfoRequestEvent#incoming_message_selective_columns SQLGareth Rees2014-12-18-5/+4
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Improve InfoRequest.find_in_state SQLGareth Rees2014-12-18-3/+3
| | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 18:59:11 +0000