Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge remote branch 'origin/sweden-rebase' | Matthew Somerville | 2014-03-11 | -0/+1 |
|\ | | | | | | | | | | | | | Conflicts: bin/update-schema locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po perllib/FixMyStreet/DB/Result/Body.pm | |||
| * | Add `external_url' column to `body' table. | Jon Kristensen | 2014-03-11 | -0/+1 |
| | | ||||
* | | remove action check on admin_log | Hakim Cassimally | 2013-12-09 | -4/+1 |
| | | | | | | | | to allow a wider range of action logging. | |||
* | | [Zurich] Update schema.sql with body.deleted column | Chris Mytton | 2013-09-10 | -1/+2 |
|/ | ||||
* | Merge remote branch 'origin/zurich' | Matthew Somerville | 2013-02-04 | -73/+51 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | Allow bodies to have parent bodies. | Matthew Somerville | 2012-12-19 | -0/+1 |
| | | ||||
| * | Rejig schema.sql to prevent circular references. | Matthew Somerville | 2012-12-19 | -40/+43 |
| | | ||||
| * | Allow bodies to span multiple area IDs, and areas can be covered by more ↵ | Matthew Somerville | 2012-12-19 | -1/+6 |
| | | | | | | | | than one body. | |||
| * | Make from_body a foreign key. | Matthew Somerville | 2012-12-15 | -1/+1 |
| | | ||||
| * | Rename council column to bodies_str, and all the related code. | Matthew Somerville | 2012-12-15 | -2/+2 |
| | | ||||
| * | Convert report sending code to use bodies rather than areas/councils. | Matthew Somerville | 2012-12-15 | -0/+1 |
| | | ||||
| * | Rename area_id on Contacts table to body_id. | Matthew Somerville | 2012-12-15 | -19/+5 |
| | | | | | | | | Add foreign key constraint from contacts to body. | |||
| * | Rename from_council to from_body, and small related changes. | Matthew Somerville | 2012-12-15 | -19/+1 |
| | | ||||
| * | Rename 'open311conf' database table to 'body'. | Matthew Somerville | 2012-12-15 | -3/+3 |
| | | ||||
* | | add internal review status to problems | Struan Donald | 2013-01-17 | -0/+2 |
| | | ||||
* | | Merge branch 'bromley-new-statuses' | Struan Donald | 2013-01-16 | -1/+10 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | | order of conditions in constraints need to match exactly to make deployment ↵ | Struan Donald | 2012-10-03 | -2/+2 |
| | | | | | | | | | | | | schema test pass | |||
| * | | add send_extended_statuses conf option and use in send-comments | Struan Donald | 2012-10-03 | -1/+2 |
| | | | ||||
| * | | tidy up status names in DB, improve tests a little | Struan Donald | 2012-10-01 | -2/+2 |
| | | | ||||
| * | | initial work to handle changed problem states | Struan Donald | 2012-08-31 | -0/+8 |
| | | | ||||
* | | | add subcategory field to problem table | Struan Donald | 2012-12-03 | -1/+4 |
| |/ |/| | ||||
* | | Allow external_body optionally to be a lookup on /reports. | Matthew Somerville | 2012-11-22 | -0/+1 |
| | | ||||
* | | set interest_count default to 0 as null + 1 = null in postgres :( | Struan Donald | 2012-10-09 | -1/+1 |
| | | | | | | | | tests for the ui for interest_count as well | |||
* | | Missing commas due to merge. | Matthew Somerville | 2012-10-04 | -2/+2 |
| | | ||||
* | | Merge branch 'fmb-read-only' | Dave Whiteland | 2012-10-03 | -1/+15 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Contact.pm perllib/FixMyStreet/DB/Result/Problem.pm | |||
| * | | correct syntax error in schema | Struan Donald | 2012-09-26 | -1/+1 |
| | | | ||||
| * | | allow endpoints to be configured at a category level | Struan Donald | 2012-08-29 | -1/+8 |
| | | | | | | | | | | | | | | | default cobrand now checks for endpoint configuration and only extra fallbacks are in UK cobrand | |||
| * | | initial crude add support option for a problem | Struan Donald | 2012-08-23 | -1/+4 |
| | | | ||||
| * | | add in external_source and external_source_id to schema | Struan Donald | 2012-07-12 | -1/+5 |
| |/ | ||||
* / | add non-public fields to contacts and problem | Struan Donald | 2012-08-31 | -2/+8 |
|/ | ||||
* | Merge branch 'master' into bromley | Matthew Somerville | 2012-05-16 | -1/+4 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/send-reports conf/crontab.ugly conf/general.yml-example db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/DB/Result/Comment.pm perllib/FixMyStreet/DB/Result/Open311conf.pm perllib/FixMyStreet/DB/Result/Problem.pm perllib/FixMyStreet/DB/Result/User.pm templates/web/default/js/validation_strings.html templates/web/fixmystreet/auth/sign_out.html templates/web/fixmystreet/report/new/councils_text_all.html web/cobrands/fixmystreet/_base.scss | |||
| * | added can_display_external_id because external ids are not always useful for ↵ | Dave Whiteland | 2012-05-03 | -1/+4 |
| | | | | | | | | publishing, using send_method_used to determine that on a council-by-council basis | |||
| * | added retry cutoff and send_fail data to problem table for webservice ↵ | Dave Whiteland | 2012-03-23 | -1/+6 |
| | | | | | | | | send-reports | |||
| * | now using open311config all send-reports webservices, not just open311 | Dave Whiteland | 2012-03-23 | -1/+2 |
| | | ||||
* | | add ability to suppress alerts to report creator on | Struan Donald | 2012-05-11 | -1/+2 |
| | | | | | | | | comments updated from open311 | |||
* | | store title in users table so we can persist it for bromley | Struan Donald | 2012-05-01 | -1/+2 |
| | | ||||
* | | associated a comment user with a council config | Struan Donald | 2012-03-26 | -1/+2 |
| | | ||||
* | | DB changes for comment sending | Struan Donald | 2012-03-26 | -2/+7 |
| | | ||||
* | | forgot to add extra column into schema file | Struan Donald | 2012-03-23 | -1/+2 |
| | | ||||
* | | add in retry count code | Struan Donald | 2012-03-22 | -1/+6 |
| | | ||||
* | | add in send method code | Struan Donald | 2012-03-22 | -1/+2 |
| | | ||||
* | | add external id to comments table | Struan Donald | 2012-03-19 | -1/+2 |
|/ | ||||
* | Merge branch 'rss-addresses' | Struan Donald | 2011-11-30 | -1/+2 |
|\ | | | | | | | | | | | Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Problem.pm | |||
| * | geocode column to bytea type | Struan Donald | 2011-09-19 | -1/+2 |
| | | ||||
* | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-22 | -1/+19 |
|\| | | | | | | | | | | | | | | | | | into open311-consumer Conflicts: t/app/model/problem.t templates/web/default/report/new/fill_in_details.html web/css/core.css | |||
| * | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-17 | -2/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/DB/Result/User.pm t/app/controller/admin.t templates/web/default/admin/update_edit.html web/css/core.css | |||
| * | | another syntax error | Struan Donald | 2011-06-30 | -1/+1 |
| | | | ||||
| * | | syntax error | Struan Donald | 2011-06-30 | -1/+1 |
| | | | ||||
| * | | allow user changes to be logged | Struan Donald | 2011-06-27 | -0/+1 |
| | | | ||||
| * | | update users table to user from_council | Struan Donald | 2011-06-27 | -1/+1 |
| | | |