aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'rails-3-develop' of ↵Louise Crow2014-06-16-233/+362
|\ | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * Fix typoGareth Rees2014-06-16-2/+2
| | | | | | | | Fixes typo in 6bd0bfe
| * Merge branch 'replace-xxx-todo' into rails-3-developGareth Rees2014-06-16-117/+117
| |\
| | * Rename XXX comments with TODO:Gareth Rees2014-06-10-117/+117
| | | | | | | | | | | | Picks these up in `rake notes` and adds semantic meaning
| * | Merge branch 'issues/788-notification-email-cache-buster' into rails-3-developGareth Rees2014-06-16-116/+245
| |\ \
| | * | Remove DateTimeHelper#year_from_dateGareth Rees2014-06-05-33/+2
| | | | | | | | | | | | | | | | DateTime, Date and Time all have #year methods
| | * | Minor tidying of DateTimeHelper and specsGareth Rees2014-06-05-8/+8
| | | |
| | * | Add specs for DateTimeHelper#simple_timeGareth Rees2014-06-05-1/+29
| | | |
| | * | Add specs for DateTimeHelper#year_from_dateGareth Rees2014-06-05-1/+27
| | | |
| | * | Move date helpers to DateTimeHelperGareth Rees2014-06-05-109/+120
| | | |
| | * | Remove duplication from new correspondence urlsGareth Rees2014-06-05-19/+42
| | | |
| | * | Add cache-busting to request response notificationGareth Rees2014-06-04-3/+75
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'feature/restore-highlight' into rails-3-developLouise Crow2014-06-16-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Restore search term highlighting in the responsive stylesheets.Louise Crow2014-06-13-1/+4
| | | |
* | | | Merge branch 'issues/1561-remove-duplicate-documentation' into rails-3-developLouise Crow2014-06-13-1130/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Update pathsLouise Crow2014-06-13-6/+6
| | | |
| * | | Remove DEPLOY.md and point to new version.Louise Crow2014-06-10-41/+1
| | | |
| * | | Removing MTA setup instructions in favour of docs.Louise Crow2014-06-09-167/+1
| | | |
| * | | Remove INSTALL.md - superceded by ↵Louise Crow2014-06-09-653/+3
| | | | | | | | | | | | | | | | http://code.alaveteli.org/installing/manual_install/
| * | | Remove translators document - duplicate of new docs.Louise Crow2014-06-09-107/+2
| | | |
| * | | Add README.md giving new docs location.Louise Crow2014-06-09-165/+5
|/ / /
* | | Merge remote-tracking branch 'origin/hotfix/0.18.0.3' into rails-3-developLouise Crow2014-06-06-0/+13
|\ \ \
| * | | Handle converting empty RTF fileshotfix/0.18.0.3Gareth Rees2014-06-06-0/+13
| | | | | | | | | | | | | | | | Fixes https://github.com/mysociety/alaveteli/issues/1563
* | | | Merge branch 'hotfix/0.18.0.2' into rails-3-developLouise Crow2014-06-06-7/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow a message with more than one event to be destroyed.hotfix/0.18.0.2Louise Crow2014-06-06-7/+26
| |/ / | | | | | | | | | Fixes #1569
* | | 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
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 08:34:17 +0000