aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App/Controller
Commit message (Expand)AuthorAgeLines
* Merge remote branch 'origin/master' into fmb-read-onlyDave Whiteland2012-05-29-114/+375
|\
| * Merge remote-tracking branch 'origin/bromley' into bromleyStruan Donald2012-05-25-2/+2
| |\
| | * Bromley details in cobrand.Matthew Somerville2012-05-25-2/+2
| * | do not put empty arrays into extra field of contacts and ignore them if they ...Struan Donald2012-05-25-1/+1
| |/
| * Merge branch 'master' into bromleyMatthew Somerville2012-05-23-1/+5
| |\
| | * Assume alert is not confirmed if not logged in.Matthew Somerville2012-05-23-1/+5
| * | Pins yellow on /my for Bromley.Matthew Somerville2012-05-22-3/+3
| * | Merge branch 'master' into bromleyMatthew Somerville2012-05-22-92/+96
| |\|
| | * Allow through octet-stream uploads, catch error from jhead better.Matthew Somerville2012-05-22-3/+5
| | * Move photo processing functions to the photo controller.Matthew Somerville2012-05-22-91/+92
| | * Don't have URL path passed through to 404 as error message.Matthew Somerville2012-05-22-1/+1
| | * Try and work if given a JPEG but with an incorrect MIME type, thanks Citrix.Matthew Somerville2012-05-18-0/+1
| * | Fixes and improvements for tests.Matthew Somerville2012-05-16-7/+9
| * | Merge branch 'master' into bromleyMatthew Somerville2012-05-16-30/+86
| |\|
| * | Log content type if it's bad.Matthew Somerville2012-05-14-0/+1
| * | Merge remote-tracking branch 'origin/bromley' into bromleyStruan Donald2012-05-11-7/+33
| |\ \
| | * | Get data for dashboard dropdowns and enable faceted lookup using them.Matthew Somerville2012-05-08-7/+33
| * | | add ability to suppress alerts to report creator onStruan Donald2012-05-11-1/+3
| |/ /
| * | Redirect to login page if not logged in.Matthew Somerville2012-05-08-0/+2
| * | Dashboard initial start.Matthew Somerville2012-05-04-6/+128
| * | Enable council user to remove report from site using front end button.Matthew Somerville2012-05-02-0/+30
| * | store title in users table so we can persist it for bromleyStruan Donald2012-05-01-4/+16
| * | Fix CM8 Bromley pin colours.Matthew Somerville2012-05-01-1/+2
| * | unset comment user if none passed inStruan Donald2012-04-27-2/+2
| * | Fewer photos on /alert for Bromley.Matthew Somerville2012-04-24-1/+2
| * | actually grab params before we use themStruan Donald2012-04-23-1/+1
| * | Editing interface to set send method for councilStruan Donald2012-04-05-0/+11
| * | move special field processing out to cobrandsStruan Donald2012-04-02-23/+1
| * | tests for title, first and last name for bromley issuesStruan Donald2012-04-02-0/+5
| * | add in first and last name to updatesStruan Donald2012-03-30-0/+20
| * | add first name and last name boxes for bromleyStruan Donald2012-03-30-2/+18
| * | Tweaks to category display.Matthew Somerville2012-03-28-2/+2
| * | Put template in default so other cobrands can find it, but make code only loo...Matthew Somerville2012-03-28-1/+3
| * | Merge remote-tracking branch 'origin/master' into bromleyStruan Donald2012-03-27-8/+35
| |\ \
| * | | save extra comment details for bromleyStruan Donald2012-03-23-0/+7
| * | | initial code to display user title if council is BromleyStruan Donald2012-03-23-2/+17
* | | | Allow display of areas on /around.Matthew Somerville2012-05-08-0/+1
* | | | merge master to get schema changesDave Whiteland2012-05-04-11/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'barnet-integration'Dave Whiteland2012-05-02-2/+17
| |\ \ \
| * | | | Wildcards so it actually works.Matthew Somerville2012-05-02-1/+1
| * | | | Fix for when no results.Matthew Somerville2012-05-02-12/+13
| * | | | Strip images before display (can shrink thumbnail from 60K to 4K).Matthew Somerville2012-05-02-0/+2
| * | | | Fix bug in admin user search, and add council ID search.Matthew Somerville2012-05-02-2/+9
* | | | | Merge branch 'barnet-integration' into fmb-read-onlyDave Whiteland2012-04-30-20/+66
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' into barnet-integrationDave Whiteland2012-04-29-20/+58
| |\| | |
| | * | | Update shortcircuit admin search too.Matthew Somerville2012-04-20-9/+23
| | * | | Shortcircuit email admin search.Matthew Somerville2012-04-20-9/+22
| | * | | Update privacy policy.Matthew Somerville2012-04-19-0/+4
| | | |/ | | |/|
| * | | only include categories for QA testing, removed 'Other' optionDave Whiteland2012-03-23-1/+1
| * | | wee bug fix: default values of Barnet problem categories now accepted as well...Dave Whiteland2012-03-23-1/+1