Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Don't display locale options when there's only one. | Louise Crow | 2014-06-30 | -1/+1 |
| | | | | Fixes bug introduced in 039fb5cc0f2965346ef23a4ba1b9d20f6cf73805 | |||
* | Merge branch 'issues/1415-bulk-update-public-bodies' into rails-3-develop | Gareth Rees | 2014-06-25 | -51/+25 |
|\ | ||||
| * | Move PublicBody domain logic from controller | Gareth Rees | 2014-06-06 | -2/+5 |
| | | | | | | | | | | | | Moves the magic 'site_administration' tag logic to the PublicBody model. Easier to make the string passed to `PublicBody#has_tag?` configurable if we want to allow this to be set per install. | |||
| * | Extract public body CSV export to its own class | Gareth Rees | 2014-06-06 | -50/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - SRP: Do one thing. PublicBodyCSV converts a collection of bodies in to a CSV formatted String - Adds some parenthesis around parameters in PublicBodyController#list_all_csv - Let the controller handle what records to pull out for the CSV export Arguably this doesn't really need to be anything to do with PublicBody, but it allows us to set nice defaults. | |||
| * | Remove FasterCSV dependency | Gareth Rees | 2014-06-04 | -1/+0 |
| | | | | | | | | The last remaining usage was removed in c1ee22fe | |||
* | | Handle unhelpful stemming | Gareth Rees | 2014-06-25 | -2/+10 |
| | | | | | | | | | | | | | | Stemming returns 'bore' as the word to highlight which can't be matched in the original phrase. Also removes duplicates from the results | |||
* | | Add spec for highlight_and_excerpt | Gareth Rees | 2014-06-25 | -0/+1 |
| | | ||||
* | | Use regex based highlighting | Gareth Rees | 2014-06-25 | -15/+20 |
| | | ||||
* | | Add helper to highlight and excerpt by regex | Gareth Rees | 2014-06-25 | -19/+95 |
| | | | | | | | | | | | | | | Backport of https://github.com/rails/rails/pull/11793/ Contains integration tests to check that it works as expected with ActsAsXapian. | |||
* | | Merge branch 'rails-3-develop' of ↵ | Louise Crow | 2014-06-16 | -130/+159 |
|\ \ | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop | |||
| * \ | Merge branch 'replace-xxx-todo' into rails-3-develop | Gareth Rees | 2014-06-16 | -61/+61 |
| |\ \ | ||||
| | * | | Rename XXX comments with TODO: | Gareth Rees | 2014-06-10 | -61/+61 |
| | | | | | | | | | | | | | | | | Picks these up in `rake notes` and adds semantic meaning | |||
| * | | | Merge branch 'issues/788-notification-email-cache-buster' into rails-3-develop | Gareth Rees | 2014-06-16 | -69/+98 |
| |\ \ \ | ||||
| | * | | | Remove DateTimeHelper#year_from_date | Gareth Rees | 2014-06-05 | -16/+2 |
| | | | | | | | | | | | | | | | | | | | | DateTime, Date and Time all have #year methods | |||
| | * | | | Minor tidying of DateTimeHelper and specs | Gareth Rees | 2014-06-05 | -4/+4 |
| | | | | | ||||
| | * | | | Add specs for DateTimeHelper#simple_time | Gareth Rees | 2014-06-05 | -1/+11 |
| | | | | | ||||
| | * | | | Add specs for DateTimeHelper#year_from_date | Gareth Rees | 2014-06-05 | -1/+11 |
| | | | | | ||||
| | * | | | Move date helpers to DateTimeHelper | Gareth Rees | 2014-06-05 | -62/+66 |
| | | | | | ||||
| | * | | | Remove duplication from new correspondence urls | Gareth Rees | 2014-06-05 | -12/+27 |
| | | | | | ||||
| | * | | | Add cache-busting to request response notification | Gareth Rees | 2014-06-04 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users get a new response email, click the link, but get a cached page. This is a quick fix to ensure they always see the response when clicking the link. | |||
* | | | | | Restore search term highlighting in the responsive stylesheets. | Louise Crow | 2014-06-13 | -1/+4 |
|/ / / / | ||||
* | | | | Merge branch 'hotfix/0.18.0.2' into rails-3-develop | Louise Crow | 2014-06-06 | -7/+8 |
|\ \ \ \ | |_|/ / |/| | | | ||||
| * | | | Allow a message with more than one event to be destroyed.hotfix/0.18.0.2 | Louise Crow | 2014-06-06 | -7/+8 |
| | | | | | | | | | | | | | | | | Fixes #1569 | |||
* | | | | Merge branch 'issues/1496-main-banner-cta-copy' into rails-3-develop | Gareth Rees | 2014-06-04 | -1/+1 |
|\ \ \ \ | ||||
| * | | | | Reword CTA copy on frontpage banner | Gareth Rees | 2014-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-develop | Louise Crow | 2014-06-04 | -22/+106 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||
| * | | | | Use new status icon names (with old icons) | Louise Crow | 2014-06-04 | -22/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Defining the basic css for status icons here so that themes can just set colours and add their own icons. | |||
* | | | | | Add translation to /body_statistics | Gareth Rees | 2014-06-04 | -1/+1 |
| | | | | | ||||
* | | | | | Merge branch 'issues/1315-link-to-public-body-stats' into rails-3-develop | Gareth Rees | 2014-06-04 | -1/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | Link to public body stats | Gareth Rees | 2014-06-04 | -0/+5 |
| | | | | | ||||
| * | | | | Add clarification to /body_statistics | Gareth Rees | 2014-06-04 | -0/+2 |
| | | | | | ||||
| * | | | | Use @title for /body_statistics title | Gareth Rees | 2014-06-04 | -1/+1 |
| |/ / / | | | | | | | | | | | | | Ensures other installs get the translated version. | |||
* | | / | Handle IE7 not understanding css inherit. | Louise Crow | 2014-06-04 | -0/+4 |
| |_|/ |/| | | ||||
* | | | Fix operator precedence | Louise Crow | 2014-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-develop | Louise Crow | 2014-06-02 | -0/+6 |
|\ \ \ | ||||
| * | | | Redirect to the frontpage rather than error on invalid params | Louise Crow | 2014-06-02 | -0/+6 |
| |/ / | | | | | | | | | | Fixes #1448. | |||
* | | | Merge remote-tracking branch 'origin/password-change-subject-typo' into ↵ | Louise Crow | 2014-06-02 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | rails-3-develop | |||
| * | | | Fix typo in password change email subject. | Matthew Somerville | 2014-05-30 | -1/+1 |
| |/ / | ||||
* | | | Merge branch 'issues/1497-select-authority' into rails-3-develop | Gareth Rees | 2014-06-02 | -1/+4 |
|\ \ \ | ||||
| * | | | Add link to help page from /select_authority | Gareth Rees | 2014-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-develop | Gareth Rees | 2014-06-02 | -5/+8 |
|\ \ \ | ||||
| * | | | Use each instead of for | Gareth Rees | 2014-05-23 | -2/+2 |
| | | | | ||||
| * | | | Add comma delimiters to request numbers on the front page | Gareth Rees | 2014-05-23 | -3/+6 |
| |/ / | | | | | | | Originally implemented in 67a8be372ffcbe943ce33c2e55c9a560588ef6fe but lost over time. | |||
* | | | Merge branch 'issues/1363-version-api-stats' into rails-3-develop | Gareth Rees | 2014-06-02 | -1/+3 |
|\ \ \ | ||||
| * | | | Add confirmed_user_count to /version.json | Gareth Rees | 2014-05-23 | -1/+2 |
| | | | | ||||
| * | | | Add visible_request_count to /version.json | Gareth Rees | 2014-05-23 | -1/+2 |
| |/ / | ||||
* | | | Merge branch 'admin-edit-page-buttons' into rails-3-develop | Gareth Rees | 2014-06-02 | -2/+6 |
|\ \ \ | ||||
| * | | | Emphasise the dangerous edit request actions | Gareth Rees | 2014-05-13 | -0/+4 |
| | | | | ||||
| * | | | Add button styles to admin request edit page | Gareth Rees | 2014-05-13 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | - Danger button for permenantly destroying request - Primary button for saving changes | |||
* | | | | Merge branch 'issues/1510-upload-response-typo' into rails-3-develop | Gareth Rees | 2014-06-02 | -3/+3 |
|\ \ \ \ |