aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | Merge branch 'issues/commercial/1917-fix-template-unicode'Matthew Somerville2020-06-10-4/+7
|\ \
| * | Fix double encoding of per-category templates.Matthew Somerville2020-06-09-4/+7
| |/ | | | | | | | | encode_json encodes to UTF-8, and then he output was being encoded again.
* | [TfL] Update front page text.Matthew Somerville2020-06-10-2/+3
| |
* | [fixmystreet.com] Include script nonce in new script element.Matthew Somerville2020-06-09-1/+1
| |
* | Add recaptcha config option to example file.Matthew Somerville2020-06-09-0/+3
| |
* | Merge branch 'recaptcha'Matthew Somerville2020-06-09-0/+84
|\ \
| * | [fixmystreet.com] Add option for recaptcha.Matthew Somerville2020-06-04-0/+70
| | | | | | | | | | | | | | | We are getting spam submissions of e.g. alert subscribe form, which causes people to get a confirmation email.
| * | Add user_country call that uses Gaze.Matthew Somerville2020-06-03-0/+14
| | |
* | | Merge branch 'alert-active-deletion'Matthew Somerville2020-06-09-2/+25
|\ \ \ | |_|/ |/| |
| * | Store staff user when staff make anonymous update.Matthew Somerville2020-06-03-0/+7
| | | | | | | | | | | | Match the identical code for anonymous reports.
| * | Ignore body users when anonymizing.Matthew Somerville2020-06-03-0/+6
| | |
| * | [fixmystreet.com] State account deletion policy.Matthew Somerville2020-06-03-2/+4
| | |
| * | Mark user as active when sent an email alert.Matthew Somerville2020-06-03-0/+8
| |/
* | Add Open Location Codes support to search box.M Somerville2020-06-04-0/+67
| |
* | Small refactor of around.t, add "lat,lon" test.M Somerville2020-06-04-63/+32
| |
* | [Open311] Do not remove any devolved contacts.Matthew Somerville2020-06-04-25/+46
|/
* [UK] Remove Somerset West and Taunton special destination handlingDave Arter2020-05-29-37/+0
|
* [TfL] Update COVID-19 homepage messagingChris Mytton2020-05-29-2/+0
|
* Merge branch 'he-still-bit-buggy-grr'Matthew Somerville2020-05-27-30/+39
|\
| * Make sure category shown in all its groups.Matthew Somerville2020-05-26-7/+12
| | | | | | | | | | | | | | | | When compiling the reporting category dropdown, only one instance of each value was used. But if a value appears twice, from two different bodies, in different groups, it would then not appear in all the groups it would be expected to. Make sure we update the list of groups of the category if we come across another with the same value.
| * Consistent use of Contact groups.Matthew Somerville2020-05-26-23/+27
| |
* | Fix update-schema constraint check on Postgres 12Dave Arter2020-05-27-1/+2
|/ | | | | pg_constraint.consrc has been removed in Postgres 12, and this is the recommended replacement. See https://www.postgresql.org/docs/12/release-12.html
* [Docs] Update Gemfile.lock to current GitHub pagesMatthew Somerville2020-05-26-18/+18
|
* Merge branch 'js-coverage'Matthew Somerville2020-05-26-4/+76
|\
| * [Borsetshire] Add front end tests.Matthew Somerville2020-05-19-0/+21
| |
| * Add --coverage option to browser-tests.Matthew Somerville2020-05-19-4/+55
| | | | | | | | You need to install the @cypress/code-coverage package alongside cypress.
* | [fixmystreet.com] Update company details in footerZarino Zappia2020-05-26-10/+21
| | | | | | | | And in couple of cobrand templates.
* | Include updates in failure summary report.Sam Pearson2020-05-26-5/+34
|/ | | | This includes details of any failing updates in the summary script.
* Merge branch 'various-manual-updates'Matthew Somerville2020-05-15-41/+94
|\
| * [Docs] document per category anonymous reportingStruan Donald2020-05-13-0/+4
| | | | | | | | Also update the category page screenshot to include the new options
| * [Docs] Tiny bit on web app.Matthew Somerville2020-05-12-4/+8
| |
| * [Docs] Bit on staff-only categories.Matthew Somerville2020-05-12-0/+5
| |
| * [Docs] Add info about two-factor auth.Matthew Somerville2020-05-12-0/+22
| |
| * [Docs] Add info about user timeline.Matthew Somerville2020-05-12-17/+7
| |
| * [Docs] Clarify a few different sections of manual.Matthew Somerville2020-05-12-13/+16
| |
| * [Docs] Document HTTPS dev server.Matthew Somerville2020-05-12-0/+14
| |
| * [Docs] Heatmap, tidy stats section.Matthew Somerville2020-05-12-7/+18
| |
* | Merge remote-tracking branch ↵Matthew Somerville2020-05-15-235/+125
|\ \ | | | | | | | | | 'origin/issues/commercial/1835-geolocation-button-styling'
| * | Sass variables for customising links in #front-mainZarino Zappia2020-05-15-60/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The colour and text decoration of links inside `#front-main` can now be customised via `$primary_link_*` Sass variables. Text decoration is set in _base.scss (like global link text decoration) while colour is handled in _layout.scss (which is where `#front-main` is given its background colour, so likely also the time you’ll want to set a contrasting colour for links inside it). The colour variables are set to `null` by default, meaning that no colour or rules for those links will be compiled, enabling the links to inherit the global link colour style, which previously wasn’t possible. The decoration variables are set to `underline` by default, because most cobrands set their #front-main links to be the same colour as the surrounding text, so adding an underline is a sensible default. You can disable the underlines by setting `$primary_link_decoration: none` in your cobrand’s _colours.scss file, as cheshireeast and oxfordshire do. Fixes #3007.
| * | Simplify #geolocate_link stylingZarino Zappia2020-05-15-219/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Much less opinionated styling for #geolocate_link in core, which means the link should look better, by default, for most cobrands. (In particular, the link looks much better on cobrands with the more modern style of white / off-white #front-main background, such as highwaysengland, which was the cobrand that started off this work to begin with.) I’ve also reduced the specificity of the #geolocate_link rulesets in both core and all the cobrands. While this commit means that fewer cobrands need to override styles on #geolocate_link, there are still 8 cobrands that have to define a custom text colour for their #geolocate_link, because they both: A) have a light coloured background for #front-main, and B) want their #geolocate_link to be coloured like a normal link, rather than inheriting the text colour of the parent element. We might want to revisit this handling of #geolocate_link colouring and the `#front-main a { color: inherit }` rule in _layout.scss at some point in the future. Fixes mysociety/fixmystreet-commercial#1835.
* | | reset asset select message by id when asset unselectedStruan Donald2020-05-15-2/+39
|/ / | | | | | | | | | | | | | | | | | | Resetting using the class could cause an incorrect "you can pick an $item from the map" message to be display when asset_groups were being used. This was happening when the unselect event was firing after the category change event and then updating the new message using the message from the unselected layer. Fixes mysociety/fixmystreet-commercial#1888
* | [Hart] Update front page suggested report typesDave Arter2020-05-14-1/+1
| | | | | | | | For https://github.com/mysociety/fixmystreet-commercial/issues/1875
* | [Peterborough] Show lighting layer on ‘Lighting enquiry’ category in all ↵Dave Arter2020-05-14-1/+4
| | | | | | | | groups
* | Merge branch 'dynamic-year-in-map-copyrights'Chris Mytton2020-05-13-3/+4
|\ \ | |/ |/|
| * Make year in map copyright notices dynamicChris Mytton2020-05-12-3/+4
| |
* | admin interface for per category anonymous reportingStruan Donald2020-05-12-3/+134
|/ | | | | | | | Add an interface to enable a category to accept anonymous reports, plus the code to handle permitting this. It's only available on single body cobrand sites in the default configuration.
* [Peterborough] Add street lights asset layer.Matthew Somerville2020-05-12-0/+54
| | | | Enforce asset selection, except for light-not-on-map category.
* [UK] Factor all labelled select code together.Matthew Somerville2020-05-12-123/+59
|
* Add contact handling to export-import-data scriptDave Arter2020-05-12-1/+46
| | | | For https://github.com/mysociety/fixmystreet-commercial/issues/1856
* display user detail for contributed_by in report_editStruan Donald2020-05-12-0/+39
| | | | Include name, email and body rather than just user id.