aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
Commit message (Collapse)AuthorAgeLines
* Merge branch 'develop' of github.com:sebbacon/alaveteli into developRobin Houston2012-06-23-10/+16
|\ | | | | | | | | | | | | | | Conflicts: Gemfile.lock script/handle-mail-replies script/handle-mail-replies.rb spec/controllers/request_controller_spec.rb
| * Merge branch 'master' into developSeb Bacon2012-06-20-10/+16
| |\
| | * Only invalidate a user's cached requests when their *name* changes. ↵Seb Bacon2012-06-20-2/+3
| | | | | | | | | | | | Otherwise we issue PURGEs every time, for example, we send out email alerts.
| | * Correctly name the person who has requested something for admin attentionSeb Bacon2012-06-19-3/+4
| | |
| | * another typoSeb Bacon2012-06-15-1/+1
| | |
| | * typo in user-facing stringSeb Bacon2012-06-15-1/+1
| | |
| | * Return column name when iterating over admin fields.Seb Bacon2012-06-12-1/+1
| | |
| | * Make emails requesting admin attention appear to come from the user who ↵Seb Bacon2012-06-12-4/+8
| | | | | | | | | | | | requested the attention, not the user who made the original request.
* | | Merge branch 'feature/public-body-api' into developRobin Houston2012-06-20-15/+80
|\ \ \ | |/ / |/| |
| * | API controller tests all passRobin Houston2012-06-18-0/+4
| | |
| * | WIP APIRobin Houston2012-06-07-2/+13
| | |
| * | Don’t try to send alerts to external usersRobin Houston2012-06-06-1/+6
| | |
| * | Non-logged-in users can create requestsRobin Houston2012-06-06-3/+3
| | | | | | | | | | | | | | | Make the info_request validation a bit more forgiving, so that non- logged-in users may create requests.
| * | Fix indexing of info_request_eventsRobin Houston2012-06-06-1/+14
| | | | | | | | | | | | | | | Even external requests need to be indexed, for which we need a slug representing the user.
| * | Initialise API key in the modelRobin Houston2012-06-06-2/+6
| | |
| * | API: we can add a response to a requestRobin Houston2012-06-06-1/+9
| | |
| * | Fail less bafflinglyRobin Houston2012-06-06-1/+9
| | | | | | | | | | | | | | | | | | Fail in a less baffling way if the raw email is associated with an incoming message or an info request that has not yet been saved to the database.
| * | Remove obsolete commentRobin Houston2012-06-06-5/+0
| | | | | | | | | | | | That comment makes precisely no sense whatever, any more.
| * | 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
| |/
* / Remove empty unused methodRobin Houston2012-06-07-3/+0
|/
* 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