aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into wdtkRobin Houston2012-05-25-1/+1
|\
| * Ensure we always return a string of some kind when asking for the ↵Seb Bacon2012-05-22-1/+1
| | | | | | | | short_or_long_name of a public body
* | Filter public body tracks by event typeRobin Houston2012-05-04-25/+37
| | | | | | | | | | Add the facility to filter the public body feed by event type using a query string parameter, e.g. event_type=sent.
* | Fix the "log in as" functionRobin Houston2012-03-20-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the "log in as" function after 3b6e5a692b852a88f55b21a7210f60a6f7cfc24b would attempt to log the admin user out before issuing the redirect. Unfortunately this approach does not work on WhatDoTheyKnow, where the admin pages are served via a different domain (secure.mysociety.org) and so do not share session information with the rest of the site. This commit changes it to mark the PostRedirect with circumstance == "login_as", which signals the user controller to log out the previous user even if they are an admin. In other words, the user is logged out on the main site rather than the admin site, skirting this problem. Closes #450.
* | No code changesRobin Houston2012-03-13-3/+5
| | | | | | | | Just trailing whitespace & one comment.
* | Admin users clicking confirmation linksRobin Houston2012-03-13-1/+8
| | | | | | | | Fixes #446. See issue for details.
* | Only trailing whitespaceRobin Houston2012-02-16-1/+1
|/
* Don’t index unconfirmed usersRobin Houston2012-02-06-1/+6
| | | | Closes #415.
* Let admin users use auto-login URLsRobin Houston2012-02-06-3/+12
| | | | | | Don't change logged-in user from an admin when visiting a auto-login URL. Closes #306.
* Change wording of rate-limited pageRobin Houston2012-02-05-4/+14
| | | | | Include information about what the per-day limit is, and when the user can next make a request. Fixes #412.
* Return 404 for /feed/user/no_such_userRobin Houston2012-02-03-0/+1
| | | | Fixes #407.
* Specify attachment orderingRobin Houston2012-02-03-1/+1
| | | | | | | | | | | | | | | So it turns out that issue #408 is a real and potentially nasty bug. The code was assuming that attachments are returned in the order they were created, which is a) not guaranteed to be the case, and b) sometimes actually not the case, hence the occasional test failures. This trivial patch corrects the issue by sorting attachments by id. The effect of this is to return them in the order they were added to the database, since all were added using the same sequence in a single database session. Fixes #408.
* Remove trailing whitespaceRobin Houston2012-02-03-2/+2
|
* Make variables localRobin Houston2012-02-03-6/+6
| | | | | | | The variables last_request_id and last_body_id were not used by the view, so it’s clearer to make them local variables so it’s obvious from the controller code which values influence the rendering.
* Remove trailing whitespaceRobin Houston2012-02-02-1/+1
|
* Merge branch 'wdtk' into release/0.5Robin Houston2012-02-01-9/+42
|\ | | | | | | | | Conflicts: locale/app.pot
| * TypoRobin Houston2012-02-01-1/+1
| |
| * issue #351 reduxRobin Houston2012-02-01-1/+4
| | | | | | | | Corrected diagnosis, test & fix for issue #351. Fixes #351.
| * Close xapian db before opening it againRobin Houston2012-01-31-1/+4
| | | | | | | | | | | | This *ought* to fix the problem with the alert-tracks daemon opening more and more copies of the xapian db till it exhausts the available file descriptors.
| * Keep message text if user is rate-limitedRobin Houston2012-01-31-5/+32
| | | | | | | | | | | | | | If a user cannot make new requests because they are rate-limited, and they compose a request whilst logged out, include the text of the request in the message that explains about the rate limit so it is not lost.
| * Change (Banned) to (Account suspended)Robin Houston2012-01-31-1/+1
| | | | | | | | | | | | | | | | When a user account has been suspended, we write (Banned) after their user name. But sometimes we need to suspend accounts temporarily, such as pending the result of a discussion, and it is misleading to write (Banned) in such cases; so let’s change it to (Account suspended) instead.
* | Merge branch 'issue_393' of https://github.com/henare/alaveteli into release/0.5Seb Bacon2012-01-31-3/+3
|\ \
| * | Fixes #393 - Route the mass_assign_tags action so it does what it says on ↵Henare Degan2012-01-31-1/+1
| | | | | | | | | | | | the tin
| * | Controller tests were failing for these actions - switching to more concise ↵Henare Degan2012-01-31-2/+2
| | | | | | | | | | | | URL helpers seemed to fix things up
* | | Don't style an empty box on the "new request" page.Seb Bacon2012-01-31-2/+2
| | |
* | | A missing i18n stringSeb Bacon2012-01-31-1/+1
| |/ |/|
* | Make better wording at the top of the page listing subsets of public bodies. ↵Seb Bacon2012-01-30-4/+8
|/ | | | At the same time, cause the tests not to rely on WDTK data. Fixes #396
* Rate limitingRobin Houston2012-01-29-8/+36
| | | | | | Add the capability to specify a limit to the number of requests a user can make per day, which can be turned off for specific users in the admin interface.
* Merge branch 'release/0.5' into wdtkRobin Houston2012-01-29-9/+15
|\
| * Fail fasterRobin Houston2012-01-29-0/+3
| | | | | | | | | | | | Better error reporting when an incoming message has no raw_email. This is useful if you make a mistake when creating new test data, to pick an example application completely at random (not).
| * Change order of requests on front pageRobin Houston2012-01-29-5/+6
| | | | | | | | | | | | | | Put the most-recently-answered first, rather than the most-recently-reclassified. This is inspired by issue #370, though it does not fix all the issues raised in that ticket. (The wording is still outright misleading in some cases.)
| * Irrelevant changeRobin Houston2012-01-29-3/+1
| | | | | | | | | | So, well, I found this change when I ran git diff; and the truth is that I just prefer it aesthetically. Is that so sinful?
| * Raise exception if $RAILS_ENV is unsetRobin Houston2012-01-29-1/+5
| | | | | | | | | | If $RAILS_ENV is unset, raise an exception rather than just blithely creating a directory called cache/attachments_.
* | Fix indentationRobin Houston2012-01-27-18/+17
|/
* More test data and a new testRobin Houston2012-01-27-4/+3
| | | | | This is a test for what I thought issue #370 might be. However this test is passing, so it isn’t that.
* No tabs for indentationRobin Houston2012-01-26-1/+1
|
* indentationRobin Houston2012-01-26-31/+31
|
* Fix #364 properly: third time lucky!Robin Houston2012-01-26-1/+1
|
* Fix #364 properly (?)Robin Houston2012-01-26-1/+1
|
* Fix #364Robin Houston2012-01-26-1/+1
|
* Clean up the indentationRobin Houston2012-01-26-95/+95
|
* Fix #372Robin Houston2012-01-26-1/+1
|
* Remove trailing spacesRobin Houston2012-01-26-1/+1
|
* Simplify search logic so it doesn't depend on sessions. Also fixes #338Seb Bacon2012-01-25-49/+24
|
* Make sure we show user's alerts on their profile page. Fixes #342Seb Bacon2012-01-25-41/+41
|
* Merge branch 'wdtk' of github.com:sebbacon/alaveteli into wdtkSeb Bacon2012-01-25-33/+5
|\ | | | | | | | | Conflicts: app/controllers/request_controller.rb
| * Remove references to removed database columnsRobin Houston2012-01-24-24/+2
| | | | | | | | | | Remove the references to raw_emails.data_text and data_binary, which have not existed since the summer.
| * Remove misleading copy-pasted commentRobin Houston2012-01-24-9/+1
| |
| * Logging for fragment cacheRobin Houston2012-01-21-0/+2
| |
| * bug fixRobin Houston2012-01-20-1/+1
| |