| Commit message (Collapse) | Author | Age | Lines |
|
|
|
|
|
|
|
|
| |
Historically, the extra field has been used in two different ways by
different cobrands, both as a list (e.g. Open311 category fields) and a
hash (e.g. the Zurich cobrand).
This commit consolidates usage, adding an API to make use of the field
easier and always returning a hash for the code to use. Fixes #1018.
|
|
|
|
|
| |
This is now handled by normal bodies in the admin. In order to remove
references in send_reports, tidy up (unused) EmptyHomes code a bit.
|
| |
|
| |
|
|
|
|
|
| |
This means that e.g. SMTP authentication is used when set up by all
emails, not just non-cron ones. Fixes #988.
|
|
|
|
|
|
|
|
|
| |
The body-based alert only works if the body ID matches the MapIt ID.
This fixes #959. Further work needs to be done to enable proper
body-based alerts that work properly in all circumstances.
Consequently, factor out fixed body IDs from many tests.
Also fix a couple of tests not overriding geocoder correctly.
|
| |
|
| |
|
|
|
|
| |
And FixMyStreet.com specific open questionnaire page.
|
|
|
|
| |
Add some comments to the top of the open311 bin scripts.
|
|
|
|
|
| |
The call to set_lang_and_domain needs to happen before
the first string is translated (the report state).
|
| |
|
|
|
|
|
|
| |
Put alerts in default cobrand, so changes to other cobrand email
templates don't affect the test; and clean up at the end of the
test so that it can be rerun without issue.
|
| |
|
| |
|
|
|
|
|
| |
This is for consistency as Sub::Override is used for another test and
also so we minimise the number of modules installed just for testing
|
|
|
|
|
|
|
|
| |
The first email count test in the abuse subtest was failing on Travis
but not on my machine because the sent email alert test was running on
my machine, as it has the mock module installed, and this was resetting
the bodies_str to one with a confirmed contact. Setting bodies_str on
both these tests stops this sort of thing happening again
|
|
|
|
|
|
| |
In order to allow the iOS app to be tested in the app store we need to
allow the user to create a report but we don't want to send it. To allow
this hide reports with a specific title during send_reports
|
|
|
|
|
|
| |
Reports that have been created by a user who is logged in but whose
email is in the abuse table should be hidden and not sent by
send_reports.
|
|
|
|
| |
as expected
|
| |
|
| |
|
|
|
|
|
| |
Update for change to bodies_str, make sure sent_fail_count 0 and update
standard template variables
|
|
|
|
| |
database.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
than one body.
|
| | |
|
| |
| |
| |
| | |
Add foreign key constraint from contacts to body.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
NB: planned still listed in some places to account for old reports
some test coverage improvements
|
| |/
|/| |
|
| |
| |
| |
| |
| | |
This is so they can more easily update, especially if the update they've
just received has mistakingly 'fixed' the report. This fixes #7.
|
|/
|
|
| |
plan' warning.
|
|
|
|
| |
present.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
site if sending alerts about problems not covered by the
cobrand.
Also remove cobrand restriction from local area alerts
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
|
| |
| |
| |
| | |
my stupid use of c as a variable.
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|