aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Version 3.0.v3.0Matthew Somerville2020-03-04-43205/+59048
|
* Use existing loc() so translations find strings.Matthew Somerville2020-03-04-79/+69
| | | | | The gettext-extract script looks for loc() in templates, it did not find the loc_js() calls.
* Update translations from Transifex, with tweaks.Matthew Somerville2020-03-04-912/+969
| | | | Tweaks due to stopping using HTML entities in a number of places.
* Merge remote-tracking branch ↵Matthew Somerville2020-03-03-37/+28
|\ | | | | | | 'origin/issues/commercial/1659-bromley-shortlist-css-bug'
| * [Bromley] Reduce specificity of button stylingZarino Zappia2020-03-02-32/+7
| | | | | | | | | | | | | | Brings Bromley more in line with how other cobrands do their button styling, and also fixes mysociety/fixmystreet-commercial#1659 (where Bromley’s high-specificity input styles were causing the shortlist "star" input to display as a regular button).
| * Better background and border handling in button-variant() Sass mixinZarino Zappia2020-03-02-5/+21
| | | | | | | | | | | | | | | | | | | | A couple of small fixes to tidy the output of button-variant() and make it easier to style up flat, borderless buttons. * If $bg-top and $bg-bottom are identical, no linear-gradient() will be generated. Same goes for $hover-bg-top and $hover-bg-bottom. * If $border or $hover-border are `false`, then it’s assumed you don’t want a border, and `border: none` will be generated.
* | Merge branch 'staging-js'Matthew Somerville2020-03-03-20/+14
|\ \
| * | [UK] Use staging hosts on some staging sites.Matthew Somerville2020-03-03-18/+9
| | |
| * | Add map staging flag for client side to use.Matthew Somerville2020-03-03-1/+4
| | |
| * | [Bexley] Use live tilma for trees.Matthew Somerville2020-03-03-1/+1
| | |
* | | Merge branch 'mysociety-delivery' of https://github.com/Sambruk/fixmystreetMatthew Somerville2020-03-03-231/+33
|\ \ \ | |/ / |/| |
| * | [FixaMinGata] Updates the link in the footer to information for councils.Joe Siltberg2020-03-03-1/+1
| | | | | | | | | | | | For some unknown reason the redirect we've had sometimes fails.
| * | [FixaMinGata] Removes another unused and unmaintained template.Joe Siltberg2020-03-03-143/+0
| | |
| * | [FixaMinGata] Clean-up in the templates.Joe Siltberg2020-03-03-85/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed needless differences, or files where there weren't really any differences between fixamingata and base. Also made our site more like base by moving stuff we had in footer.html to footer_extra.html and stuff we had in front/recent.html to front/footer-marketing.html. Should hopefully make the templates easier to maintain.
| * | [FixaMinGata] Removes old video for the front pageJoe Siltberg2020-03-03-0/+0
| | |
| * | [FixaMinGata] New video for the front pageJoe Siltberg2020-03-03-3/+3
| |/
* | [Vagrant] Add local testing box to provisioning conditionalSam Pearson2020-03-03-1/+1
| | | | | | | | | | For local testing, we'll now treat a box named `fms-local` as if it was the Vagrant Cloud box.
* | [script/bootstrap] Keep OS packages updated in development environmentsSam Pearson2020-03-03-0/+24
|/ | | | | | | | | | | This adds a script, `bin/install_packages`, that will install packages listed in versions of `conf/packages*` and calls it from the bootstrap script in a way appropriate to the environment it is being run under. This should ensure that, for example, changes to dependencies will be applied to Vagrant machines in-between tagged releases. The default packages file used will be `packages.generic`.
* Merge branch 'check-filter_category-on-new'Matthew Somerville2020-02-28-0/+3
|\
| * Also check filter_category for category choice.Matthew Somerville2020-02-26-0/+3
| | | | | | | | | | | | | | If you submit the non-JS image map from an around page with a particular category selected, that is sent to the server in filter_category and should be checked to see if we can pre-fill the category dropdown on new report.
* | Merge branch 'admin-only-categories'Matthew Somerville2020-02-27-270/+390
|\ \
| * | Add a new "staff" contact state.Matthew Somerville2020-02-26-7/+111
| | | | | | | | | | | | | | | This state will appear when reporting if you are logged in as a staff member of the relevant body, but otherwise not appear on the site.
| * | Move staff report new tests to separate file (no changes).Matthew Somerville2020-02-26-203/+227
| | |
| * | [IsleOfWight] Factor together some identical code.Matthew Somerville2020-02-26-51/+12
| | |
| * | [Bexley,TfL] Search all contacts for groups.Matthew Somerville2020-02-26-2/+2
| | | | | | | | | | | | Might be exporting data for old categories.
| * | Fix password setting in createsuperuser script.Matthew Somerville2020-02-26-8/+39
| |/
* | [Buckinghamshire] Change "Name" to "Full name" on formsChris Mytton2020-02-26-0/+27
| | | | | | | | | | | | Since we require the user to enter their full name Buckinghamshire have asked us to change the text to "Full name" to make it clearer that the full name is required to complete the form.
* | [fixmystreet.com] Remove theme-color meta tagDave Arter2020-02-26-1/+0
| | | | | | | | This is under the assumption it will be replaced by a manifest theme on fixmystreet.com
* | Use ManifestTheme theme_colour for front page theme-color meta tagDave Arter2020-02-26-40/+60
| |
* | Cache available icons for front pageDave Arter2020-02-26-21/+38
| | | | | | | | This saves hammering the FS for every front page request
* | Show available cobrands in dropdown on FMSDave Arter2020-02-26-7/+13
| | | | | | | | | | | | | | For some reason switching to a Select stopped the update_model changes being applied when persisting the model, meaning the INSERT query failed because the cobrand column was null. This commit switches to a hidden input field for the cobrand which I’m not super keen on, but it does get the job done...
* | Add manifest icon management to admin formsDave Arter2020-02-26-11/+199
| |
* | Add admin UI for configuring manifest themeDave Arter2020-02-26-0/+453
| |
* | Use cobrand manifest icons as iOS icons, if presentDave Arter2020-02-26-18/+34
| |
* | [Docs] Update Gemfile.lock to current GitHub pagesMatthew Somerville2020-02-26-148/+188
| |
* | Optional logging of unsuccessful location searchesZarino Zappia2020-02-26-0/+27
| | | | | | | | | | | | | | | | | | If a SQLite file exists at `../data/analytics.sqlite` with a table named `location_searches_with_no_results`, then a row will be created for each /around search that returns no results. Could come in useful for anybody running an instance and looking to better understand how well their geocoder is performing.
* | Fix error hiding user's updates with no confirmed.Matthew Somerville2020-02-26-1/+12
| | | | | | | | | | | | If a user had no confirmed updates, but did have e.g. an unconfirmed update that had mark_fixed set, you would get an error when trying to hide the user's reports/updates.
* | Fix filter_group picking if category group a list.Matthew Somerville2020-02-26-1/+4
| |
* | [Buckinghamshire] Ignore TfL as a district.Matthew Somerville2020-02-26-1/+1
|/
* [TfL] Restrict all reports areas to London.Matthew Somerville2020-02-24-1/+18
|
* [TfL] Allow bus stop reports outside London.Matthew Somerville2020-02-24-8/+334
| | | | | | | | | | | | | After this change, you can safely add the TfL body to other councils (namely the ones surrounding London that include TfL bus stops); clicking in those councils on other cobrands will have no change, as the TfL body will be fully ignored on a non-London council, but on the TfL cobrand it will allow it for e.g. the selection of bus stops outside London. It removes the body rather than just all its categories to prevent a "We do not have details of the other body covering this area" message appearing.
* [Peterborough] Switch to live tilma for tree assetsChris Mytton2020-02-20-2/+2
|
* [Peterborough] Ensure trees and tree groups share the same configChris Mytton2020-02-20-19/+16
| | | | | | | | | | | | This fixes a bug where the new tree plantings group was requiring a tree group to be selected, which isn't the desired behaviour. The bug was caused by the group layer not having the same `relevant` function as the points layers. This adds the shared bits into a shared config that the assets both use. Also hide the asset item message for request to plant a new tree category.
* [Peterborough] Force users to select assets for treesChris Mytton2020-02-20-2/+23
| | | | | We always want a tree code for tree reports, so add the code needed to make the asset selection step mandatory.
* [Peterborough] Add tests for custom Open311 behaviourChris Mytton2020-02-20-0/+79
| | | | | | Checks that the correct bits of the problem's extra fields are sent when creating the report in Open311, and that extra bits of info are sent when sending comments to Open311.
* Add --group flag to add_emergency_message scriptChris Mytton2020-02-20-0/+5
| | | | | | | | This allows you to restrict the message to a certain group of categories. This is so we can add a "is this problem on private land" message to the categories in the "Trees" group for Peterborough.
* [Peterborough] Disable pin snapping for new tree requestsChris Mytton2020-02-20-2/+26
| | | | | | | | | | | | | | | | | We don't want to plant trees where there are already trees, so we add a separate layer for new tree requests, and disable pin snapping for that layer. This adds a new option for layers named "relevant". If provided it will be called with an options object, allowing you to check ".category" and ".group" and return a boolean for whether you want to display the layer based on the passed options. Note: You still need to provide an "asset_group" option even if you use the "relevant" option as this is used elsewhere. The "regular" tree-points layer uses this to exclude just the new trees subcategory from being displayed.
* [Peterborough] Add tree layersChris Mytton2020-02-20-0/+32
| | | | Two layers, one for tree points, the other for tree groups.
* [Peterborough] Don't send private_land info to open311Chris Mytton2020-02-20-1/+2
| | | | | | This field is shown in the FMS interface, but doesn't need to be sent to open311, it's just to check that the user isn't reporting problems on private land.
* [Peterborough] Include service code in open311 updatesChris Mytton2020-02-20-0/+3
| | | | | This is needed to route reports correctly when using the "Multi" backend.