aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | | | | | | Merge branch 'release/0.11' of ↵0.11Louise Crow2013-06-03-2/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into release/0.11
| | * \ \ \ \ \ \ \ Merge branch 'rails-3-develop' into release/0.11Mark Longair2013-05-30-2/+3
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Bump version number.Louise Crow2013-06-03-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Add note about config/httpd.confLouise Crow2013-05-30-1/+2
| | | | | | | | | |
| * | | | | | | | | Add some upgrade notes for the 0.11 release.Louise Crow2013-05-30-0/+8
| | | | | | | | | |
| * | | | | | | | | Merge branch 'rails-3-develop' into release/0.11Louise Crow2013-05-30-866/+1250
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'release/0.11' of ↵Louise Crow2013-05-29-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into release/0.11
| | * \ \ \ \ \ \ \ \ \ Merge branch 'rails-3-develop' into release/0.11Mark Longair2013-05-29-63/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge in some updates to the 0.11 release, discovered on further testing on a development server with the full data set.
| * | \ \ \ \ \ \ \ \ \ \ Merge branch 'rails-3-develop' into release/0.11Louise Crow2013-05-29-87/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'rails-3-develop' into release/0.11Louise Crow2013-05-29-10/+62
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Only load commonlib spec file in the test environmentLouise Crow2013-05-28-1/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | We no longer run HTML validation as part of the test suite.Louise Crow2013-06-04-2/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'openaustralia_github/development-setup' into ↵Louise Crow2013-06-04-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails-3-develop
| * | | | | | | | | | | | | | Add HTML validator to list of packagesHenare Degan2013-03-14-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add a list of packages you need to install on a fresh Ubuntu development machineHenare Degan2013-03-11-0/+9
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge remote-tracking branch ↵Louise Crow2013-06-04-113/+240
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/more_info_on_report_request' into rails-3-develop
| * | | | | | | | | | | | | | | User needs to choose a reasonMatthew Landauer2013-03-22-11/+29
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Reasons that request can be reported now stored in modelMatthew Landauer2013-03-22-2/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Simplify a couple of routes using resourcesMatthew Landauer2013-03-22-2/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rename parameter used in routes and controllerMatthew Landauer2013-03-22-15/+15
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rename controller actionsMatthew Landauer2013-03-22-16/+16
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move reporting actions to their own controllerMatthew Landauer2013-03-22-144/+151
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rename routesMatthew Landauer2013-03-22-4/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Wrap in a transactionMatthew Landauer2013-03-22-3/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Extract methodMatthew Landauer2013-03-22-4/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Only allow posts for reporting request. Don't try redirection when not logged inMatthew Landauer2013-03-22-19/+10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | For reporting a request link to the new formMatthew Landauer2013-03-22-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Posted reason and message gets sent out in the emailMatthew Landauer2013-03-22-1/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Let the user know when the request has already been reportedMatthew Landauer2013-03-22-15/+48
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Only allow reporting a request when logged inMatthew Landauer2013-03-22-0/+29
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add first pass at page for reporting a requestMatthew Landauer2013-03-22-0/+28
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge remote-tracking branch ↵Louise Crow2013-06-04-103/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/inline_search_method_refactor' into rails-3-develop
| * | | | | | | | | | | | | | | | Tiny refactorMatthew Landauer2013-03-25-5/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | ActsAsXapian doesn't need to be referenced from the global namespaceMatthew Landauer2013-03-25-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove unused methodMatthew Landauer2013-03-25-11/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Tiny refactorMatthew Landauer2013-03-25-4/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Inline method InfoRequest.full_searchMatthew Landauer2013-03-25-80/+84
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge remote-tracking branch ↵Louise Crow2013-06-04-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/fix_search_highlight_non_ascii_characters' into rails-3-develop
| * | | | | | | | | | | | | | | | Fix word highlighting in acts_as_xapian for non-ascii characters. Fixes #505Matthew Landauer2013-03-25-1/+30
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'openaustralia_github/start_button' into ↵Louise Crow2013-06-04-11/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails-3-develop Conflicts: app/views/public_body/show.html.erb
| * | | | | | | | | | | | | | | | Change wording on button to start request for a particular authorityMatthew Landauer2013-04-11-11/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge remote-tracking branch ↵Louise Crow2013-06-04-19/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/small_email_hash_refactor' into rails-3-develop
| * | | | | | | | | | | | | | | | Inline method and simplify logicMatthew Landauer2013-03-29-19/+4
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Add a rudimentary 'How to contribute' section - stolen shamelessly from ↵Louise Crow2013-05-30-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @mlandauer
* | | | | | | | | | | | | | | | | Merge remote-tracking branch ↵Louise Crow2013-05-30-27/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/remove_random_request_action' into rails-3-develop
| * | | | | | | | | | | | | | | | | Remove apparently unused action for showing random requestMatthew Landauer2013-03-22-27/+0
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'feature/new-string-for-translation' into rails-3-developLouise Crow2013-05-30-9/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Allow the default text of an internal review request to be translated.Louise Crow2013-05-07-8/+33
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Markup new string for translation.Louise Crow2013-05-07-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'fix-missing-pagination-on-pb-search' into rails-3-developLouise Crow2013-05-30-22/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \