aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* [Zurich] Ignore deleted categories on change.Matthew Somerville2018-10-02-1/+1
| | | | | | | This led to an odd issue whereby a deleted category started being used for a category change, but only when the other category with the same name was edited (so thus changed the database's internal ordering).
* Merge branch 'issues/commercial/1188-push-state'Matthew Somerville2018-10-02-24/+205
|\
| * Fix history API bug.Matthew Somerville2018-10-02-9/+30
| | | | | | | | | | | | replace_query_parameter() was stringifying select multiples, meaning they were incorrectly recorded by the pushState and thus breaking on navigation.
| * Add some Cypress tests for the map list pages.Struan Donald2018-10-02-0/+122
| | | | | | | | | | | | | | | | Including testing the filters, viewing a report, and pushState. Plus a mock MapIt handler for returning a GeoJSON outline, to make the page load. The BASE_URL is also set to the same as the test server, as that is used in list link output.
| * Adapt fixture script to be non-random on request.Struan Donald2018-10-02-15/+53
| | | | | | | | | | The existing fixture script generates random results so is no use for front end testing.
* | [Vagrant] Ensure `local` directory is presentSam Pearson2018-10-02-0/+1
| | | | | | | | | | | | | | | | When using the mySociety Vagrant box, ensure that the `local/` directory is present before attempting to bind mount the pre-built Perl modules. Without this directory present the bind mount will fail and the Perl modules will all be built again unnecessarily.
* | Add check for PIDFILE to init script stop actionSam Pearson2018-10-02-1/+5
| | | | | | | | | | | | The install script calls a service restart at build, this failed if the stop action in the init script doesn't check for the existence of the PIDFILE first, so check.
* | HTML template for the "partial" report confirmation emailZarino Zappia2018-10-01-0/+23
| | | | | | | | Fixes #2263.
* | basic front end tests for responsive designStruan Donald2018-10-01-0/+69
|/ | | | checks what is shown/hidden at various screen sizes
* Do not die if old UPLOAD_DIR config given.Matthew Somerville2018-10-01-2/+2
| | | | The new lookup would only work if it was present.
* [Docker] Copy the preinit file from the local working copy at buildSam Pearson2018-10-01-2/+1
| | | | | | Rather than pulling across the preinit file from master, use the version in the copy of FixMyStreet on the image - this will then match the release actually being built.
* [Oxfordshire] Avoid nav menu CSS overlap for staff on mappageZarino Zappia2018-10-01-2/+7
| | | | Fixes mysociety/fixmystreet-commercial#1131
* [Oxfordshire] Update cobrand to match new OCCLSS style guideZarino Zappia2018-10-01-459/+680
| | | | | The change to web/js/front.js was required because Oxfordshire has no `.report-a-problem-btn`, so the front.js shouldn’t assume it’s there.
* Nicer image replacement for #nav-link mobile menu buttonZarino Zappia2018-10-01-2/+4
| | | | | | | | | | | The large negative text-indent can sometimes cause horizontal scrollbars in Right-to-Left languages, and, in some browsers, can also result in a huge :focus outline being drawn around the button and off to the right of the window. Setting a zero height, padding top, and overflow:hidden is a simpler way to achieve the same thing, and works regardless of text direction, text length, or focus state.
* Reduce specificity of #front_stats CSSZarino Zappia2018-10-01-53/+48
| | | | There is no need for #front_stats to always be nested inside of #front-howto.
* Improve vertical alignment of #main-nav in IE9-11Zarino Zappia2018-10-01-7/+99
|
* [Oxfordshire] omit reference number from report confirm pageStruan Donald2018-10-01-0/+1
| | | | | | | | The reference number is a) the FMS report id which is irrelevant and b) we don't get an OCC reference number back immediately so could not show it anyway. Related to mysociety/fixmystreet-commercial#1193
* [Open311] turn on comment sending for OCCStruan Donald2018-10-01-4/+16
| | | | | but only send if the problem as a customer reference and use that as the external id reference
* [Oxfordshire] remove open311 hardcodingStruan Donald2018-10-01-15/+1
| | | | | we no longer need some of the hardcoded oxfordshire Open311 overrides so remove them
* [Oxfordshire] display customer reference on report pageStruan Donald2018-10-01-4/+3
| | | | | OCC uses the customer reference from extra to store the enquiry reference so use that on the report page rather than external_id.
* [Open311] add customer reference from update to problemStruan Donald2018-10-01-0/+30
| | | | | If an Open311 update has a customer_reference property then add that to the metadata for the problem.
* [Dependencies] Add libxml2-dev to packages filesSam Pearson2018-09-28-0/+4
| | | | | This is required to build some of the Perl modules pulled in by the addition of `Net::Amazon::S3`.
* Missing semicolon.Matthew Somerville2018-09-28-1/+1
|
* [Docker] Update example config to support S3 file storageSam Pearson2018-09-28-3/+23
|
* [Oxfordshire] add WDM migration bannerStruan Donald2018-09-28-0/+8
|
* Merge branch 'pluggable-photo-storage'Dave Arter2018-09-28-148/+1433
|\
| * Add S3 photo storage backendDave Arter2018-09-28-86/+1204
| |
| * Factor out photo storage backend init checksDave Arter2018-09-28-18/+35
| |
| * Handle failure of photo upload more gracefullyDave Arter2018-09-28-2/+8
| |
| * Factor out photo storage into PhotoStorage::FileSystem backendDave Arter2018-09-28-59/+203
|/
* Fix failing inspector tool testsStruan Donald2018-09-28-0/+25
| | | | | Adds a mocked Oxfordshire cobrand permissions method that adds back in the permissions explicitly removed there.
* Merge branch 'issues/commercial/1192-pre-occ-go-live'Struan Donald2018-09-28-0/+34
|\
| * [Oxfordshire] remove access to inspector toolStruan Donald2018-09-28-0/+34
| |
* | Add issue/PR templates.M Somerville2018-09-28-0/+72
| |
* | [Docs] Initial documentation for Docker installationsMatthew Somerville2018-09-28-17/+108
| | | | | | | | | | | | This adds details of our Docker images and the example Docker Compose environment, including notes on how to use this with a cobrand and how to customise the database configuration.
* | [Docker] Support for cobrandsMatthew Somerville2018-09-28-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | This adds a script for loading cobrands into an instance of the FixMyStreet Docker container. A directory containing the necessary module, templates, css, etc should be mapped into the container at `/var/www/fixmystreet/cobrand` and activated by adding the cobrand to `ALLOWED_COBRANDS` as usual. See the documentation at https://fixmystreet.org/install/docker for more details.
* | [Docker] Initial Dockerfile & docker-compose setupSam Pearson2018-09-28-0/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes four containers: app, memcached, nginx, and postgres. The preinit script is used at container startup to ensure the database is initialised. Includes a volume for the Postgres database to permit persistence. Also sets the `PGDATA` variable to a subdirectory to support optional use of a filesystem mount. The repo/branch can be specified at build time. If `SUPERUSER_EMAIL` and `SUPERUSER_PASSWORD` are set when the FMS container starts the preinit script will pass these to `bin/createsuperuser` when it starts up. These have been set to test values in the supplied Docker Compose configuration. Reverse proxy issue =================== If nginx and fms were on the same machine, ReverseProxy would automatically be in use, but via docker containers they are not. Do we need to force it to be switched on? Let's see. There are four possible options, with their outcome: * port not in Host, ReverseProxy not in use Anything using the automatically-generated base instead of BASE_URL uses port 9000, meaning those links don't work. * port not in Host, ReverseProxy in use Anything using the automatically-generated base instead of BASE_URL uses port 80, meaning those links don't work (they would if you had docker-compose listen on port 80, being then a similar situation to e.g. the AMI image). * port in Host, ReverseProxy not in use This works *unless* the port is 80, just to be contrary to the above; in that case it is stripped and :9000 is put back on, meaning those links again don't work. I realise we use 8000, but would be confusing if someone tried it out. * port in Host, ReverseProxy in use This works in all scenarios, and thus is what we go with.
* | [Docker] Support Docker builds in install scriptsSam Pearson2018-09-28-16/+48
| | | | | | | | | | | | | | - Adds support for additional variables intended to control when to install postfix and postgres. - Skips nginx setup and integration when performing a docker build. - Don't print usage during docker build
* | [Docs] Update docs about docs.Matthew Somerville2018-09-28-6/+6
| |
* | Vagrant: Use the mysociety/fixmystreet box by defaultSam Pearson2018-09-28-21/+48
|/ | | | | | | | | | | | | This sets the default box to be `mysociety/fixmystreet` and provides an optional argument, `--base-box`, that can be used to override this. When using the `mysociety/fixmystreet` box, the Perl modules are prebuilt in `/usr/share/fixmystreet/local` and are bind-mounted into `/home/vagrant/fixmystreet/local`. This ensures that these are compatible with the guest machine and speeds up an initial launch. The `mysociety/fixmystreet` box is also based on Debian Stretch so is a closer match to our current production environment.
* [Docs] Fix jshint warnings.Matthew Somerville2018-09-27-20/+20
|
* Move docs from gh-pages branch.Matthew Somerville2018-09-27-0/+15178
|
* Switch to direct app server, not FastCGI.Matthew Somerville2018-09-26-27/+39
|
* Merge branch 'cobrand-check-fn'Matthew Somerville2018-09-26-0/+167
|\
| * Script for template cobrand checks when upgrading.Matthew Somerville2018-09-20-0/+167
| |
* | Merge branch 'body-list-speedup'Matthew Somerville2018-09-25-26/+122
|\ \
| * | Speed up fetching lists of bodies.Matthew Somerville2018-09-25-26/+122
| |/ | | | | | | | | | | Use a HashRefInflator wherever all_sorted is used, with consequential changes to deal with it now not being an object (e.g. add some with_* functions for manual fetching of extra data).
* | [BANES] Include Blackhole send method categories in cobrandDave Arter2018-09-25-0/+1
| |
* | Add Blackhole send methodDave Arter2018-09-24-0/+63
| |
* | [Lincolnshire] Remove UA string from contact emailsDave Arter2018-09-24-0/+49
|/ | | | For mysociety/fixmystreet-freshdesk#16.