aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* [UK] Correctly show and hide experimental .big-green-bannerZarino Zappia2018-03-20-0/+3
|
*-. Merge branches '2016-uk-green-banner-click-starts-report', ↵Zarino Zappia2018-03-20-25/+241
|\ \ | | | | | | | | | '2016-uk-green-banner-position-test' and '2021-uk-homepage-intent-experiment'
| | * [UK] Dual submit buttons on homepage postcode formZarino Zappia2018-03-20-5/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Present "report" vs "browse" choice at time of postcode entry, so we can track intent, as part of a temporary experiment into what people expect to see on the fixmystreet.com/around page. Google Analytics will be able detect which button was pressed by looking for the `intent=report` or `intent=report` query string param in the resulting pageview location. We supply a *third* submit button, immediately before the other two, and hidden from visual users and assistive devices, to prevent either of the "intent" submit values being sent when the user submits the form via the Return/Enter key. Part of #2021.
| | * [UK] Refactor $body-font variable in FMS.com layout.scssZarino Zappia2018-03-20-6/+8
| | |
| | * Only pass --record to Cypress if key available.Matthew Somerville2018-03-20-1/+1
| | | | | | | | | | | | On PRs from external forks, it won't be.
| | * Merge branch 'store-contributed-as'Matthew Somerville2018-03-20-12/+56
| | |\
| | | * Store contributed-as data.Matthew Somerville2018-03-20-12/+56
| | | | | | | | | | | | | | | | | | | | Store if the report/update was created by someone using the contributed-as dropdown, and use that information to perhaps not send report-sent emails.
| * | | [UK] Move big green button over map for GA Content ExperimentZarino Zappia2018-03-19-0/+52
| | | | | | | | | | | | | | | | Part of #2016.
* | | | Clicking "big green banner" on /around begins a reportZarino Zappia2018-03-20-0/+23
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Data collected by #2001 has shown that some people are clicking the big green "Click map to report a problem" banner on fixmystreet.com/around. We assume the same is true for other cobrands. As suggested in #2016, this commit adds a click handler to that banner element, which will begin a new report at the centre of the screen. It might not be the exact right location, but the pin can be repositioned from the /report/new form, and beginning a report is better than just soaking up the click and doing nothing.
* | | Merge branch 'fix-disappearing-sub-map'Matthew Somerville2018-03-20-7/+18
|\ \ \
| * | | Fix check for visible sub map links.Matthew Somerville2018-03-19-7/+18
| | |/ | |/| | | | | | | | | | | | | | | | | | | I don't think this check could ever have worked, because items are invisible if their parent is set to `display: none`, so it would hide the links bar if it was already hidden, and show it if it was already shown. Use a js- class for the movement of the feed item into the sub map links.
* | | [Zurich] Prefetch report users, cache body lookupsMatthew Somerville2018-03-19-2/+6
| | |
* | | Pass columns CSV needs into Problem->as_hashref.Matthew Somerville2018-03-19-21/+16
|/ / | | | | | | Then it can skip working out some things as they are not needed.
* / Fix disappearing large-width visited navigation.Matthew Somerville2018-03-19-0/+3
|/ | | | The change to base in fc172603 affected the layout display.
* Add browser testing symlink to `t` directory.Matthew Somerville2018-03-19-0/+1
|
* [Zurich] Make sure fixed states are translated.Matthew Somerville2018-03-19-2/+2
| | | | The code now uses this translation as the hard-coded way was removed.
* Merge branch '2023-bad-open311-dates'Matthew Somerville2018-03-16-4/+18
|\
| * Truncate dates in Open311 output to the second.Matthew Somerville2018-03-15-4/+18
| | | | | | | | This fixes #2023 by removing the comma.
* | Merge branch 'rutland-integration'Struan Donald2018-03-15-41/+1043
|\ \
| * | permit blank updates to be fetched over Open311Struan Donald2018-03-15-2/+81
| | | | | | | | | | | | | | | Add a per body configuration option to allow Open311 updates to contain only a status change, rather than emitting a warning when this happens.
| * | Deal with 'automated' Open311 service attributes.Struan Donald2018-03-15-5/+100
| | | | | | | | | | | | | | | | | | This is part of the integration with our open311-adapter. The automated property indicates that it's an expected value but either it's going to be set by the server, or appear as a hidden field.
| * | send multiple photos over open311Struan Donald2018-03-15-1/+93
| | | | | | | | | | | | | | | | | | | | | | | | Per cobrand configurable option to send multiple photos over open311 instead of just a single one. Does this by sending multiple media_url parameters in the POST body. The default remains to send the first photo associated with a report.
| * | [Rutland] cobrand files for RutlandStruan Donald2018-03-15-0/+199
| | | | | | | | | | | | | | | Web and email template changes, CSS plus cobrand file with open311 config
| * | fetch new problems over open311Struan Donald2018-03-15-35/+572
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the display of existing reports from the back end on FMS if the body is configured to do this. Reports will not be created if they are missing an id, a lat or a long, if the lat/long is outside the area covered by the body, if there is already a report with a matching id, or if we can't parse out the request time.
* | | [Zurich] Fix typo causing crash on /report/ajaxDave Arter2018-03-15-1/+10
| | |
* | | Fix JSON-encoding crash on /report/ajaxDave Arter2018-03-15-1/+13
|/ /
* | Merge branch 'add-cypress'Matthew Somerville2018-03-15-49/+272
|\ \
| * | Add Cypress testing.Matthew Somerville2018-03-15-44/+270
| | |
| * | Remove need for List::MoreUtils from setenv.plMatthew Somerville2018-03-15-5/+2
| | |
* | | Display ‘pick an option’ placeholder for report extra dropdownsDave Arter2018-03-14-2/+5
| | |
* | | Prevent override of mobile nav visited links.Matthew Somerville2018-03-14-0/+3
| | |
* | | Fix broken map when logging to /report/new with active asset layersDave Arter2018-03-14-36/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event handlers for category changing were being added too early, before fixmystreet.map had been created. For cobrands with category grouping enabled this was causing a crash in the JS because the grouping code emits a category change event during its setup (which runs between fixmystreet.assets.add and .assets.init). This commit adds the event handlers for each layer during fixmystreet.assets.init - at point at which fixmystreet.map has been set up. Also extracts the code for initing each layer into its own function for clarity.
* | | Allow searching for user reports if you have the user_edit permissionDave Arter2018-03-14-3/+13
| | | | | | | | | | | | | | | This allows users (e.g. customer service staff) to search for a user's reports in the admin without being able to edit them.
* | | Preserve category extra values when form fields are reloadedDave Arter2018-03-14-0/+4
|/ / | | | | | | | | This commit re-sets the values of any form inputs when the category extra elements are reloaded, e.g. when the category is changed.
* | Merge branch 'issues/commercial/987-zurich-csv-updates'Matthew Somerville2018-03-14-929/+756
|\ \
| * | [Zurich] Switch to more modern database states.Matthew Somerville2018-03-07-295/+263
| | | | | | | | | | | | | | | | | | | | | The Zurich code was written a long time ago, and used overriding so that e.g. the hard-coded 'investigating' state referred to Wunsch (wish). Now that states are stored in the database, we can create ones specially for Zurich and use them instead. Hooray!
| * | [Zurich] Fix display of deleted categories in admin.Matthew Somerville2018-03-07-5/+5
| | |
| * | [Zurich] Let SDM view awaiting reports.Matthew Somerville2018-03-07-10/+21
| | |
| * | [Zurich] Make wish state publicly visible.Matthew Somerville2018-03-07-20/+18
| | |
| * | [Zurich] Add abbreviation option to contacts.Matthew Somerville2018-03-06-8/+25
| | |
| * | Add a way to store extra cobrand data on contacts.Matthew Somerville2018-03-06-0/+10
| | |
| * | Remove category_options_copy.Matthew Somerville2018-03-06-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | This variable existed to keep a copy of the categories before it was overwritten by report_edit_location (if a bad location was provided) calling the variable setup functions again. But really, the function shouldn't be overwriting the stash, it's only testing the lookup and so should restore the stash at its end.
| * | [Zurich] Factor two admin category forms together.Matthew Somerville2018-03-06-28/+18
| | |
| * | [Zurich] Add fixture script.Matthew Somerville2018-03-06-441/+254
| | | | | | | | | | | | Remove old unused setup-contacts code, superceded by fixtures.
| * | [Zurich] Admin stats/CSV per category.Matthew Somerville2018-03-06-22/+49
| | | | | | | | | | | | Adapt look of default dashboard filtering.
| * | [Zurich] Include user email/phone/name in CSV export.Matthew Somerville2018-03-05-2/+7
| | |
| * | [Zurich] Refactor to use same CSV generation code.Matthew Somerville2018-03-05-111/+93
| | |
* | | Merge branch 'js-event-handling'Matthew Somerville2018-03-14-79/+80
|\ \ \
| * | | Update some tight JS coupling to use events.Matthew Somerville2018-03-13-72/+72
| | | | | | | | | | | | | | | | Remove 'hooks' functions, and Split out USRN handling to its own object.
| * | | Minor refactor of assets object.Matthew Somerville2018-03-13-7/+8
| | |/ | |/|