aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | 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
|/
* Add search boxes to admin index page, move stats.Matthew Somerville2016-05-20-61/+108
| | | | Move most index page statistics to their own pages.
* Merge branch '1286-catching-gaze'Matthew Somerville2016-05-18-32/+46
|\
| * Fallback if request to Gaze fails.Matthew Somerville2016-05-18-32/+46
| | | | | | | | Fixes #1286.
* | Improve in-place moderation UIZarino Zappia2016-05-18-118/+156
|/ | | | | | | | | | | 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
* Merge branch '1400-remove-glob'Matthew Somerville2016-05-18-8/+21
|\
| * Remove specific files rather than glob.Matthew Somerville2016-05-18-4/+15
| | | | | | | | This should improve performance when there are a lot of cached photos.
| * Don't allow photo IDs to be prepended with 0s.Matthew Somerville2016-05-18-1/+1
| |
| * Fix removal of cached update photos.Matthew Somerville2016-05-18-4/+6
| | | | | | | | | | It was possible that rotating an update photo did not remove its cached copy.
* | Increase pixel tolerance of map click handler.Matthew Somerville2016-05-17-1/+1
| |
* | Update OpenLayers to fix Google Maps layer.Matthew Somerville2016-05-17-281/+366
|/ | | | This uses the master branch of OpenLayers 2.
* Improve printing of report page in Firefox.Matthew Somerville2016-05-10-1/+5
| | | | | For some reason if the content is floated, Firefox leaves a very large gap that actually blanks out the content underneath it.
* [fixmystreet.com] Add standard mySociety footer.Zarino Zappia2016-05-10-97/+459
| | | | | | | | | | | 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.
* Merge remote-tracking branch 'mysociety/1207-update-email-to-existing'Matthew Somerville2016-05-06-3/+15
|\
| * Allow change of email in admin to existing entry.Matthew Somerville2016-04-27-3/+15
| |
* | Version 1.8.2.v1.8.2Matthew Somerville2016-05-03-9896/+6974
| |
* | Switch external jhead call to use IPC::Open3.Matthew Somerville2016-05-03-1/+8
| |
* | Merge remote-tracking branch 'origin/open311-quieten-issues'Matthew Somerville2016-05-03-7/+2
|\ \
| * | Store Open311 error in report on failure.Matthew Somerville2016-04-27-3/+2
| | | | | | | | | | | | | | | | | | It will still output via cron on the first failure. However, reduce the verbosity of a couple of SendReport modules which are reporting failure every time.
| * | [UK] Remove West Berkshire temporary fix.Matthew Somerville2016-04-27-4/+0
| |/
* | Merge branch 'open311-skip-out-of-range'Matthew Somerville2016-04-27-8/+14
|\ \
| * | Skip fetched updates if they're out of date range.Matthew Somerville2016-04-26-8/+14
| |/ | | | | | | | | Even when we ask for a specific range of dates, we sometimes get given more in the response.
* / Fix missing end label tag.Matthew Somerville2016-04-27-0/+1
|/ | | | This was erroneously removed in 0fe0f7e1.
* [SeeSomething] Fix typo.Matthew Somerville2016-04-22-1/+3
|
* Remove unneeded template variable.Matthew Somerville2016-04-22-4/+2
|
* Merge branch '1383-remove-dead-projects'Matthew Somerville2016-04-22-8843/+319
|\
| * Update tests for cobrand/template changes.Matthew Somerville2016-04-20-111/+60
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 03:23:49 +0000