aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'issues/1496-main-banner-cta-copy' into rails-3-developGareth Rees2014-06-04-1/+1
|\
| * Reword CTA copy on frontpage bannerGareth Rees2014-05-22-1/+1
| | | | | | | | | | In user testing no one clicked "Start Now" to make a request. All users clicked "Make a Request" in the main nav, so lets try that here.
* | Merge branch 'feature/responsive-icon-css' into rails-3-developLouise Crow2014-06-04-22/+106
|\ \
| * | Use new status icon names (with old icons)Louise Crow2014-06-04-22/+106
| | | | | | | | | | | | | | | Defining the basic css for status icons here so that themes can just set colours and add their own icons.
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-06-04-2/+9
|\ \ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | | Add translation to /body_statisticsGareth Rees2014-06-04-1/+1
| | | |
| * | | Merge branch 'issues/1315-link-to-public-body-stats' into rails-3-developGareth Rees2014-06-04-1/+8
| |\ \ \ | | |/ / | |/| |
| | * | Link to public body statsGareth Rees2014-06-04-0/+5
| | | |
| | * | Add clarification to /body_statisticsGareth Rees2014-06-04-0/+2
| | | |
| | * | Use @title for /body_statistics titleGareth Rees2014-06-04-1/+1
| | | | | | | | | | | | | | | | Ensures other installs get the translated version.
* | | | Example blog now runs over httpsLouise Crow2014-06-04-1/+1
|/ / /
* | | Handle IE7 not understanding css inherit.Louise Crow2014-06-04-0/+4
| | |
* | | Fix operator precedenceLouise Crow2014-06-02-1/+1
| | | | | | | | | | | | | | | Was switched to && for style but in fact for control flow, and is what we want.
* | | Merge branch 'issues/1448-no-error-on-spam' into rails-3-developLouise Crow2014-06-02-0/+17
|\ \ \
| * | | Redirect to the frontpage rather than error on invalid paramsLouise Crow2014-06-02-0/+17
| | | | | | | | | | | | | | | | Fixes #1448.
* | | | Don't check for Ruby 1.9 hash syntaxLouise Crow2014-06-02-0/+6
| | | | | | | | | | | | | | | | We need to be compatible with Ruby 1.8
* | | | Merge remote-tracking branch 'origin/password-change-subject-typo' into ↵Louise Crow2014-06-02-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | rails-3-develop
| * | | | Fix typo in password change email subject.Matthew Somerville2014-05-30-1/+1
| | | | |
* | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-06-02-9/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ \ \ Merge branch 'issues/476-track-things-index' into rails-3-developGareth Rees2014-06-02-0/+17
| |\ \ \ \ \
| | * | | | | Define track things constraint correctlyGareth Rees2014-05-28-0/+17
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > The constraint fk_track_request_public_body on > track_things_sent_emails is defined incorrectly, referring to user_id > rather than public_body_id. Via Robin Houston
| * | | | | Merge branch 'issues/1497-select-authority' into rails-3-developGareth Rees2014-06-02-1/+4
| |\ \ \ \ \
| | * | | | | Add link to help page from /select_authorityGareth Rees2014-06-02-1/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Only requests made using WhatDoTheyKnow are shown" might not make sense to new users of the app. This was highlighted during user testing [1]. [1] https://github.com/mysociety/alaveteli/issues/1445
| * | | | | Merge branch 'issues/914-frontpage-stats-delimiter' into rails-3-developGareth Rees2014-06-02-5/+8
| |\ \ \ \ \
| | * | | | | Use each instead of forGareth Rees2014-05-23-2/+2
| | | | | | |
| | * | | | | Add comma delimiters to request numbers on the front pageGareth Rees2014-05-23-3/+6
| | |/ / / / | | | | | | | | | | | | Originally implemented in 67a8be372ffcbe943ce33c2e55c9a560588ef6fe but lost over time.
| * | | | | Merge branch 'issues/1363-version-api-stats' into rails-3-developGareth Rees2014-06-02-1/+3
| |\ \ \ \ \
| | * | | | | Add confirmed_user_count to /version.jsonGareth Rees2014-05-23-1/+2
| | | | | | |
| | * | | | | Add visible_request_count to /version.jsonGareth Rees2014-05-23-1/+2
| | |/ / / /
| * | | | | Merge branch 'admin-edit-page-buttons' into rails-3-developGareth Rees2014-06-02-2/+6
| |\ \ \ \ \
| | * | | | | Emphasise the dangerous edit request actionsGareth Rees2014-05-13-0/+4
| | | | | | |
| | * | | | | Add button styles to admin request edit pageGareth Rees2014-05-13-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Danger button for permenantly destroying request - Primary button for saving changes
* | | | | | | Don't use the 2 space indentation rule.Louise Crow2014-06-02-0/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | Alaveteli uses 4 spaces.
* | | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-06-02-26/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ \ \ \ Merge branch 'issues/1510-upload-response-typo' into rails-3-developGareth Rees2014-06-02-3/+3
| |\ \ \ \ \ \
| | * | | | | | Fix typo on /request/upload_responseGareth Rees2014-05-23-3/+3
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a typo which cased the following to be displayed when uploading a response: Respond to the FOI request 'FOI Request'FOI User It now says (correctly): Respond to the FOI request 'FOI Request' made by FOI User Thanks to Ben Fairless for the original implementation of this commit.
| * | | | | | Merge branch 'issues/1460-search-body-by-shortname' into rails-3-developGareth Rees2014-06-02-23/+30
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Support simple searching of bodies by short_nameGareth Rees2014-05-28-4/+11
| | | | | | |
| | * | | | | Minor tidying of PublicBodyController#listGareth Rees2014-05-28-19/+19
| | | |_|/ / | | |/| | | | | | | | | Spacing, parenthesis, etc
* | | | | | Merge branch 'feature/1407-cleanup-holding-pen' into rails-3-developLouise Crow2014-06-02-0/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rake task for cleaning up holding pen eventsLouise Crow2014-06-02-0/+20
| | |_|_|/ | |/| | |
* | | | | Merge branch 'features/618-ttf-bitstream-vera' into rails-3-developLouise Crow2014-05-29-0/+3
|\ \ \ \ \
| * | | | | Add ttf-bitstream-vera to package lists.Louise Crow2014-05-22-0/+3
| |/ / / / | | | | | | | | | | | | | | | Closes #618
* | | | | Merge branch 'fix-install-typo' into rails-3-developLouise Crow2014-05-29-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix typo disable_constraints => constraint_disablingLouise Crow2014-05-29-1/+1
| |/ / / | | | | | | | | | | | | This connection param is consulted in config/initializers/alaveteli.rb to see whether to load our patch for constraint disabling from lib/no_constraint_disabling.rb
* | / / Update Gemfile.lockGareth Rees2014-05-28-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Had issues similar to: - https://github.com/bundler/bundler/issues/1375 - https://github.com/bundler/bundler/issues/1081 Was a problem with the Ubuntu packaged version of bundler. Seems to be resolved in later versions of bundler.
* | | Merge branch 'issues/1435-vagrant-docs' into rails-3-developGareth Rees2014-05-21-0/+9
|\ \ \ | |/ / |/| |
| * | Add documentation on using themes with VagrantGareth Rees2014-05-13-0/+9
| |/
* | Merge branch 'hotfix/0.18.0.1' into rails-3-developLouise Crow2014-05-15-1/+4
|\ \
| * | Add responsive assets to precompilation list0.18.0.1hotfix/0.18.0.1Louise Crow2014-05-15-1/+4
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-28 10:46:33 +0000