aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'hotfix/api-errors-2'Robin Houston2012-09-07-20/+25
|\
| * 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
| |\
| | * 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
| | |\
| | * | 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.
| * | | Merge branch 'release/0.6.4'0.6.4Louise Crow2012-08-28-1292/+5950
| |\ \ \ | | | |/ | | |/|
| | * | 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
| | |/
| | * Now that external request followups can't be made and status can't be ↵Louise Crow2012-08-23-18/+114
| | | | | | | | | | | | updated, don't show links or text that suggests they can.
| | * Don't allow status updates on external requests from the front end interface ↵Louise Crow2012-08-23-262/+347
| | | | | | | | | | | | | | | | | | (they can still be changed from the admin interface). Final part of fix for #562.
| | * Don't show 'requester only' actions for an external request.Louise Crow2012-08-23-31/+44
| | | | | | | | | | | | Part of the fix for #562.
| | * Don't error on a request to followup an external request.Louise Crow2012-08-23-0/+26
| | | | | | | | | | | | Partial solution to #562.
| | * Handle the case where someone wants to add an annotation to a successful ↵Louise Crow2012-08-23-2/+22
| | | | | | | | | | | | | | | | | | external request. Fixes #563.
| | * Merge branch 'release/0.6.3' into developLouise Crow2012-08-22-309/+4654
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/admin_public_body_controller.rb app/views/admin_public_body/import_csv.rhtml spec/controllers/admin_public_body_controller_spec.rb spec/models/info_request_spec.rb
| | * | With reference to issue #560, generate better text in the case of an ↵Louise Crow2012-08-22-6/+7
| | | | | | | | | | | | | | | | anonymous external user when being viewed by either an admin or non admin.
| | * | Fix typo.Louise Crow2012-08-22-5/+5
| | | |
| | * | With reference to #561, display "[An anonymous user]" rather than an empty ↵Louise Crow2012-08-22-2/+2
| | | | | | | | | | | | | | | | string for external requests with no external user name.
| | * | Merge branch 'develop' of github.com:sebbacon/alaveteli into developLouise Crow2012-08-22-0/+16
| | |\ \
| | | * | Correct constraint on external requestsRobin Houston2012-08-22-0/+16
| | | | |
| | * | | Use user_name to supply the user name for an internal or external request in ↵Louise Crow2012-08-22-38/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the simple correspondence template used when a full request zip is downloaded. Fixes #561.
| | * | | Method spacing.Louise Crow2012-08-22-0/+19
| | |/ /
| | * | Fix admin links in the case where an external request is viewed by an admin ↵Louise Crow2012-08-22-21/+33
| | | | | | | | | | | | | | | | user.
| | * | Don't send comment alerts for external requests.Louise Crow2012-08-22-3/+14
| | | |
| | * | Re-enable testing of comment links in emails.Louise Crow2012-08-22-7/+2
| | | |