aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | Merge branch 'jonkri-master'Matthew Somerville2015-02-20-369/+149
|\ \ | |/ |/|
| * [FixaMinGata] Add Google Play logo on home pageJon Kristensen2015-02-16-0/+1
| |
| * [FixaMinGata] Footer template updates.Jon Kristensen2015-02-16-21/+27
| | | | | | | | To match new parent template structure. Include minor translation fixes.
| * [FixaMinGata] Put white background in footerJon Kristensen2015-02-16-0/+2
| |
| * [FixaMinGata] Make a minor spelling correction.Jon Kristensen2015-02-16-1/+1
| |
| * [FixaMinGata] Enhance problem reporting form.Jon Kristensen2015-02-16-217/+84
| | | | | | | | | | | | Use same template structure as fixmystreet cobrand, with tips from fixmystreet.com cobrand. No need for a separate fill_in_details_form.html any more.
| * [FixaMinGata] Remove two unneeded cobrand methodsJon Kristensen2015-02-16-115/+0
| |
| * [FixaMinGata] Rephrase text for no body details.Jon Kristensen2015-02-16-14/+24
| |
| * [FixaMinGata] Differ pin colours based on stateJon Kristensen2015-02-16-0/+9
| |
| * [FixaMinGata] Fix width problem with videoJon Kristensen2015-02-16-1/+1
| |
| * Replace "Open Street Map" with "OpenStreetMap".Jon Kristensen2015-02-16-2/+2
| |
* | Merge branch 'remove-need-for-en-gb-in-config'Matthew Somerville2015-02-18-11/+10
|\ \
| * | Remove need to have to specify en-gb in LANGUAGES.Matthew Somerville2015-02-13-11/+10
| | | | | | | | | | | | | | | | | | Instead, add it if not present at the negotiation stage. Even if not negotiated, we currently need it to be present for the in_gb_locale() calls to work.
* | | Improvements for installing on Macs.Matthew Somerville2015-02-18-0/+69
| | | | | | | | | | | | | | | | | | | | | This works around a couple of issues installing using either MacPorts or Homebrew, making sure the version of ExtUtils::MakeMaker in the snapshot is installed early in the process, and that MooseX::NonMoose is present in the snapshot.
* | | [Harrogate] disable questionnairesHakim Cassimally2015-02-17-0/+4
| | | | | | | | | | | | at council request after brief discussion today
* | | Merge branch 'stevenage-ga'Hakim Cassimally2015-02-17-0/+17
|\ \ \
| * | | [Stevenage] tracking codeHakim Cassimally2015-02-17-0/+17
|/ / /
* | / [fixmystreet.com] Survey in appropriate places.Nick Jackson2015-02-16-0/+17
| |/ |/| | | | | Using SurveyGizmo. Display the survey 60% of the time initially.
* | Merge in installation changes.Matthew Somerville2015-02-16-8/+22
|\ \ | | | | | | | | | Fall back better if a couple of things aren't installed.
| * | Have code fallback to Image::Size if no jhead.Matthew Somerville2015-02-05-3/+6
| | | | | | | | | | | | Don't bother installing it on Travis.
| * | Remove warning if Math::BigInt::GMP not installed.Matthew Somerville2015-02-05-3/+1
| | |
| * | [Travis] Only install boto when necessary.Matthew Somerville2015-02-05-4/+10
| | | | | | | | | | | | And make sure file is removed if not a tar file.
| * | Install Locale::gettext via cpanfile.Matthew Somerville2015-02-05-1/+8
| | |
* | | Switch easting/northing output to one line.Matthew Somerville2015-02-16-68/+2
| | | | | | | | | | | | | | | This is more friendly for e.g. copy and pasting by someone using the Dynamics CRM software. Fixes #997.
* | | Merge branch 'issues/fms-mobile/190'Matthew Somerville2015-02-13-123/+160
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: perllib/FixMyStreet/Geocode/Google.pm
| * | | Make sure all co-ordinates are stringified.Matthew Somerville2015-02-13-124/+160
| |/ / | | | | | | | | | | | | | | | | | | This includes MapIt postcode lookups, geocoding, query parameters, tile clicks. Stringifying truncates them to six decimal places, which means we no longer need any "short" versions anywhere, and the JSON response will always uses a decimal point regardless of locale.
* | | Merge branch 'issues/684-expire-geocache'Matthew Somerville2015-02-13-117/+44
|\ \ \
| * | | Expire cached geolocations after a week.Matthew Somerville2015-02-13-117/+44
| |/ / | | | | | | | | | | | | And refactor geoloction caching code into one function (except for Zurich which has its own SOAP based system).
* | | Create timezone objects only once at startup.Matthew Somerville2015-02-13-55/+32
| | | | | | | | | | | | | | | | | | Cache a DateTime::TimeZone::Local object, so that in an environment where /etc/localtime is a copy of a timezone file, we don't repeatedly walk all the timezone files to find the matching one.
* | | add new logo to Trinidad and Tobabgo, #729Dave Whiteland2015-02-05-0/+40
| |/ |/|
* | Merge branch 'goodies-outbound-tracking'Nick Jackson2015-01-27-10/+31
|\ \ | |/ |/|
| * Prompted by the realisation we have jQuery, improvements to link trackingNick Jackson2015-01-27-17/+28
| | | | | | | | Catches more edge cases, works if GA is blocked, simpler to use.
| * Add tracking of download clicks for the goodies page.Nick Jackson2015-01-27-10/+20
|/
* Version 1.5.3.v1.5.3Matthew Somerville2015-01-21-8155/+18914
|
* [Oxfordshire] Update email template for cobrand.Matthew Somerville2015-01-21-3/+6
| | | | And update HTTPS link.
* Add example nginx client_max_body_size.Matthew Somerville2015-01-20-0/+2
| | | | This will be used by the installation script. Fixes #995.
* Exit with state of running the tests with prove.Matthew Somerville2015-01-20-1/+1
|
* Add staging warning on admin body pages if needed.Matthew Somerville2015-01-20-0/+11
| | | | | | If a staging site and SEND_REPORTS_ON_STAGING is false, warn that reports will be sent to the problem reporter, not whatever has been set up in the admin. Fixes #982.
* Add tests for admin message, cobrand email alert.Matthew Somerville2015-01-20-3/+24
|
* Rename 'body_edit' admin endpoint to 'body'.Matthew Somerville2015-01-20-14/+12
|
* Add admin navigation link to Configuration page.Matthew Somerville2015-01-20-2/+2
|
* Merge branch 'google-maps-satellite-view'Matthew Somerville2015-01-19-23/+39
|\
| * Add Hybrid map toggle option to Google Maps view.Matthew Somerville2015-01-19-21/+37
| |
| * Fix tiny display bug in map sub links navigation.Matthew Somerville2015-01-16-2/+2
| |
* | Merge branch 'remove-need-for-site-title'Matthew Somerville2015-01-19-82/+104
|\ \
| * | Move site_title function to site-name web templateMatthew Somerville2015-01-19-71/+57
| | | | | | | | | | | | | | | | | | | | | This matches the email template behaviour, and makes it much easier to override without requiring a cobrand package file. Fixes #979.
| * | Use site_name to genericise default submit.txt.Matthew Somerville2015-01-19-11/+47
| |/
* | Better finding of parent directory when in symlinkMatthew Somerville2015-01-19-2/+3
| | | | | | | | Fixes #978.
* | Remove need for cron-wrapper with existing scriptsMatthew Somerville2015-01-19-71/+171
| | | | | | | | | | Call the necessary boilerplate in each script so you can call them directly. Remove boilerplate from files that don't need it.
* | Use env in shebang lines, and remove unneeded onesMatthew Somerville2015-01-19-51/+13
| |