Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge tag 'v1.8.4' into fiksgatami-devfiksgatami-dev-1.8 | Marius Halden | 2016-07-06 | -29/+48 |
|\ | ||||
| * | Fix two XSS vulnerabilities. | Matthew Somerville | 2016-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). | |||
| * | Improve CSRF tokens and add to more forms. | Matthew Somerville | 2016-07-06 | -17/+29 |
| | | ||||
| * | Add forgotten password help to general auth page. | Matthew Somerville | 2016-07-06 | -2/+9 |
| | | | | | | | | Match the help given in new report/update form. | |||
| * | Redirect correctly if filter used sans JavaScript. | Matthew Somerville | 2016-07-06 | -1/+1 |
| | | | | | | | | | | 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 Somerville | 2016-07-06 | -1/+1 |
| | | ||||
| * | Fix annoying jump when "Get updates" drawer opened | Matthew Somerville | 2016-07-06 | -2/+2 |
| | | ||||
* | | Merge tag 'v1.8.3' into fiksgatami-dev | Marius Halden | 2016-06-11 | -678/+676 |
|\| | ||||
| * | Merge branch 'move-to-libsass' | Matthew Somerville | 2016-05-31 | -5/+5 |
| |\ | ||||
| | * | Consolidate CSS clearfix handling. | Matthew Somerville | 2016-05-31 | -5/+5 |
| | | | | | | | | | | | | Remove duplicate/alternate definitions, and settle on the name clearfix. | |||
| * | | Merge branch 'jonkri-master-new' | Matthew Somerville | 2016-05-31 | -35/+19 |
| |\ \ | ||||
| | * | | [FixaMinGata] Move suggestions link to FAQ page | Jon Kristensen | 2016-05-31 | -1/+3 |
| | | | | ||||
| | * | | [FixaMinGata] Extend dos and don'ts information | Jon Kristensen | 2016-05-31 | -0/+1 |
| | | | | ||||
| | * | | [FixaMinGata] Make submit email easier to parse. | Jon Kristensen | 2016-05-31 | -5/+5 |
| | | | | ||||
| | * | | [FixaMinGata] Remove Piwik code | Jon Kristensen | 2016-05-31 | -17/+0 |
| | | | | ||||
| | * | | [FixaMinGata] Add App Store icon and link. | Jon Kristensen | 2016-05-31 | -1/+1 |
| | | | | ||||
| | * | | [FixaMinGata] Shorten details text. | Jon Kristensen | 2016-05-31 | -8/+8 |
| | | | | | | | | | | | | | | | | Move some of it to dos and don'ts. | |||
| | * | | [FixaMinGata] Remove link to wiki.ffkp.se | Jon Kristensen | 2016-05-31 | -3/+1 |
| | |/ | ||||
| * / | [Stevenage] Responsive header for Stevenage cobrand | Zarino Zappia | 2016-05-31 | -53/+61 |
| |/ | ||||
| * | Merge branch '1410-email-template' | Matthew Somerville | 2016-05-25 | -343/+347 |
| |\ | ||||
| | * | Use only one templating system for emails. | Matthew Somerville | 2016-05-25 | -343/+347 |
| | | | | | | | | | | | | | | | | | | | | | 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 Somerville | 2016-05-25 | -107/+31 |
| |\ \ | | |/ | |/| | ||||
| | * | Add a couple of template hooks to report/_main | Matthew Somerville | 2016-05-24 | -106/+18 |
| | | | | | | | | | | | | This removes the need for the Oxfordshire cobrand to override. | |||
| | * | Move processed_summary_string function to template | Matthew Somerville | 2016-05-24 | -1/+13 |
| | | | | | | | | | | | | Fixes #694. | |||
| * | | [fixmystreet.com] Only output experiment on live. | Matthew Somerville | 2016-05-24 | -0/+2 |
| |/ | ||||
| * | Add search boxes to admin index page, move stats. | Matthew Somerville | 2016-05-20 | -33/+67 |
| | | | | | | | | Move most index page statistics to their own pages. | |||
| * | Improve in-place moderation UI | Zarino Zappia | 2016-05-18 | -116/+122 |
| | | | | | | | | | | | | | | | | | | | | | | This rearranges the moderation UI into logical chunks, and improves the 'revert to original' checkboxes by: - hiding them unless there's some original text to revert to - displaying the text that will be reverted to in the appropriate input fields when checked. Part of mysociety/FixMyStreet-Commercial#731 | |||
| * | Update OpenLayers to fix Google Maps layer. | Matthew Somerville | 2016-05-17 | -2/+2 |
| | | | | | | | | This uses the master branch of OpenLayers 2. | |||
| * | [fixmystreet.com] Add standard mySociety footer. | Zarino Zappia | 2016-05-10 | -51/+87 |
| | | | | | | | | | | | | | | | | | | | | | | Like a number of recent council cobrands, we remove parts of the default desktop footer and append our own responsive one in `footer_extra.html`. This also updates the FixMyStreet app logos (for fixmystreet.com and any other cobrands that use them) to the most recent style of Apple / Google sanctioned badges. Fixes #1385. | |||
* | | Fix faq footer for FikGataMi | Marius Halden | 2016-06-11 | -2/+2 |
| | | ||||
* | | Fix faq width and contact link for FiksGataMi | Marius Halden | 2016-06-11 | -2/+21 |
| | | ||||
* | | Merge tag 'v1.8.2' into fiksgatami-dev | Marius Halden | 2016-05-28 | -3170/+394 |
|\| | ||||
| * | Version 1.8.2.v1.8.2 | Matthew Somerville | 2016-05-03 | -1/+1 |
| | | ||||
| * | Fix missing end label tag. | Matthew Somerville | 2016-04-27 | -0/+1 |
| | | | | | | | | This was erroneously removed in 0fe0f7e1. | |||
| * | [SeeSomething] Fix typo. | Matthew Somerville | 2016-04-22 | -1/+3 |
| | | ||||
| * | Remove unneeded template variable. | Matthew Somerville | 2016-04-22 | -4/+2 |
| | | ||||
| * | Merge branch '1383-remove-dead-projects' | Matthew Somerville | 2016-04-22 | -3158/+174 |
| |\ | ||||
| | * | Remove final web/fixmystreet templates. | Matthew Somerville | 2016-04-20 | -292/+165 |
| | | | | | | | | | | | | And associated, e.g. nothing references fixmystreet-old-box.js any more. | |||
| | * | Remove some unused cobrands. | Matthew Somerville | 2016-04-20 | -2866/+9 |
| | | | ||||
| * | | [UK] Use absolute link in unresponsive template. | Matthew Somerville | 2016-04-22 | -1/+1 |
| | | | | | | | | | | | | This template may be shown in the mobile app. | |||
| * | | Merge remote-tracking branch 'origin/twitter-login' | Matthew Somerville | 2016-04-22 | -6/+36 |
| |\ \ | | |/ | |/| | ||||
| | * | Add Twitter social login. | Matthew Somerville | 2016-04-08 | -6/+36 |
| | | | ||||
| * | | Merge remote-tracking branch 'origin/1302-support-pngs' | Matthew Somerville | 2016-04-20 | -34/+35 |
| |\ \ | ||||
| | * | | Add PNG image support. | Matthew Somerville | 2016-04-08 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store image type along with hash in photo column, and use that when outputting images / generating URLs. Make sure all public photo URL generation goes through appropriate functions, and change temp URLs so the filename can be output directly from the list. | |||
| | * | | Use correct URL for partial report photo. | Matthew Somerville | 2016-04-08 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Since multiple photo support, partial photos can only be looked at via their temporary URL, not their confirmed one. | |||
| | * | | Update remaining cobrand multiple photo templates. | Matthew Somerville | 2016-04-08 | -26/+27 |
| | |/ | ||||
| * / | Use better link to reports on admin body page. | Matthew Somerville | 2016-04-20 | -1/+1 |
| |/ | | | | | | | Remove unused body/area ID URL code. | |||
| * | Show right body user form value for fixed reports. | Matthew Somerville | 2016-03-31 | -4/+4 |
| | | | | | | | | | | The form element contains 'fixed', so we need to strip the user/council part of the actual state. Fixes #1369. | |||
| * | [fixmystreet.com] Move country lookup client side. | Matthew Somerville | 2016-03-31 | -11/+0 |
| | | | | | | | | | | There's no need for the IP->country lookup, only used in JavaScript to display a banner, to require a call to the FixMyStreet server. | |||
| * | [Angus] Link to Angus on FMS for councils pages | Dave Arter | 2016-03-31 | -2/+5 |
| | |