Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'master' into oxfordshire-usability-recommendations | Chris Mytton | 2013-09-13 | -22/+111 |
|\ | ||||
| * | Merge branch 'zurich-optional-problem-rejected-email' | Chris Mytton | 2013-09-12 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: t/cobrand/zurich.t | |||
| | * | [Zurich] Don't send problem rejected email unless requested | Chris Mytton | 2013-09-11 | -1/+1 |
| | | | ||||
| * | | Merge branch 'zurich-407-generate-note-when-sdm-assigned' | Chris Mytton | 2013-09-12 | -6/+22 |
| |\ \ | ||||
| | * | | [Zurich] create internal note when the category is changed | Edmund von der Burg | 2013-09-11 | -0/+17 |
| | | | | ||||
| | * | | [Zurich] Don't store problem_state when creating the internal note comment | Edmund von der Burg | 2013-09-11 | -1/+0 |
| | | | | ||||
| | * | | Remove shallow copying of $extra (and notes) as this has been fixed | Edmund von der Burg | 2013-09-11 | -4/+3 |
| | | | | ||||
| | * | | Add extra detail to a comment | Edmund von der Burg | 2013-09-11 | -1/+2 |
| | | | | ||||
| * | | | Merge branch 'master' into zurich-add-internal-notes | Chris Mytton | 2013-09-12 | -4/+25 |
| |\ \ \ | | |/ / | |/| / | | |/ | ||||
| | * | [Zurich] Reformat admin csv code | Chris Mytton | 2013-09-09 | -2/+3 |
| | | | ||||
| | * | [Zurich] Quote the external body name in csv | Chris Mytton | 2013-09-09 | -1/+1 |
| | | | ||||
| | * | [Zurich] Add external body name to admin csv export | Chris Mytton | 2013-09-09 | -5/+13 |
| | | | ||||
| | * | [Zurich] Reformat long lines in csv export code | Chris Mytton | 2013-09-09 | -3/+15 |
| | | | ||||
| | * | [Zurich] Add report user id to admin stats csv | Chris Mytton | 2013-09-09 | -3/+3 |
| | | | ||||
| | * | [Zurich] Add report state to admin stats csv | Chris Mytton | 2013-09-06 | -3/+3 |
| | | | ||||
| * | | [Zurich] Save internal notes as hidden comments, rather than in the extra field | Edmund von der Burg | 2013-09-10 | -10/+21 |
| | | | ||||
| * | | Add notes to Zurich cobrand about setting up a dev environment. | Edmund von der Burg | 2013-09-10 | -0/+41 |
| |/ | ||||
| * | remove Mindelo's language domain | Dave Whiteland | 2013-09-05 | -1/+0 |
| | | | | | | | | because we don't need it -- just using translation (pt_CV) file | |||
| * | switch Fixmindelo to pt_CV locale | Dave Whiteland | 2013-09-05 | -1/+2 |
| | | ||||
* | | Merge branch 'master' into oxfordshire-usability-recommendations | Chris Mytton | 2013-08-14 | -1/+2 |
|\| | ||||
| * | Specify town in Oxfordshire disambiguate_location | Chris Mytton | 2013-08-13 | -0/+1 |
| | | | | | | | | | | | | | | | | Part of #508 This seems like a bit of a misuse of this feature, mostly because I'm specifying a county in a parameter called town, but it appears to fix the immediate problem of not being able to find streets in oxfordshire. | |||
| * | Correct span in disambiguate_location for Oxfordshire | Chris Mytton | 2013-08-13 | -1/+1 |
| | | | | | | | | Related to #508 | |||
* | | Increase default map zoom for oxfordshire cobrand | Chris Mytton | 2013-08-07 | -0/+3 |
|/ | | | | For #502 | |||
* | Merge branch 'fixmindelo' | Dave Whiteland | 2013-08-02 | -0/+25 |
|\ | ||||
| * | add fixmindelo cobrand | Dave Whiteland | 2013-07-27 | -0/+25 |
| | | ||||
* | | Send back a list of titles in new report ajax details | Struan Donald | 2013-08-01 | -0/+22 |
|/ | | | | | This is so that the mobile app can use the list to build the appropriate UI as fixing the HTML that is sent for the site is too awful. | |||
* | EHA needs slightly different short names. | Matthew Somerville | 2013-06-24 | -0/+14 |
| | ||||
* | Redirect away from incorrect council pages on council sites. | Matthew Somerville | 2013-05-21 | -4/+21 |
| | ||||
* | Fix admin photo display. | Matthew Somerville | 2013-05-15 | -1/+1 |
| | ||||
* | Tweak function as RSS call returns string, not hash. | Matthew Somerville | 2013-05-13 | -1/+8 |
| | ||||
* | Consolidate photo display checking to one function. | Matthew Somerville | 2013-05-13 | -1/+10 |
| | ||||
* | Add MAPIT_ID_WHITELIST configuration option. | Matthew Somerville | 2013-05-02 | -12/+10 |
| | | | | | | | This allows someone to restrict FixMyStreet's usage to specific MapIt IDs rather than a whole MapIt type. This is currently most useful with Global MapIt as you probably don't want e.g. all the O04s in the world for your installation. | |||
* | Send email to Zurich DM when report in planned state after more than six days. | Matthew Somerville | 2013-04-26 | -4/+4 |
| | ||||
* | Don't add Bromley to strings with Orpington in. | Matthew Somerville | 2013-04-11 | -3/+2 |
| | ||||
* | Only match High Street alone, there are others in the borough. | Matthew Somerville | 2013-04-11 | -1/+1 |
| | ||||
* | Missing translated title, make sure overdue() call is before whensent is reset. | Matthew Somerville | 2013-03-25 | -2/+2 |
| | ||||
* | Set override language for Zurich. | Matthew Somerville | 2013-03-14 | -1/+2 |
| | ||||
* | let OCC staff hide reports in their cobrand | Dave Whiteland | 2013-03-14 | -0/+3 |
| | ||||
* | Merge remote branch 'origin/hide-problem-test' | Matthew Somerville | 2013-03-14 | -1/+1 |
|\ | ||||
| * | FMB council_id should be string not array | Dave Whiteland | 2013-03-13 | -1/+1 |
| | | ||||
* | | Merge branch 'zurich' | Matthew Somerville | 2013-03-14 | -8/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/FixMyStreet.po locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | |||
| * | | Better detection of DM/SDM from database details, as DM might not have children. | Matthew Somerville | 2013-03-12 | -7/+4 |
| | | | ||||
| * | | check that there is something in extra before asking for the public response ↵ | Struan Donald | 2013-02-21 | -1/+1 |
| | | | | | | | | | | | | to prevent 500 error if no extra | |||
| * | | title should also be awating moderation while awaiting moderation | Struan Donald | 2013-02-21 | -0/+1 |
| | | | ||||
* | | | Have total on EHA front page be all time. | Matthew Somerville | 2013-03-08 | -0/+16 |
| | | | ||||
* | | | do not send surveys to people who report via the Southampton Cobrand | Struan Donald | 2013-02-25 | -0/+2 |
|/ / | ||||
* | | Merge remote branch 'origin/zurich' | Matthew Somerville | 2013-02-21 | -10/+252 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | (locale ignored, will rerun .po extraction after to get all changes.) Conflicts: locale/FixMyStreet.po locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po templates/web/fixmystreet/report/banner.html templates/web/zurich/faq/faq-de-ch.html | |||
| * | Include reports total on Zurich stats page. | Matthew Somerville | 2013-02-21 | -0/+3 |
| | | ||||
| * | Fetch needed column. | Matthew Somerville | 2013-02-20 | -2/+2 |
| | | ||||
| * | Zurich CSV header, and add category. | Matthew Somerville | 2013-02-20 | -2/+2 |
| | |