aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Oppgrader til 1.8.4fiksgatami-prod-1.8Marius Halden2016-07-06-328/+499
|\ | | | | | | Merge branch 'fiksgatami-dev' into fiksgatami-prod
| * Merge tag 'v1.8.4' into fiksgatami-devfiksgatami-dev-1.8Marius Halden2016-07-06-328/+499
| |\
| | * Version 1.8.4.v1.8.4Matthew Somerville2016-07-06-1/+17
| | |
| | * 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).
| | * Use valid orientation flag for test imageDave Arter2016-07-06-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.
| | * Reinstate missing margin before reporting form email inputZarino Zappia2016-07-06-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `.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-07-06-71/+25
| | | | | | | | | | | | | | | | | | | | | Fixes #1419. We also standardize on using `@include box-shadow()` where possible, and clearing out lots of now unnecessary box-shadow resets.
| | * Patch Dropzone to correctly orient preview images.Matthew Somerville2016-07-06-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.
| | * Fix CSRF issue with new login during process.Matthew Somerville2016-07-06-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.
| | * Improve CSRF tokens and add to more forms.Matthew Somerville2016-07-06-194/+172
| | |
| | * Improve auth flow taken when return key used.Matthew Somerville2016-07-06-5/+6
| | |
| | * Add forgotten password help to general auth page.Matthew Somerville2016-07-06-2/+9
| | | | | | | | | | | | Match the help given in new report/update form.
| | * Fix display in IE7, including front page text.Matthew Somerville2016-07-06-0/+1
| | | | | | | | | | | | | | | .tablewrapper was sometimes losing its background, it needs to be given hasLayout.
| | * Don't update the map pins if a new report started.Matthew Somerville2016-07-06-0/+11
| | |
| | * Redirect correctly if filter used sans JavaScript.Matthew Somerville2016-07-06-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.
| | * Strip line end spaces in emails.Matthew Somerville2016-07-06-3/+4
| | |
| | * Stop using Text::Wrap to wrap email bodies.Matthew Somerville2016-07-06-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-07-06-2/+2
| | |
* | | Merge branch 'fiksgatami-dev' into fiksgatami-prodMarius Halden2016-06-13-42454/+31359
|\| |
| * | Latest Norwegian translation from Transifex.Matthew Somerville2016-06-13-21/+20
| | |
| * | Merge tag 'v1.8.3' into fiksgatami-devMarius Halden2016-06-11-2444/+2677
| |\|
| | * Version 1.8.3.v1.8.3Matthew Somerville2016-06-03-1/+26
| | |
| | * Disable auto-CRLF conversion on git checkout.Matthew Somerville2016-06-03-0/+5
| | | | | | | | | | | | | | | | | | | | | If someone cloned the repository on Windows with their default git settings, then ran vagrant up, it failed because the shell files now had CRLF line endings. Rather than try and exempt the appropriate files, let's just stop git trying to do anything clever at all.
| | * Consolidate packages files.Matthew Somerville2016-06-03-29/+1
| | | | | | | | | | | | | | | Have a generic package install file that works on Debian wheezy and jessie, and Ubuntu precise, trusty and xenial. Drop Debian squeeze.
| | * Fix grey chevron size.Matthew Somerville2016-06-01-2/+2
| | | | | | | | | | | | | | | The fix in e070ba89 for the big white chevron was also applied to these chevrons which did not need extra paddig, and made them display smaller.
| | * Add inline-image Sass function.Matthew Somerville2016-06-01-0/+14
| | | | | | | | | | | | | | | The move to libsass missed out one function call, that inline images as data URIs, which wasn't spotted as it didn't error.
| | * Merge branch 'move-to-libsass'Matthew Somerville2016-05-31-674/+297
| | |\
| | | * Consolidate CSS clearfix handling.Matthew Somerville2016-05-31-47/+15
| | | | | | | | | | | | | | | | Remove duplicate/alternate definitions, and settle on the name clearfix.
| | | * Improve CSS compilation.Matthew Somerville2016-05-31-638/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move to using libsass via CSS::Sass, and stop using compass, supplying any used mixins directly. This removes the need for any ruby/gem based installation, and greatly increases the speed of compilation. make_css is also enhanced, bringing in the file monitoring previously done by a separate script and improving its dependency monitoring.
| | * | Acknowledge Browserstack in the README.Matthew Somerville2016-05-31-0/+5
| | | | | | | | | | | | | | | | Thanks very much to them! Fixes #1415.
| | * | Merge branch 'jonkri-master-new'Matthew Somerville2016-05-31-108/+35
| | |\ \
| | | * | [FixaMinGata] Update translations.Matthew Somerville2016-05-31-73/+16
| | | | |
| | | * | [FixaMinGata] Move suggestions link to FAQ pageJon Kristensen2016-05-31-1/+3
| | | | |
| | | * | [FixaMinGata] Extend dos and don'ts informationJon Kristensen2016-05-31-0/+1
| | | | |
| | | * | [FixaMinGata] Make submit email easier to parse.Jon Kristensen2016-05-31-5/+5
| | | | |
| | | * | [FixaMinGata] Remove Piwik codeJon Kristensen2016-05-31-17/+0
| | | | |
| | | * | [FixaMinGata] Add App Store icon and link.Jon Kristensen2016-05-31-1/+1
| | | | |
| | | * | [FixaMinGata] Shorten details text.Jon Kristensen2016-05-31-8/+8
| | | | | | | | | | | | | | | | | | | | Move some of it to dos and don'ts.
| | | * | [FixaMinGata] Remove link to wiki.ffkp.seJon Kristensen2016-05-31-3/+1
| | | | |
| | * | | [Stevenage] Responsive header for Stevenage cobrandZarino Zappia2016-05-31-209/+319
| | | |/ | | |/|
| | * | Handle reports/updates by logged in abuse entries.Matthew Somerville2016-05-27-0/+10
| | | |
| | * | Fix broken test due to missing config override.Matthew Somerville2016-05-27-2/+7
| | | |
| | * | Update OpenLayers 2 to master branch.Matthew Somerville2016-05-27-294/+382
| | |/ | | | | | | | | | Specifically to get the https://github.com/openlayers/ol2/pull/1418 fix.
| | * Merge branch '1410-email-template'Matthew Somerville2016-05-25-456/+433
| | |\
| | | * Use only one templating system for emails.Matthew Somerville2016-05-25-456/+433
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically, emails sent offline (alerts, questionnaires, etc) used a different templating system from those sent by the website (e.g. login emails), though the newer system was also being used for the site name and signature of offline emails.
| | * | Merge branch '694-summary-string-template-tidy'Matthew Somerville2016-05-25-137/+31
| | |\ \ | | | |/ | | |/|
| | | * Add a couple of template hooks to report/_mainMatthew Somerville2016-05-24-106/+18
| | | | | | | | | | | | | | | | This removes the need for the Oxfordshire cobrand to override.
| | | * Move processed_summary_string function to templateMatthew Somerville2016-05-24-31/+13
| | | | | | | | | | | | | | | | Fixes #694.
| | * | Warnfix if belongs_to_body called with no string.Matthew Somerville2016-05-24-2/+3
| | | |
| | * | [fixmystreet.com] Only output experiment on live.Matthew Somerville2016-05-24-0/+2
| | |/