Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge remote branch 'origin/zurich' | Matthew Somerville | 2013-02-21 | -33/+20 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | (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 | |||
| * | Put planned in all_states. | Matthew Somerville | 2013-02-20 | -0/+1 |
| | | ||||
| * | Remove *_local tz functions, set timezone on fetching original columns from ↵ | Matthew Somerville | 2013-02-14 | -33/+19 |
| | | | | | | | | database. | |||
| * | use cobrand prettify_dt method rather calling directly so it gets called ↵ | Struan Donald | 2013-02-05 | -2/+2 |
| | | | | | | | | with correct params | |||
* | | Ask for address, and clarify public/private for EmptyHomes. | Matthew Somerville | 2013-02-13 | -1/+1 |
|/ | ||||
* | Missed some council references. | Matthew Somerville | 2013-02-04 | -1/+1 |
| | ||||
* | Merge remote branch 'origin/zurich' | Matthew Somerville | 2013-02-04 | -44/+92 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/open311-populate-service-list bin/send-comments bin/update-all-reports conf/crontab.ugly db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/App/Controller/Reports.pm perllib/FixMyStreet/Cobrand/Default.pm perllib/FixMyStreet/Cobrand/LichfieldDC.pm perllib/FixMyStreet/DB/Result/Open311conf.pm perllib/FixMyStreet/DB/Result/Problem.pm perllib/FixMyStreet/DB/ResultSet/Problem.pm perllib/FixMyStreet/SendReport.pm perllib/FixMyStreet/SendReport/Email.pm perllib/FixMyStreet/SendReport/Open311.pm perllib/Open311/GetServiceRequestUpdates.pm perllib/Open311/PopulateServiceList.pm t/app/controller/report_new.t t/app/controller/rss.t templates/web/bromley/report/display.html templates/web/default/admin/council_contacts.html templates/web/default/common_header_tags.html templates/web/default/dashboard/index.html templates/web/default/front/stats.html templates/web/default/report/_main.html templates/web/default/report/update-form.html templates/web/emptyhomes/index.html templates/web/emptyhomes/report/display.html templates/web/emptyhomes/report/new/councils_text_all.html templates/web/emptyhomes/reports/body.html templates/web/emptyhomes/reports/index.html templates/web/fixmystreet/report/new/fill_in_details_form.html templates/web/fixmystreet/report/update-form.html web/cobrands/fixmystreet/fixmystreet.js web/js/fixmystreet.js | |||
| * | add displable represenations of confirmed and created times to ajax problem ↵ | Struan Donald | 2013-01-28 | -0/+2 |
| | | | | | | | | details | |||
| * | add translated state string to ajax problem details | Struan Donald | 2013-01-28 | -0/+1 |
| | | ||||
| * | only try and generate meta if the problem is confirmed otherwise we get errors | Struan Donald | 2013-01-28 | -1/+1 |
| | | ||||
| * | add state and used_map details to ajax report results | Struan Donald | 2013-01-28 | -0/+3 |
| | | ||||
| * | Stop changing DateTimes to epochs and back. | Matthew Somerville | 2013-01-25 | -5/+11 |
| | | | | | | | | | | | | | | Also revert cursor handling of Reports.pm; the DateTime inflation appears to be a slowdown, and we were doing that anyway, and this way makes things simpler in general. Will have a watch out for any performance issue, but hopefully it should be fine. | |||
| * | Make sure title not shown on pins on unconfirmed Zurich reports. | Matthew Somerville | 2013-01-24 | -0/+6 |
| | | ||||
| * | add basic ability to return a report as json | Struan Donald | 2013-01-24 | -0/+17 |
| | | ||||
| * | Store Zurich external body in external_body rather than changing bodies_str. | Matthew Somerville | 2013-01-15 | -1/+5 |
| | | ||||
| * | Show Zurich co-ordinates on admin page. | Matthew Somerville | 2013-01-07 | -0/+8 |
| | | ||||
| * | Make sure serialized string is UTF-8 encoded. | Matthew Somerville | 2012-12-21 | -0/+2 |
| | | ||||
| * | Minor admin text tweaks. | Matthew Somerville | 2012-12-20 | -1/+1 |
| | | ||||
| * | Allow unconfirmed as a visible state in Zurich, adjust front end list/item ↵ | Matthew Somerville | 2012-12-19 | -13/+14 |
| | | | | | | | | templates to suit. | |||
| * | Migrate Reports.pm to use bodies, not areas. | Matthew Somerville | 2012-12-15 | -3/+1 |
| | | ||||
| * | Rename council column to bodies_str, and all the related code. | Matthew Somerville | 2012-12-15 | -18/+18 |
| | | ||||
| * | Rename 'open311conf' database table to 'body'. | Matthew Somerville | 2012-12-15 | -3/+3 |
| | | ||||
* | | No names on EmptyHomes site, no map pin text. | Matthew Somerville | 2013-01-29 | -5/+1 |
| | | ||||
* | | add internal review status to problems | Struan Donald | 2013-01-17 | -0/+4 |
| | | ||||
* | | Merge branch 'bromley-new-statuses' | Struan Donald | 2013-01-16 | -14/+82 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/send-comments conf/crontab.ugly db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/DB/Result/Open311conf.pm perllib/FixMyStreet/DB/ResultSet/Problem.pm perllib/Open311.pm t/app/controller/report_updates.t t/open311.t templates/web/default/report/display.html templates/web/default/report/updates.html templates/web/fixmystreet/report/display.html | |||
| * | | be less restrictive about how open 311 status updates can change states | Struan Donald | 2012-11-09 | -1/+1 |
| | | | | | | | | | | | | | | | as logged in council users don't have the same restrictions also, fix open311 status name of unable to fix | |||
| * | | limit comment and description length to 2000 characters for bromley | Struan Donald | 2012-10-03 | -0/+5 |
| | | | ||||
| * | | do not used planned status but use new action scheduled instead | Struan Donald | 2012-10-02 | -5/+3 |
| | | | | | | | | | | | | | | | NB: planned still listed in some places to account for old reports some test coverage improvements | |||
| * | | tidy up status names in DB, improve tests a little | Struan Donald | 2012-10-01 | -5/+4 |
| | | | ||||
| * | | Don't have the list of states harcoded in more than one place | Struan Donald | 2012-10-01 | -1/+43 |
| | | | | | | | | | | | | Also sort out some warnings that were being issues during tests | |||
| * | | initial work to handle changed problem states | Struan Donald | 2012-08-31 | -13/+37 |
| | | | ||||
* | | | Merge branch 'centro' | Struan Donald | 2013-01-04 | -2/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: perllib/FixMyStreet/Cobrand/Default.pm | |||
| * | | | add subcategory field to problem table | Struan Donald | 2012-12-03 | -2/+4 |
| | |/ | |/| | ||||
* | | | Check council string rather than cobrand, so works on non-cobranded reports. | Matthew Somerville | 2012-12-18 | -2/+2 |
| | | | ||||
* | | | fixed syntax error, forgot to commit | Dave Whiteland | 2012-12-13 | -1/+1 |
| | | | ||||
* | | | display oxfordshie's PEM id (council ref) on the public problem page | Dave Whiteland | 2012-12-12 | -1/+2 |
|/ / | ||||
* | | Move map not used text to template so we can use HTML in it | Struan Donald | 2012-10-26 | -3/+0 |
| | | | | | | | | | | | | and not have it escaped when it is displayed Fixed #350 | |||
* | | Fix copy to match behaviour, fixes #326. | Matthew Somerville | 2012-10-12 | -1/+1 |
| | | ||||
* | | Fix #86. | Matthew Somerville | 2012-10-12 | -1/+1 |
| | | ||||
* | | Change 'their ref' to 'council ref', fixes #300 good enough for the moment. | Matthew Somerville | 2012-10-10 | -1/+1 |
| | | ||||
* | | Merge branch 'fmb-read-only' | Dave Whiteland | 2012-10-03 | -0/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Contact.pm perllib/FixMyStreet/DB/Result/Problem.pm | |||
| * | | initial crude add support option for a problem | Struan Donald | 2012-08-23 | -2/+4 |
| | | | ||||
| * | | Merge remote-tracking branch 'origin/master' into fmb-read-only | Struan Donald | 2012-08-22 | -5/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore bin/make_css conf/general.yml-example perllib/FixMyStreet/App/Controller/Council.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/Cobrand/Default.pm templates/web/default/around/around_index.html templates/web/default/index.html templates/web/emptyhomes/index.html templates/web/fixmystreet/around/around_index.html templates/web/fixmystreet/index.html web/fixmystreet_app_cgi.cgi web/fixmystreet_app_fastcgi.cgi | |||
| * | | changed mm_msg_id to external_source_id, and added external_source col | Dave Whiteland | 2012-07-12 | -3/+5 |
| | | | ||||
| * | | added Message Manager ID (mm_msg_id) column and used it | Dave Whiteland | 2012-07-11 | -3/+5 |
| | | | ||||
* | | | add non-public fields to contacts and problem | Struan Donald | 2012-08-31 | -3/+5 |
| |/ |/| | ||||
* | | Remove unused extra_* functions. | Matthew Somerville | 2012-08-16 | -1/+0 |
| | | ||||
* | | Allow report URL to be cobrand-specific (for places where cobrand links to a ↵ | Matthew Somerville | 2012-07-10 | -4/+3 |
|/ | | | | report that isn't covered by it). | |||
* | Merge branch 'master' into bromley | Matthew Somerville | 2012-05-22 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: bin/send-reports perllib/FixMyStreet/App/Controller/Report/New.pm | |||
| * | Stop warning by checking existence first. | Matthew Somerville | 2012-05-18 | -1/+1 |
| | |