aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Remove commentsHenare Degan2012-09-10-6/+0
|
* Everyone is using GitHenare Degan2012-09-10-2/+1
|
* capify .Henare Degan2012-09-10-0/+29
|
* gs-gpl is no longer in UbuntuRobin Houston2012-09-07-1/+1
| | | | Change it to ghostscript
* Merge branch 'hotfix/0.6.5.1' into developRobin Houston2012-09-07-1/+1
|\
| * Bump version number for hot fixRobin Houston2012-09-07-1/+1
| |
| * Merge branch 'hotfix/api-errors-2'Robin Houston2012-09-07-20/+25
| |\
* | \ Merge branch 'hotfix/api-errors-2' into developRobin Houston2012-09-07-0/+0
|\ \ \ | | |/ | |/|
| * | Update other testsRobin Houston2012-09-07-20/+25
| |/ | | | | | | Update the other API tests to take account of the changed error behaviour.
| * Merge branch 'master' of git.mysociety.org:/data/git/public/alaveteliRobin Houston2012-09-06-20221/+12012
| |\ | | | | | | | | | | | | Conflicts: spec/controllers/api_controller_spec.rb
| | * Merge branch 'release/0.6.5'0.6.5Louise Crow2012-08-30-190/+383
| | |\
| | * \ Merge branch 'release/0.6.4'0.6.4Louise Crow2012-08-28-1292/+5950
| | |\ \
| | * \ \ Merge branch 'release/0.6.3'0.6.3Louise Crow2012-08-22-19331/+6325
| | |\ \ \
| * | \ \ \ Merge branch 'hotfix/api-errors'Robin Houston2012-09-06-3/+96
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Update other testsRobin Houston2012-09-07-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | Update the other API tests to take account of the changed error behaviour.
* | | | | | Merge branch 'hotfix/api-errors' into developRobin Houston2012-09-06-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | API errors should be JSONRobin Houston2012-09-06-3/+96
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API was returning Rails (HTML) errors for certain error conditions, which is inconvenient because it makes it difficult for the client to extract the error message. This patch changes add_correspondence to return JSON errors (still with suitable HTTP status codes) for two common exceptional conditions, and adds tests. Conflicts: spec/controllers/api_controller_spec.rb
| * | | | Merge branch 'hotfix/0.6.2.1'Seb Bacon2012-07-16-2796/+1990
| |\ \ \ \
* | \ \ \ \ Merge branch 'develop' of github.com:mysociety/alaveteli into developRobin Houston2012-09-04-1/+5
|\ \ \ \ \ \
| * | | | | | Quote name correctly in query. Fixes #598.Louise Crow2012-09-04-1/+5
| | |_|_|_|/ | |/| | | |
* / | | | | API errors should be JSONRobin Houston2012-09-04-3/+42
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API was returning Rails (HTML) errors for certain error conditions, which is inconvenient because it makes it difficult for the client to extract the error message. This patch changes add_correspondence to return JSON errors (still with suitable HTTP status codes) for two common exceptional conditions, and adds tests.
* | | | | Be more specific about the output from git remote-ls - anything except a ↵release/0.6.5Louise Crow2012-08-30-1/+1
| | | | | | | | | | | | | | | | | | | | single commit hash and tag should cause us just to pull head.
* | | | | Be verbose for now to make any errors more obvious.Louise Crow2012-08-30-1/+1
| | | | |
* | | | | The exit-code flag to git ls-remote seems relatively recent. Check for a ↵Louise Crow2012-08-30-3/+3
| | | | | | | | | | | | | | | | | | | | non-empty output from the tag query instead.
* | | | | Add note about new methods on PublicBodyCategories.Louise Crow2012-08-30-0/+1
| | | | |
* | | | | Bump ALAVETELI_VERSION.Louise Crow2012-08-30-1/+1
| | | | |
* | | | | Update CHANGES.md for release 0.6.5Louise Crow2012-08-30-0/+13
| | | | |
* | | | | Latest translation files from Transifex. Just doing a pull for this release ↵Louise Crow2012-08-30-29/+29
| | | | | | | | | | | | | | | | | | | | as there's only one new msgid, and not one that anyone will be needing in a hurry - it relates to external requests without a user_name.
* | | | | Allow serving of html versions of cached attachments by Apache, as well as ↵Louise Crow2012-08-30-1/+2
| | | | | | | | | | | | | | | | | | | | the originals.
* | | | | Merge branch 'feature/repo-move' into developLouise Crow2012-08-30-120/+184
|\ \ \ \ \
| * | | | | Raise an error on a non-zero return code from the git pull command.Louise Crow2012-08-29-0/+1
| | | | | |
| * | | | | Handle absence of deprecated THEME_URL option.Louise Crow2012-08-29-1/+2
| | | | | |
| * | | | | Update references to point to the mySociety repo.Louise Crow2012-08-29-79/+79
| | | | | |
| * | | | | Update with mysociety repo.Louise Crow2012-08-29-4/+4
| | | | | |
| * | | | | Pass through verbose param, switch to false.Louise Crow2012-08-29-4/+4
| | | | | |
| * | | | | Update location of theme repositories - now in the mySociety account.Louise Crow2012-08-29-2/+2
| | | | | |
| * | | | | Move the installation of themes to a Rake task so that we can use the ↵Louise Crow2012-08-29-27/+86
| | | | | | | | | | | | | | | | | | | | | | | | ALAVETELI_VERSION constant to check for tags in themes that indicate compatibility with this version of the Alaveteli codebase.
| * | | | | Add Alaveteli application version.Louise Crow2012-08-29-8/+11
| | | | | |
* | | | | | Give external request request event unique timestamp to fix spec failure ↵Louise Crow2012-08-29-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | caused by two requests with identical last event timestamps.
* | | | | | Update spec for previous commit.Louise Crow2012-08-29-2/+2
| | | | | |
* | | | | | Fix for the case where an external request has no user_nameLouise Crow2012-08-29-12/+22
| | | | | |
* | | | | | Fix basic admin interface in case where external request without username is ↵Louise Crow2012-08-29-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | being displayed.
* | | | | | Add fixture for an external request without a username.Louise Crow2012-08-29-12/+44
|/ / / / /
* | | | | Merge branch 'release/0.6.4' into developLouise Crow2012-08-28-658/+4612
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Latest translation files downloaded from Transifex.release/0.6.4Louise Crow2012-08-28-24/+3819
| | | | |
| * | | | Restore strings that were lost in the translation upload/download process - ↵Louise Crow2012-08-24-47/+47
| | | | | | | | | | | | | | | | | | | | sometimes changes in the whitespace of the msgid seem to result in the msgstr being discarded.
| * | | | Locale files with new msgids.Louise Crow2012-08-24-679/+828
| | | | |
| * | | | Fix typo.Louise Crow2012-08-23-1/+1
| | | | |
| * | | | Add changes in 0.6.4Louise Crow2012-08-23-2/+12
| | | | |
* | | | | Add headings and by_heading accessors to PublicBodyCategories to allow ↵Louise Crow2012-08-28-5/+66
|/ / / / | | | | | | | | | | | | easier access to headings and to tags associated with a particular heading.