aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | Show actual report destination in confirm messageDave Arter2016-07-08-20/+6
|/ / | | | | | | | | | | | | | | | | | | | | For two-tier authorities, it is possible to send a report from a cobrand to an authority other than the cobrand's owner. If this is the case, then highlight it on the confirmation message along with a link to view the problem report on the main fixmystreet.com site. The Hart-specific template is no longer required.
* | [East Herts] Cobranded frontendDave Arter2016-07-08-1/+681
| | | | | | | | For mysociety/FixMyStreet-Commercial#773.
* | [Bristol] Only show Open311 categories on Bristol cobrandDave Arter2016-07-08-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | This adds a new Cobrand::Default::categories_restriction method that can be used to limit what categories are available when making a new report on a per-cobrand basis. This is used by Cobrand::Bristol to only show Open311 categories when making a new report on fixmystreet.bristol.gov.uk but allowing all categories on FMS.com. Also removes the Hart::hidden_categories and uses the new categories_restriction method to achieve the same thing.
* | Stub out calls to Gaze when running testsDave Arter2016-07-08-1/+4
| | | | | | | | The tests were running slowly because of gaze.mysociety.org's rate-limiting.
* | Merge branch 'issues/commercial/769-zurich-lv95'Dave Arter2016-07-08-602/+376
|\ \
| * | [Zurich] Don’t include unpublished photos in CSV exportDave Arter2016-07-08-1/+1
| | |
| * | [Zurich] Update help text & translationsDave Arter2016-07-08-34/+41
| | |
| * | Don’t cache geocoder results when STAGING_SITE is 1Dave Arter2016-07-08-4/+4
| | |
| * | [Zurich] Use new LV95/CH1903+ geocoder and base map tilesDave Arter2016-07-07-563/+330
|/ / | | | | | | | | | | | | | | | | | | | | - Use new `getLocation95` method for geocoding addresses - Replace Coordinates::CH1903 with Coordinates::CH1903Plus - Refactor Map::Zurich to use WMTSBase instead of duplicating code - Slightly refactor map templates to make using custom WMTS tiles easier - Use correct sizes for marker pins on maps Closes mysociety/FixMyStreet-Commercial#769. Closes mysociety/FixMyStreet-Commercial#768.
* | Add change_category_text cobrand hook.Matthew Somerville2016-07-06-26/+19
| |
* | [Oxfordshire] Use relative image paths in CSS.Matthew Somerville2016-07-06-13/+13
| |
* | Update changelog with version 1.8.4 details.Matthew Somerville2016-07-06-6/+27
| |
* | Fix two XSS vulnerabilities.Matthew Somerville2016-07-06-6/+6
| | | | | | | | | | | | | | | | | | The title in the OpenGraph header was not being properly escaped, and the hide pins/all pins links were using single quotes which were able to be broken out of. Also remove the single quotes around rss_feed_uri, though this is not a vulnerability as its contents were sanitised (postcode or co-ords).
* | Standardise footer UTM tracking with other sitesZarino Zappia2016-07-05-3/+3
| |
* | Fix CSRF issue with new login during process.Matthew Somerville2016-07-05-0/+4
| | | | | | | | | | | | If you had no session cookie, started reporting a problem, logged in through that process, you would then get a CSRF error as the token had been created before the session was.
* | Update OpenLayers image paths in templates.Matthew Somerville2016-07-04-25/+21
| | | | | | | | This was missed in 688169c.
* | Merge branch 'fix-admin-proxy'Matthew Somerville2016-07-04-503/+566
|\ \
| * | Remove need to customise OpenLayers built script.Matthew Somerville2016-07-04-376/+461
| | | | | | | | | | | | | | | This also allows the map to work in a proxied admin. Upgrade Angus OL to master branch code.
| * | Make sure map JS works through an admin proxy.Matthew Somerville2016-07-04-113/+104
| | | | | | | | | | | | | | | Tidy up use of absolute URLs when in the admin. Have the 404 handler spot static files in admin as a fallback.
| * | Use static files for validation_rules.js.Matthew Somerville2016-07-04-16/+3
| |/ | | | | | | | | No need for this to be generated via a template, it only differs occasionally by cobrand.
* / [Oxfordshire] Remove broken JS and update base URLMatthew Somerville2016-07-04-7/+1
|/
* Update wording about changing email/passwordabimysoc2016-06-30-7/+6
| | | Fixes #1440.
* [fixmystreet.com] Add theme-color meta element.Matthew Somerville2016-06-29-0/+1
|
* [UK Councils] Clarify who receives messages from the contact form.Dave Arter2016-06-29-0/+9
| | | | | The default wording says messages do not go to a council, which is not true for UK council cobrands.
* Merge branch '1347-fold-back-zurich'Matthew Somerville2016-06-29-184/+256
|\
| * Add external field editing to admin report edit.Matthew Somerville2016-06-29-70/+51
| | | | | | | | Show bodies for which details are missing, and any send method used.
| * Improve admin report edit page.Matthew Somerville2016-06-29-79/+160
| | | | | | | | | | Show map, break into two columns, fix display of sent time after clicking "Mark as sent", tidy up labels.
| * Tidy up some UK specific easting/northing handlingMatthew Somerville2016-06-22-38/+48
| |
| * Warnfix when admin editing user.Matthew Somerville2016-06-22-1/+1
| |
* | add UTM tags to links in standard mysociety footerMartin Wright2016-06-28-3/+3
| |
* | [Harrogate] Update to match harrogate.gov.uk designDave Arter2016-06-28-209/+957
| | | | | | | | Closes mysociety/FixMyStreet-Commercial#779
* | Break <header> into own template for overridingDave Arter2016-06-28-6/+7
| | | | | | | | | | This allows cobrands to more easily change the site header without needing to override the entire header.html template.
* | Use valid orientation flag for test imageDave Arter2016-06-27-5/+5
| | | | | | | | | | | | jhead 3.00 considers 0 an invalid value for EXIF orientation and will replace it with 1 when run with the -autorot flag. This was causing a test failure as the SHA hash of the sample image was being changed.
* | [UK] Update base urls for Harrogate, Stevenage.Matthew Somerville2016-06-27-3/+12
| | | | | | | | Default future unknown ones to HTTPS.
* | Use relative paths for photos on a report page.Matthew Somerville2016-06-27-2/+2
| |
* | [Warwickshire] Add image missing alt, https URL.Matthew Somerville2016-06-27-1/+1
| |
* | [Bristol] Add Google Analytics codeDave Arter2016-06-24-0/+17
| |
* | Reinstate missing margin before reporting form email inputZarino Zappia2016-06-24-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | `.form-box--logged-in-name` has no preceding heading, which meant the grey box background was colliding with whatever content happened to go before it. We add some margin, and while we’re at it, remove the extra margin-top on first-child labels (unnecessary, since .form-boxes have their own padding) and tidy up the syntax of the .form-box rule set. Fixes #1418.
* | Remove default box-shadow from .content and asideZarino Zappia2016-06-24-73/+24
|/ | | | | | | Fixes #1419. We also standardize on using `@include box-shadow()` where possible, and clearing out lots of now unnecessary box-shadow resets.
* Show any waiting reports on admin index page.Matthew Somerville2016-06-22-0/+23
|
* Allow admin to edit user's phone number.Matthew Somerville2016-06-22-2/+14
|
* [Zurich] Fix admin report page with base changes.Matthew Somerville2016-06-22-5/+13
| | | | Add missing class on updates.
* Merge branch 'alert-missing-id'Matthew Somerville2016-06-22-13/+10
|\
| * Catch alert subscription with missing ID.Matthew Somerville2016-06-20-13/+10
| |
* | Merge branch '1378-rotate-preview'Matthew Somerville2016-06-22-2/+190
|\ \
| * | Patch Dropzone to correctly orient preview images.Matthew Somerville2016-06-20-2/+190
| |/ | | | | | | | | | | Include a patch file, applied to Dropzone as of version e524e03c, that also includes our previous Opera patch from 445e9a3d. The new minified file is our cut-down exif.js plus the patched dropzone.js.
* | Merge branch '360-change-email'Matthew Somerville2016-06-20-225/+376
|\ \ | |/ |/|
| * Allow users to update their email address.Matthew Somerville2016-06-20-19/+184
| |
| * Improve CSRF tokens and add to more forms.Matthew Somerville2016-06-20-194/+172
| |
| * Improve auth flow taken when return key used.Matthew Somerville2016-06-20-5/+6
| |