aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
| |
| * Add forgotten password help to general auth page.Matthew Somerville2016-06-20-2/+9
| | | | | | | | Match the help given in new report/update form.
| * [Bromley] Tweak questionnaire email text.Matthew Somerville2016-06-20-5/+5
| | | | | | | | Match more the default email. Fixes #1115.
* | Merge branch 'issues/commercial/766-bristol-cobrand'Dave Arter2016-06-17-4/+7613
|\ \
| * | [Bristol] Use BCC's base map tilesDave Arter2016-06-17-0/+732
| | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the Map::Zurich module into something that makes it easier to use custom map tiles for a cobrand. This also includes some refactoring of the JS & map templates to make it easier to use a custom WMTS base map in future cobrands.
| * | [Bristol] Bristol City Council cobrand frontendDave Arter2016-06-17-4/+6881
|/ / | | | | | | For mysociety/FixMyStreet-Commercial#766.
* | Improve Open311 handling of bad attribute data.Matthew Somerville2016-06-17-1/+1
| | | | | | | | | | We have seen e.g. an endpoint that is returning 'serviceAttributes' as the child of 'attributes', rather than 'attribute'.
* | Merge branch 'drop-ie6-fix-ie7'Matthew Somerville2016-06-17-239/+35
|\ \
| * | Fix display in IE7, including front page text.Matthew Somerville2016-06-15-0/+1
| | | | | | | | | | | | | | | .tablewrapper was sometimes losing its background, it needs to be given hasLayout.
| * | Remove most IE8 special cases.Matthew Somerville2016-06-15-60/+12
| | | | | | | | | | | | | | | | | | Document the couple that are left, and fix the display of the logo with a simpler positioning/ less overriding. Drop a needless usage of 'rem' to make things a bit easier there too.
| * | Remove all IE6 special cases.Matthew Somerville2016-06-15-180/+23
| | |
* | | Don't update the map pins if a new report started.Matthew Somerville2016-06-17-0/+11
| | |
* | | Fix Open311 service code check.Matthew Somerville2016-06-17-1/+1
| | | | | | | | | | | | The service code could be "0".
* | | Fix check for old-style parsed XML.Dave Arter2016-06-16-1/+9
| | | | | | | | | | | | | | | It errored on new-style parsed XML, rather than let it through. Add a new category to the test that highlights this.
* | | Merge branch 'open311-improvements'Matthew Somerville2016-06-15-94/+62
|\ \ \