Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'master' into oxfordshire-usability-recommendations | Chris Mytton | 2013-09-13 | -9/+30 |
|\ | ||||
| * | Spell out all "marked as %s" strings. | Matthew Somerville | 2013-09-05 | -9/+30 |
| | | | | | | | | | | As doing interpolation from a database state field is not great for translation. Fixes #391. | |||
* | | [Oxfordshire] Override ref display in include | Chris Mytton | 2013-08-30 | -5/+6 |
|/ | | | | | This removes the need to override large chunks of template for the sake of a relatively small change. | |||
* | Consolidate photo display checking to one function. | Matthew Somerville | 2013-05-13 | -1/+1 |
| | ||||
* | Rewrite support template for i18n (fixex #354). | Matthew Somerville | 2013-02-21 | -6/+12 |
| | ||||
* | Catch a few missing title exceptions. | Matthew Somerville | 2013-02-21 | -1/+1 |
| | ||||
* | Merge remote branch 'origin/zurich' | Matthew Somerville | 2013-02-21 | -5/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | (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 | |||
| * | Remove *_local tz functions, set timezone on fetching original columns from ↵ | Matthew Somerville | 2013-02-14 | -5/+5 |
| | | | | | | | | database. | |||
* | | Spacing fixes, and SET is needed with conditional. | Matthew Somerville | 2013-02-14 | -4/+4 |
| | | ||||
* | | All Bromley updates. | Matthew Somerville | 2013-02-14 | -1/+1 |
| | | ||||
* | | Wording tweak for Bromley third party responsibility. | Matthew Somerville | 2013-02-14 | -2/+3 |
| | | ||||
* | | Move category label out of code to template. | Matthew Somerville | 2013-02-12 | -1/+6 |
| | | ||||
* | | Couple of Bromley council references missed in merge. | Matthew Somerville | 2013-02-11 | -1/+1 |
|/ | ||||
* | Merge remote branch 'origin/zurich' | Matthew Somerville | 2013-02-04 | -30/+29 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | Stop changing DateTimes to epochs and back. | Matthew Somerville | 2013-01-25 | -4/+4 |
| | | | | | | | | | | | | | | 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. | |||
| * | Don't double-HTML escape 'Pick a category' text. | Matthew Somerville | 2013-01-18 | -1/+2 |
| | | ||||
| * | More correct front-end display of Zurich status mappings. | Matthew Somerville | 2012-12-21 | -1/+1 |
| | | ||||
| * | Slightly better text for an area with associated bodies without any categories. | Matthew Somerville | 2012-12-19 | -6/+3 |
| | | ||||
| * | Rename council column to bodies_str, and all the related code. | Matthew Somerville | 2012-12-15 | -4/+4 |
| | | ||||
| * | Update reporting to use bodies. | Matthew Somerville | 2012-12-15 | -13/+14 |
| | | ||||
| * | Rename from_council to from_body, and small related changes. | Matthew Somerville | 2012-12-15 | -7/+7 |
| | | ||||
* | | No names on EmptyHomes site, no map pin text. | Matthew Somerville | 2013-01-29 | -1/+1 |
| | | ||||
* | | Tidy up/remove some more unneeded EHA templates; reports show text and ↵ | Matthew Somerville | 2013-01-29 | -4/+9 |
| | | | | | | | | photo, but no map or updates. | |||
* | | Do not mark initial comment that is confirmed as reopened. Fixes #377. | Struan Donald | 2013-01-29 | -2/+2 |
| | | ||||
* | | improve special case for unable to fix updates from Bromley | Struan Donald | 2013-01-22 | -1/+1 |
| | | ||||
* | | Merge branch 'bromley-new-statuses' | Struan Donald | 2013-01-16 | -7/+22 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | | Correctly implement the display of update statuses on report pages | Struan Donald | 2012-11-23 | -14/+16 |
| | | | ||||
| * | | display correct names for report statuses on bromley cobrand | Struan Donald | 2012-11-22 | -2/+13 |
| | | | ||||
| * | | display correct banner for new statuses | Struan Donald | 2012-10-02 | -1/+1 |
| | | | ||||
| * | | do not used planned status but use new action scheduled instead | Struan Donald | 2012-10-02 | -5/+5 |
| | | | | | | | | | | | | | | | NB: planned still listed in some places to account for old reports some test coverage improvements | |||
| * | | change update form to use new statuses | Struan Donald | 2012-10-01 | -1/+3 |
| | | | ||||
* | | | Merge branch 'centro' | Struan Donald | 2013-01-04 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: perllib/FixMyStreet/Cobrand/Default.pm | |||
| * | | | add id to category label to help with validation messages | Struan Donald | 2012-12-12 | -1/+1 |
| | | | | ||||
* | | | | Allow cobrand to pick default setting of name checkbox. | Matthew Somerville | 2012-12-19 | -2/+2 |
| |_|/ |/| | | ||||
* | | | Fudge German .po file to avoid gettext bug with single ampersands | Steven Day | 2012-12-10 | -1/+1 |
| | | | | | | | | | | | | Fix text in templates so that it can be translated and avoid issues with gettext | |||
* | | | Factor out update form on report pages, blank out for Zurich. | Matthew Somerville | 2012-12-07 | -166/+164 |
|/ / | ||||
* | | Merge branch 'stevenage' | Struan Donald | 2012-11-19 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore bin/make_css conf/crontab.ugly perllib/FixMyStreet/Cobrand/Default.pm perllib/Open311.pm templates/web/fixmystreet/around/postcode_form.html | |||
| * | | do not forget extra 311 field data if we need to display an error | Struan Donald | 2012-10-22 | -2/+2 |
| | | | ||||
* | | | Merge two _main templates to one, to help with comment on #350. | Matthew Somerville | 2012-11-04 | -18/+35 |
| | | | ||||
* | | | Move map not used text to template so we can use HTML in it | Struan Donald | 2012-10-26 | -0/+1 |
| | | | | | | | | | | | | | | | | | | and not have it escaped when it is displayed Fixed #350 | |||
* | | | Consolidate photo template to best one (fixes blank width/height). | Matthew Somerville | 2012-10-12 | -4/+6 |
|/ / | ||||
* | | Always use 'reopened', and don't set mark_open for Open311 received updates. | Matthew Somerville | 2012-09-05 | -7/+3 |
| | | ||||
* | | handle bad comment states due to open311 service request updates bug | Struan Donald | 2012-09-05 | -0/+1 |
| | | ||||
* | | handle re-opening of problems via open311 service requests updates correctly | Struan Donald | 2012-09-05 | -3/+6 |
|/ | | | | also small tweaks to display of update meta information | |||
* | Remove unused extra_* functions. | Matthew Somerville | 2012-08-16 | -1/+0 |
| | ||||
* | tweak text at start of report form for Bromley | Struan Donald | 2012-08-09 | -2/+1 |
| | ||||
* | small text updates for Bromley | Struan Donald | 2012-08-09 | -0/+2 |
| | ||||
* | allow preselection of category in url of new report page | Struan Donald | 2012-08-09 | -1/+5 |
| | ||||
* | Add NI sender, for handling cross-council road reports. | Matthew Somerville | 2012-07-20 | -0/+7 |
| | ||||
* | Move banner generation logic out of cobrand code and into templates. | Matthew Somerville | 2012-07-13 | -6/+23 |
| |