aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * 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
|\ \ \
| * | | Improve template check for extra Open311 fields.Matthew Somerville2016-06-15-2/+1
| | | |
| * | | Fail nicely if Open311 response lacks service codeMatthew Somerville2016-06-15-6/+10
| | | |
| * | | Tidy up Open311 XML handling.Matthew Somerville2016-06-15-86/+51
| | | | | | | | | | | | | | | | | | | | Parse the XML in such a way other parts of the code do not have to worry about single-value folding or the like.
* | | | Remove stringify call from template pathsDave Arter2016-06-15-11/+11
| | | |
* | | | [UK Councils] Send correct confirm emails for updatesDave Arter2016-06-15-10/+100
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some UK councils with Open311 integrations (e.g. Bromley) have a custom wording in the confirmation email sent when updates are left on reports, to make the user aware that the update is sent to the council in question. Bromley noticed that some emails were being sent without this wording, leading at least one user to contact the council directly about the report. It turns out that although the email template contains an IF clause to use the appropriate wording for Bromley (and Stevenage) reports, the incorrect template file was being used when updates were made via the Bromley cobrand. This commit solves the problem by introducing a new `Cobrand::Default::path_to_email_templates` method, which is overridden by `Cobrand::UKCouncils` to include the `templates/email/fixmystreet` path. Paths returned by this method are used as the `additional_template_paths` param when templating emails. A regression test is included. Additionally moves email templates for fixmystreet.com to a directory name reflecting their purpose, in the same way the web templates are arranged.
* | | [fixmystreet.com] Fix broken goodies CSS.Matthew Somerville2016-06-15-4/+8
| | | | | | | | | | | | Stop sidebar overlapping footer, and giving footer heading a top border.
* | | [fixmystreet.com] Fix broken goodies JavaScript.Matthew Somerville2016-06-15-1/+1
| |/ |/|
* | Latest Norwegian translation from Transifex.Matthew Somerville2016-06-13-21/+20
| |
* | [Angus] Move code to better (working) location.Matthew Somerville2016-06-13-1/+1
|/
* Update changelog.Matthew Somerville2016-06-08-1/+5
|
* Fix display of close arrow/cross when drawer open.Matthew Somerville2016-06-08-12/+20
| | | | | The 'cross' at mobile widths was not displaying, and the icon was not changing to a down arrow at larger widths.
* Merge remote-tracking branch 'mysociety/1422-fix-non-js-filter'Matthew Somerville2016-06-08-3/+6
|\
| * Redirect correctly if filter used sans JavaScript.Matthew Somerville2016-06-08-3/+6
| | | | | | | | | | It was being treated as a new report and showing errors, rather than showing you the same page with updated filters. Fixes #1422.
* | [East Sussex] Rewrite template builder in perl.Matthew Somerville2016-06-08-96/+96
| | | | | | | | Uses same watch notification as make_css.
* | Move some cobrands into separate repository.Matthew Somerville2016-06-08-703/+2
| |
* | Follow symlinks in make_css.Matthew Somerville2016-06-08-1/+1
| | | | | | | | | | This is in case the cobrand directory is actually a symlink to elsewhere, as it is with some deployments.
* | [Ghana] Ignore directories imported from elsewhereMatthew Somerville2016-06-08-0/+1
| |
* | [UK] Switch Like button to more modern Share.Matthew Somerville2016-06-08-30/+13
|/
* Update changelog.Matthew Somerville2016-06-07-0/+2
|
* Strip line end spaces in emails.Matthew Somerville2016-06-07-3/+4
|
* Stop using Text::Wrap to wrap email bodies.Matthew Somerville2016-06-07-23/+15
| | | | | | | | | | | If we don't do this, the default quoted-printable encoding will make sure the lines are physically wrapped anyway. format=flowed could be an alternative, but I think "=" acting as a quasi-hyphen is somewhat nicer than every line ending with "=20". A better solution could be quoted-printable doing soft wrapping only at word breaks, making each line be readable though end with a " =", but that didn't seem worth the effort involved.
* Fix annoying jump when "Get updates" drawer openedMatthew Somerville2016-06-07-2/+2
|
* Add current in development section to readme.Matthew Somerville2016-06-07-0/+13
|
* Simplify use of full-width class.Matthew Somerville2016-06-07-32/+21
|
* Improve error handling of Vagrant installation.Matthew Somerville2016-06-07-20/+24
| | | | | | It should now show a failure message on failure, rather than always show the success message, and not show a confusing error about general.yml if something went wrong before creating that file.
* Update copyright year shown on OS & Bing mapsDave Arter2016-06-07-3/+3
|
* [East Sussex] Improve header CSS.Matthew Somerville2016-06-07-35/+6
| | | | | Remove quite a bit of unnecessary CSS that was not actually helping with display.
* Remove some unused CSS.Matthew Somerville2016-06-07-75/+0
|
* Add output style option to make_css command.Matthew Somerville2016-06-07-1/+10
|
* Don't add symlink if it is to the same place.Matthew Somerville2016-06-07-1/+3
| | | | This applies in e.g. a Vagrant installation.
* Use ::after to fix map sidebar bottom padding.Matthew Somerville2016-06-07-6/+17
| | | | | | This improves upon the previous commit to work with whatever contents the map sidebar has (e.g. the list on an around page was also being cut off before the end).
* Stop bottom of update form disappearingDave Arter2016-06-06-5/+4
| | | | | | On IE9 the bottom of the update form was being obscured by the shadow above the report abuse /updates/nearby buttons for signed-in users.
* Fix calculation when header height given in px.Matthew Somerville2016-06-03-2/+7
|
* Merge branch '1350-stop-map-hiding-behind-header'Matthew Somerville2016-06-03-1202/+640
|\
| * [UK] Remove some unnecessary CSS.Matthew Somerville2016-06-03-101/+37
| |
| * Remove user-meta; "Your reports" to "Your account"Zarino Zappia2016-06-03-302/+34
| |