aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | 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
| |
* | Rename test-wrapper to run-tests.Matthew Somerville2015-01-19-18/+11
| | | | | | | | As that's what it does; and use it in Travis.
* | Tidy up of bin directory.Matthew Somerville2015-01-19-315/+7
|/ | | | | Remove some unneeded scripts, move others to cobrand-specific directories.
* Use public bundles for setting up cache.Matthew Somerville2015-01-14-11/+5
| | | | | | Forked repos cannot access the secure credentials when making pull requests. We'd like those to be tested, so have made the bundles public to be used for installation.
* Fix title of Privacy page, and missing copy.Matthew Somerville2015-01-14-1/+132
|
* Update other uses of text changed in a0a33741.Matthew Somerville2015-01-14-8/+7
|
* Merge remote-tracking branch 'mhalden/fiksgatami-js-fiks'Matthew Somerville2015-01-13-3/+3
|\
| * Fixed show/hide pins and show/hide old for norwegian cobrand.fiksgatami-js-fiksMarius Halden2014-12-30-3/+3
| |
* | Add some bottom padding to .content.Matthew Somerville2015-01-13-1/+2
| | | | | | | | | | And remove it in footer if present (so that a different background doesn't potentially show through).
* | Use same handling for cron and non-cron email.Matthew Somerville2015-01-13-62/+67
| | | | | | | | | | This means that e.g. SMTP authentication is used when set up by all emails, not just non-cron ones. Fixes #988.
* | Use HTTPS OpenStreetMap tiles.Matthew Somerville2015-01-09-8/+8
| |
* | Revert most of "Experiment, no pins by default."Matthew Somerville2015-01-09-104/+2
| | | | | | | | | | | | This reverts most of commit 71b400a1f5991b9a693095c417aa61e274a5215d, leaving the skip-this-step CSS changes and the tweaks to the /ajax JSON output.
* | Merge branch 'east-sussex-disable-questionnaires'Hakim Cassimally2015-01-09-0/+4
|\ \
| * | [EastSussex] disable questionnairesHakim Cassimally2015-01-09-0/+4
|/ / | | | | | | at ESCC request today
* | [Harrogate] update email for live deploymentHakim Cassimally2015-01-08-1/+1
| |
* | Merge branch 'harrogate-candidate'Hakim Cassimally2015-01-08-17/+949
|\ \
| * | [Harrogate] wordings and stylesHakim Cassimally2015-01-08-21/+487
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - auth and intro pages - wording of around page - Styling work with Mike - FAQ and footer tweaks https://github.com/mysociety/FixMyStreet-Commercial/issues/654 https://github.com/mysociety/FixMyStreet-Commercial/issues/655 - Extra spacing https://github.com/mysociety/FixMyStreet-Commercial/issues/656 - Width of footer (override auto -> 100%) - style and logo tweaks - Logo/header same height on all pages (inc mappage) - Content spacing tweaks - Correct "Harrogate district" wording https://github.com/mysociety/FixMyStreet-Commercial/issues/658 - Add extra disclaimer about reports fwd'd to NYCC - push fms_pan_zoom down with css!important (alternative is to use JS as Hart does, or possibly to fix this so doesn't require !important) - add privacy section (Copies part of text on main page, this should perhaps be factored out.) - Set bodyclass for change_password Sets a bodyclass that's unused outwith harrogate cobrand, so should be safe.
| * | [Harrogate] custom form fieldsHakim Cassimally2015-01-08-23/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires previous (generic) commit to prevent information only categories (e.g. Dead animals message) from displaying a spurious textbox. Also support for sending these custom fields by email: Requires a hook in RS::Problem method, as by default, only a restricted number of hard-coded fields are send in the email. (And the template language is pseudo-PHP so we can't simply pass in the whole data-structure.)
| * | Open311: honour `variable` field in form displayHakim Cassimally2015-01-08-15/+19
| | | | | | | | | | | | | | | Potentially addresses #42 and https://github.com/mysociety/FixMyStreet-Commercial/issues/647
| * | [Harrogate] basic cobrandHakim Cassimally2015-01-08-0/+256
| | |
| * | Add executable permissions to scriptHakim Cassimally2015-01-08-0/+0
|/ /
* / [Warwickshire] suppress front-page statsHakim Cassimally2014-12-30-0/+1
|/
* Merge branch 'issues/850/bromley-geocoding-BR5'Hakim Cassimally2014-12-29-0/+18
|\
| * [Bromley] fix BR5 and BR6 geocoding issuesHakim Cassimally2014-12-29-0/+18
|/ | | | | | | | | fixes #850 by adding appropriate postcodes to fix some issues reported by council. Unsure why, but one of these (Kelsey Hill) seemed to require different ordering than others: is this a Bing oddity, or am I doing something wrong?
* Update UNIX_USER on installation setup of crontab.Matthew Somerville2014-12-19-0/+1
| | | | Fixes #974.