aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
Commit message (Collapse)AuthorAgeLines
* External requestsRobin Houston2012-06-06-1/+17
| | | | | Add data model support for “external” requests, i.e. requests added via the API rather than made using the site.
* Generate an API key for each public bodyRobin Houston2012-06-06-1/+2
|
* Log an event when a request is hiddenRobin Houston2012-06-04-0/+1
|
* Copy the admin team on messages sent to usersRobin Houston2012-06-03-0/+1
| | | | | When a user is notified of a request having been hidden, BCC the site admin team.
* File.dirname(__FILE__) is not necessarily absoluteRobin Houston2012-06-03-1/+1
| | | | | | | It’s weird that there’s so much code here that implicitly assumes File.dirname(__FILE__) is an absolute path, because really in general it very much is not! This assumption was invalidated by the recent bundler-awareness changes.
* Remove redundant condition (when deciding who gets email alerts)Seb Bacon2012-05-30-1/+1
|
* Support "following" functionality:Seb Bacon2012-05-30-35/+35
| | | | | | * 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
* Merge branch 'feature/easy-request-hiding-for-admin' into developSeb Bacon2012-05-28-1/+7
|\
| * Support easy hiding of requests for admins. Currently not exposed in core ↵Seb Bacon2012-05-25-1/+7
| | | | | | | | admin interface (requires adminbootstraptheme).
* | Merge branch 'develop' of github.com:sebbacon/alaveteli into developSeb Bacon2012-05-28-7/+11
|\ \ | |/ |/|
| * Merge branch 'develop' of github.com:sebbacon/alaveteli into developDavid Cabo2012-05-28-279/+439
| |\
| * | I18n missing descriptions when editing out email addressesDavid Cabo2012-05-28-3/+3
| | |
| * | Fix not I18n'd email address descriptionDavid Cabo2012-05-28-1/+5
| | |
| * | Add I18n string for mail clarificationDavid Cabo2012-05-28-1/+1
| | |
| * | I18n missing string in model for quoted sectionsDavid Cabo2012-05-28-2/+2
| | |
* | | A new method for ContactMailer that sends messages to users from adminsSeb Bacon2012-05-25-0/+12
| | |
* | | Our default "from" details should be the CONTACT_* ones, not the ↵Seb Bacon2012-05-25-0/+6
| | | | | | | | | | | | TRACK_SENDER_* ones. This reverts part of commit 8a4a8feb9cfe0a77195943124112f0d284a7f9cd
* | | Factor out `contact_from_name_and_email` so it can be used from anywhere in ↵Seb Bacon2012-05-25-12/+1
| |/ |/| | | | | the app.
* | Further annotation correctionsSeb Bacon2012-05-24-95/+99
| |
* | Re-annotate modelsSeb Bacon2012-05-24-66/+81
| |
* | First stab at new feature. Adds new box in sidebar for reporting an issue, a ↵Seb Bacon2012-05-24-3/+9
| | | | | | | | | | | | new "needs admin attention"-type state to InfoRequests, a flag indicating that a request has ever been marked as needing admin attention, and a controller method and route for setting this state & flag. Also adds the reason something needs admin attention to the subject of the email that gets sent to administrators. Neeeds tests.
* | Rollback refactoring of event_type validation that broke various testsSeb Bacon2012-05-23-19/+24
| |
* | Merge from wombleton:feature/440_sparkly_admin_cssSeb Bacon2012-05-23-39/+91
| | | | | | | | | | | | | | Includes a couple of additional fixes: * Remember to HTML-quote things that could come from users * Fix form post action for editing users
* | Remove trailing whitespace (to make a cleaner forthcoming merge with ↵Seb Bacon2012-05-15-209/+209
| | | | | | | | wombleton:feature/440_sparkly_admin_css)
* | Correctly create tracks for searches that are filtered by variety:authority ↵Seb Bacon2012-05-11-1/+1
| | | | | | | | via the search UI
* | Improve handling of nil for public body notesDavid Cabo2012-05-08-1/+1
| |
* | Don't ever create more than one entry for each URL that we want Varnish to ↵Seb Bacon2012-05-04-3/+6
| | | | | | | | purge.
* | Empty the purge queue even for failed requests (otherwise we will be ↵Seb Bacon2012-05-04-3/+1
| | | | | | | | endlessly polling the Varnish server until its fixed). Administrators should check the logs for failed purges.
* | Merge branch 'develop' of github.com:sebbacon/alaveteli into developRobin Houston2012-05-03-6/+75
|\ \
| * | Make sure the purge queue is cleared at least every 30 secondsSeb Bacon2012-05-02-1/+1
| | |
| * | Another change to make track descriptions deterministic, so tests can work ↵Seb Bacon2012-05-02-3/+2
| | | | | | | | | | | | reliably
| * | Don't set attachment size explicitly -- can result in race condition which ↵Seb Bacon2012-05-02-1/+0
| | | | | | | | | | | | incorrectly sets size to 0K, and is set when the attachment body is created anyway.
| * | Ensure we always return a string of some kind when asking for the ↵Seb Bacon2012-05-02-1/+1
| | | | | | | | | | | | short_or_long_name of a public body
| * | Make the order of words in a track_thing description deterministic, so the ↵Seb Bacon2012-05-02-0/+1
| | | | | | | | | | | | test always passes
| * | Add a method to run the purge process in a continuous loopSeb Bacon2012-05-02-1/+15
| | |
| * | Use routing system to work out URL of request to purge, rather than hard ↵Seb Bacon2012-05-02-1/+5
| | | | | | | | | | | | coding it.
| * | More changes and refactoring to make purges work.Seb Bacon2012-04-20-13/+35
| | |
| * | Merge branch 'develop' into purge-requestsSeb Bacon2012-04-19-5/+3
| |\ \ | | | | | | | | | | | | | | | | Conflicts: spec/controllers/request_controller_spec.rb
| * | | first stab at sending PURGE requests to upstream varnish for request pages. ↵Seb Bacon2012-03-13-1/+31
| | | | | | | | | | | | | | | | Next step: making it asynchronous, e.g. with a queue of things to purge via a cron job.
| * | | Don't add http when https is presentHenare Degan2012-03-13-1/+1
| | | |
| * | | Don't add extra www characters to web addresses that have been explicitly ↵Henare Degan2012-03-13-1/+1
| | | | | | | | | | | | | | | | defined
| * | | Refactor methodHenare Degan2012-03-13-17/+4
| | | |
| * | | Make public authority home page links work. Fixes #271Henare Degan2012-03-13-1/+6
| | | |
* | | | Filter public body tracks by event typeRobin Houston2012-05-03-23/+31
| |/ / |/| | | | | | | | | | | 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-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix the "log in as" functionRobin Houston2012-03-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Only trailing whitespaceRobin Houston2012-02-16-1/+1
| |/
* | Merge branch 'merged-bundler' into developSeb Bacon2012-03-12-2/+0
|\ \
| * | Merge jpmckinney/bundlerSeb Bacon2012-02-15-2/+0
| |/