aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
Commit message (Collapse)AuthorAgeLines
* Fix typo that broke one of the "follow" informational messagesSeb Bacon2012-05-16-1/+1
|
* Limit the number of results returned on the wallSeb Bacon2012-05-16-2/+2
|
* Merge branch 'develop' into feature/follow-buttonsSeb Bacon2012-05-15-177/+206
|\ | | | | | | | | | | Conflicts: app/models/track_mailer.rb app/models/track_thing.rb
| * Merge branch 'develop' into feature/fix-404-in-themesSeb Bacon2012-05-15-163/+163
| |\
| | * Remove trailing whitespace (to make a cleaner forthcoming merge with ↵Seb Bacon2012-05-15-163/+163
| | | | | | | | | | | | wombleton:feature/440_sparkly_admin_css)
| * | Add a comment to explain why we're calling `set_view_paths` in the ↵Seb Bacon2012-05-15-2/+7
| | | | | | | | | | | | controller when the method doesn't exist in Alaveteli code. See [this comment](https://github.com/sebbacon/alaveteli/issues/320#issuecomment-5711523) for discussion.
| * | Allow themes to effect the design of error pagesSeb Bacon2012-05-15-0/+7
| |/
| * Improve administrative user account support:Seb Bacon2012-05-14-14/+31
| | | | | | | | | | | | * Allow users with `super` admin level to use the administrative interface. * Allow bootstrapping these users with an Emergency User over HTTP Basic Auth * Introduce new `SKIP_ADMIN_AUTH` setting to allow all admin auth to be bypassed (used by mySociety)
* | Support "following" functionality:Seb Bacon2012-05-14-4/+65
|/ | | | | | * Change "email me about stuff" wording to "follow" throughout * Introduce a new flag that the user can set, which controls if they get email alerts * Add a new link to a "wall" for logged in users where they can see a feed of all the things they're following
* Redirect people to more user-friendly search results page (where possible) ↵Seb Bacon2012-05-11-1/+17
| | | | after they've "followed" search results. Fixes #487
* Don't cache results from pages with different locales using the same key. ↵Seb Bacon2012-05-04-1/+1
| | | | Fixes #454
* Merge branch 'develop' of github.com:sebbacon/alaveteli into developRobin Houston2012-05-03-10/+3
|\
| * More changes and refactoring to make purges work.Seb Bacon2012-04-20-10/+1
| |
| * Merge branch 'develop' into purge-requestsSeb Bacon2012-04-19-10/+18
| |\ | | | | | | | | | | | | Conflicts: spec/controllers/request_controller_spec.rb
| * | first stab at sending PURGE requests to upstream varnish for request pages. ↵Seb Bacon2012-03-13-0/+2
| | | | | | | | | | | | Next step: making it asynchronous, e.g. with a queue of things to purge via a cron job.
| * | Set a "Content-Disposition: attachment" header when downloading files. ↵Seb Bacon2012-03-13-1/+2
| | | | | | | | | | | | Closes #428
| * | Trailing whitespaceRobin Houston2012-03-13-1/+1
| | |
| * | Make /similar/request/NONESUCH a 404 not 500 errorRobin Houston2012-03-13-1/+3
| | | | | | | | | | | | Fixes #421.
* | | Filter public body tracks by event typeRobin Houston2012-05-03-2/+6
| |/ |/| | | | | | | Add the facility to filter the public body feed by event type using a query string parameter, e.g. event_type=sent.
* | use Rails.root, not RAILS_ROOTJames McKinney2012-04-02-1/+1
| |
* | Merge branch 'wdtk' into developRobin Houston2012-03-20-8/+9
|\ \
| * | Fix the "log in as" functionRobin Houston2012-03-20-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Admin users clicking confirmation linksRobin Houston2012-03-13-1/+8
| | | | | | | | Fixes #446. See issue for details.
* | Set a "Content-Disposition: attachment" header when downloading files. ↵Seb Bacon2012-02-15-1/+2
| | | | | | | | Closes #428
* | Trailing whitespaceRobin Houston2012-02-10-1/+1
| |
* | Make /similar/request/NONESUCH a 404 not 500 errorRobin Houston2012-02-10-1/+3
|/ | | | Fixes #421.
* Let admin users use auto-login URLsRobin Houston2012-02-06-3/+6
| | | | | | 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-0/+2
| | | | | 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.
* 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.
* Merge branch 'wdtk' into release/0.5Robin Houston2012-02-01-6/+27
|\ | | | | | | | | Conflicts: locale/app.pot
| * 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-4/+19
| | | | | | | | | | | | | | 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.
* | 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
* | 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-2/+7
| | | | | | 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.
* 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?
* 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
|
* 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-29/+7
|
* Merge branch 'wdtk' of github.com:sebbacon/alaveteli into wdtkSeb Bacon2012-01-25-9/+3
|\ | | | | | | | | Conflicts: app/controllers/request_controller.rb
| * Remove misleading copy-pasted commentRobin Houston2012-01-24-9/+1
| |