aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Restore survey variables.Louise Crow2012-08-23-0/+5
|
* Merge remote-tracking branch 'origin/release/0.6.4' into wdtkLouise Crow2012-08-23-444/+951
|\ | | | | | | | | | | Conflicts: app/views/request/show.rhtml spec/models/info_request_spec.rb
| * 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
| | |
| * | Clearer formatting of global fixtures list.Louise Crow2012-08-22-7/+21
| | |
| * | Fix comment typo.Louise Crow2012-08-22-2/+2
| | |
| * | Allow external requests to be hidden from the admin interface.Louise Crow2012-08-22-6/+60
| | |
| * | Use user_name instead of user.name to handle external requests.Louise Crow2012-08-22-4/+7
| | |
| * | Merge branch 'develop' of github.com:sebbacon/alaveteli into developLouise Crow2012-08-21-2/+5
| |\ \
| | * \ Merge branch 'develop' of github.com:sebbacon/alaveteli into developRobin Houston2012-08-21-0/+4
| | |\ \
| | * | | Email admins about external requests tooRobin Houston2012-08-21-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If someone reports an external request as needing administrator attention, we should email the administrators about it. Thanks for spotting this, @crowbot.
| * | | | Don't pass a page param of less than one through to Xapian, treat it as a ↵Louise Crow2012-08-21-4/+14
| | |/ / | |/| | | | | | | | | | param of 1. Fixes #557.
| * | | Merge branch 'develop' of github.com:sebbacon/alaveteli into developLouise Crow2012-08-20-38/+50
| |\| |
| | * | Fail with NotFound if request slug doesn't existRobin Houston2012-08-20-26/+37
| | | | | | | | | | | | | | | | Closes #554.
| | * | ECONNRESET is another error we might getRobin Houston2012-08-20-2/+2
| | | |
| | * | Do not send email for external requestsRobin Houston2012-08-20-3/+3
| | | |
| | * | Fix another testRobin Houston2012-08-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is there actually any point in tests of this sort? It is not testing that anything works as intended, only that a particular SQL string is passed to the database -- and surely the only way that string could have been discovered for test purposes was essentially to copy it from the code under test. It seems to me that the only real function of a test of this sort is to make it more difficult to modify the code under test.
| | * | Fix testsRobin Houston2012-08-20-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make the InfoRequest#is_old_unclassified? method a little more conservative, by returning false only is the is_external? method returns true. This makes it subtly inconsistent with InfoRequest.find_old_unclassified, but it is better I think to be subtly inconsistent than to risk breaking things that used to work.
| | * | External requests ought not to be considered old_unclassifiedRobin Houston2012-08-20-1/+2
| | | | | | | | | | | | | | | | | | | | We certainly do not want to send reminder emails for such requests, for example, since we do not know the email address to send them to.
| | * | External requests were not sent by usRobin Houston2012-08-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Therefore we ought not to display the warning “This message has not yet been sent for an unknown reason” for such requests. Closes #548.
| | * | External requests need not have exim log linesRobin Houston2012-08-20-1/+1
| | | | | | | | | | | | | | | | We do not send messages for external requests. See #548.
| | * | Fix comment typoRobin Houston2012-08-20-1/+1
| | | |
| * | | Use find_by_url_title! to raise ActiveRecordNotFound in upload response when ↵Louise Crow2012-08-20-1/+5
| |/ / | | | | | | | | | | | | | | | no record is found using url_title. Closes #553.
| * | Remove whatdotheyknow-specific variables.Louise Crow2012-08-16-6/+1
| | |
| * | Merge branch 'wdtk' into developLouise Crow2012-08-16-345/+525
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/admin_request_controller.rb config/httpd.conf spec/models/info_request_spec.rb
| * \ \ Merge pull request #542 from henare/import_csv-page-fixesLouise Crow2012-08-13-10/+14
| |\ \ \ | | | | | | | | | | import_csv page fixes
| | * | | Test showed this page wasn't valid HTMLHenare Degan2012-08-11-3/+5
| | | | |
| | * | | Default to dry run and don't raise an error when this page is visited normallyHenare Degan2012-08-11-7/+2
| | | | |
| | * | | Add failing test showing a bug when clicking 'Import from CSV file' on the ↵Henare Degan2012-08-11-0/+7
| | | | | | | | | | | | | | | | | | | | admin public authorities page
| * | | | Update install doc to reflect the fact that develop is now the default ↵Louise Crow2012-08-13-5/+4
| | | | | | | | | | | | | | | | | | | | branch on github.
| * | | | Add link to master branch.Louise Crow2012-08-13-0/+3
| | | | |
| * | | | Merge branch 'develop' of github.com:sebbacon/alaveteli into developLouise Crow2012-08-13-2/+66
| |\| | |
| | * | | Helpers to support external requestsRobin Houston2012-08-10-1/+13
| | | | |
| | * | | Merge branch 'gemnasium' of https://github.com/henare/alaveteli into developRobin Houston2012-08-10-1/+1
| | |\ \ \