aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| | * | | | | | | | | | | Use correct paths for Editing a Public Body specGareth Rees2015-02-05-5/+5
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'hotfix/0.20.0.7' into rails-3-developLouise Crow2015-02-05-8/+23
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/initializers/alaveteli.rb
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hotfix/0.20.0.6' into rails-3-developLouise Crow2015-02-05-75/+407
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: spec/models/public_body_spec.rb
| * | | | | | | | | | | | Merge branch '2112-type-of-authority-locale' into rails-3-developGareth Rees2015-02-04-17/+123
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Use each_with_index rather than magic booleanGareth Rees2015-02-04-2/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Use map instead of creating empty arrayGareth Rees2015-02-04-3/+16
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Nicer capitalize first letter onlyGareth Rees2015-02-04-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String#capitalize downcases remaining letters, so: > 'heLLo WorLd'.capitalize # => "Hello world" Our version only works on the first character of the String, preserving the case of the rest of the String: > 'heLLo WorLd'.sub(/\S/) { |m| Unicode.upcase(m) } # => 'HeLLo WorLd' Also handle unicode.
| | * | | | | | | | | | | | Use each instead of forGareth Rees2015-01-23-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Remove home-grown Array#to_sentence dupGareth Rees2015-01-23-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - to_sentence does the same job as the removed code. - Clean up the conditional with .any? and implicit returns
| | * | | | | | | | | | | | Add PublicBody#type_of_authority specsGareth Rees2015-01-23-0/+87
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'csv-import-buttons' into rails-3-developGareth Rees2015-01-30-7/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Tidy tags section of public body csv importGareth Rees2015-01-29-6/+10
| | | | | | | | | | | | |
| | * | | | | | | | | | | Use bootstrap buttons for public body csv importGareth Rees2015-01-29-1/+6
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Success for dry run - Warning for real upload Makes it clearer that a real upload should be considered.
| * | | | | | | | | | | Merge branch 'hotfix/0.20.0.5' into rails-3-developLouise Crow2015-01-30-337/+4278
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '2082-fix-follow-wording' into rails-3-developLouise Crow2015-01-19-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add brackets to remove ambiguity about defined? argumentsLouise Crow2015-01-16-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like 'follower_count && follower_count > 0' was being interpreted as the argument to defined?, resulting in a return value of 'expression'. Closes #2082
| * | | | | | | | | | | Remove erroneous bracket introduced in ebf549a966a9c559bfa76b66f4ab86a75c2c1c92Louise Crow2015-01-16-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch '2072-gemfile-version-specifiers' into rails-3-developGareth Rees2015-01-16-90/+90
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | PedantGareth Rees2015-01-15-3/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add version specifiers to all dependenciesGareth Rees2015-01-15-87/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No version specifiers on: - newrelic_rpm: Always want the latest (monitoring service) - coveralls: Always want the latest (test coverage service)
| * | | | | | | | | | | | Merge branch 'hotfix/0.20.0.4' into rails-3-developGareth Rees2015-01-16-1/+205
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | |