Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | | 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 | |
| | | |||||
* | | Merge branch 'master' into bromley | Matthew Somerville | 2012-05-16 | -9/+54 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -5/+21 | |
| | | | | | | | | 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 | -2/+8 | |
| | | | | | | | | send-reports | ||||
| * | now using open311config all send-reports webservices, not just open311 | Dave Whiteland | 2012-03-23 | -9/+9 | |
| | | |||||
| * | split the clauses a little for the benefit of the translator | Dave Whiteland | 2012-03-23 | -2/+5 | |
| | | |||||
| * | added council external reference to problem display page | Dave Whiteland | 2012-03-23 | -0/+26 | |
| | | |||||
* | | add update_send_failed method | Struan Donald | 2012-04-03 | -0/+11 | |
| | | |||||
* | | add in retry count code | Struan Donald | 2012-03-22 | -2/+8 | |
|/ | |||||
* | Store full size photos that are uploaded on filesystem, put hash in ↵ | Matthew Somerville | 2012-03-08 | -10/+1 | |
| | | | | database. Fixes #9, basics for #209 (needs light box adding). | ||||
* | Add 'below' to fix #244, rearrange note slightly to be in better place. | Matthew Somerville | 2012-03-01 | -1/+1 | |
| | |||||
* | Merge branch 'rss-addresses' | Struan Donald | 2011-11-30 | -2/+25 | |
|\ | | | | | | | | | | | Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Problem.pm | ||||
| * | geocode column to bytea type | Struan Donald | 2011-09-19 | -3/+3 | |
| | | |||||
| * | sort of working rss address stuff with db caching and populate script | Struan Donald | 2011-09-09 | -2/+26 | |
| | | |||||
* | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-08-22 | -0/+135 | |
|\| | | | | | | | | | | | | | | | | | 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 | -1/+3 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * \ | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-28 | -3/+9 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: perllib/FixMyStreet/App/Controller/Report/Update.pm templates/web/default/report/display.html | ||||
| * \ \ | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵ | Struan Donald | 2011-06-27 | -3/+3 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into new_statuses Conflicts: perllib/FixMyStreet/DB/Result/Comment.pm perllib/FixMyStreet/DB/Result/User.pm web/css/core.css | ||||
| * | | | | is_closed utility method | Struan Donald | 2011-06-22 | -0/+31 | |
| | | | | | |||||
| * | | | | unconfirmed is not really an open state | Struan Donald | 2011-06-21 | -1/+0 | |
| | | | | | |||||
| * | | | | rename will not fix to closed | Struan Donald | 2011-06-16 | -1/+1 | |
| | | | | | |||||
| * | | | | handle new states in report display and updating | Struan Donald | 2011-06-16 | -20/+88 | |
| | | | | | |||||
| * | | | | send questionnaires for all open states | Struan Donald | 2011-06-15 | -0/+16 | |
| | | | | | |||||
| * | | | | docs and formatting | Struan Donald | 2011-06-15 | -5/+11 | |
| | | | | | |||||
| * | | | | update report display to handle new statuses | Struan Donald | 2011-06-15 | -0/+15 | |
| | | | | |