aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | 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.
* Merge branch 'tfl-category-restrictions'Matthew Somerville2020-05-12-42/+201
|\
| * Extend assigned_*_only to report lists.Matthew Somerville2020-05-08-7/+64
| | | | | | | | | | Shortlist buttons and extended print information will not appear where not allowed.
| * Add assigned_(users|categories)_only functionalityMatthew Somerville2020-05-08-9/+118
| | | | | | | | | | | | | | | | Users with assigned_categories_only will only see staff features on a report page in their assigned categories. Users will only see staff features on a report page in a category with assigned_users_only if it is in their assigned categories.
| * Refactor report page permissions.Matthew Somerville2020-05-07-27/+18
| | | | | | | | | | Look up user's permissions once at the start, and use that throughout the report page templates.
| * In category admin, group already shown elsewhere.Matthew Somerville2020-05-07-0/+2
| | | | | | | | | | | | Groups have their own special admin section above, so no need to show it in the extra data list (especially as if it is in more than one group it only shows a reference).
* | Disable rename on unprotected Open311 categories.Matthew Somerville2020-05-11-5/+52
|/ | | | | | If you rename an Open311 category when it is not protected, it will only get reinstated/deleted by the Open311 populate script shortly after, and can cause issues due to the problem category renaming that occurs.
* [Buckinghamshire] Stop hiding staging banner.Matthew Somerville2020-05-07-4/+0
|
* Merge branch 'fix-dashboard-report-csv'Matthew Somerville2020-05-07-3/+7
|\
| * Fix dashboard report CSV export.Matthew Somerville2020-05-07-3/+7
| | | | | | | | | | | | The change to join in e16054150 did not include a collapse that the previous prefetch was doing, so multiple rows per result were being returned.
* | [TfL] Add new pavement overcrowding categoryDave Arter2020-05-07-0/+2
|/ | | | | | TLRN-only. For https://github.com/mysociety/fixmystreet-commercial/issues/1883
* Merge branch 'category-group-in-csv'Matthew Somerville2020-05-07-61/+37
|\
| * Include group in CSV export if enabled.Matthew Somerville2020-05-07-61/+37
| |
* | Add way to disallow report reopening in a categoryMatthew Somerville2020-05-07-3/+51
|/ | | | | Add a tickbox to the category admin, and do not allow reopening on reports made in the selected categories.
* Merge branch '2991-updates-on-categories'Matthew Somerville2020-05-07-96/+179
|\
| * Add ability to disallow updates in a category.Matthew Somerville2020-05-06-24/+48
| | | | | | | | | | Add a tickbox to the category admin, and do not allow updates on reports made in those selected categories.
| * Move per-row Contact lookup to the database.Matthew Somerville2020-05-06-72/+131
| | | | | | | | | | | | | | | | | | | | | | On admin report lists, and in front-end lists when an inspector, each row was querying the database for `category_display`. We create a new relationship for this query, and join/prefetch it wherever we request this data. Include staff joins on /around page, copying what happens on /reports to prevent more lookups there too. Also add some joins for user email in admin report list.
* | Merge branch 'version-3.0.1'v3.0.1Matthew Somerville2020-05-06-4286/+4229
|\ \
| * | Version 3.0.1.Matthew Somerville2020-05-06-4286/+4229
| |/
* / [Bristol] Add admin_user_domainDave Arter2020-05-06-0/+2
|/ | | | Fixes https://github.com/mysociety/fixmystreet-commercial/issues/1882
* [East Sussex] Fix sending of notices, tidy up.Matthew Somerville2020-05-06-18/+52
| | | | | variable is the string 'true' or 'false' from Open311. Store the original detail so we can reset back to it more easily.
* Fix breaking test.Matthew Somerville2020-05-06-1/+1
| | | | The change in cc2b8f54 made a typo in the default argument.