Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | Support Stamen toner-lite and Bing Maps tiles. | Matthew Somerville | 2015-02-23 | -1/+4 | |
| | |||||
* | Merge remote-tracking branch 'mhalden/fiksgatami-js-fiks' | Matthew Somerville | 2015-01-13 | -3/+3 | |
|\ | |||||
| * | Fixed show/hide pins and show/hide old for norwegian cobrand.fiksgatami-js-fiks | Marius Halden | 2014-12-30 | -3/+3 | |
| | | |||||
* | | Revert most of "Experiment, no pins by default." | Matthew Somerville | 2015-01-09 | -4/+0 | |
|/ | | | | | | This reverts most of commit 71b400a1f5991b9a693095c417aa61e274a5215d, leaving the skip-this-step CSS changes and the tweaks to the /ajax JSON output. | ||||
* | [fixmystreet.com] Experiment, no pins by default. | Matthew Somerville | 2014-10-17 | -0/+4 | |
| | | | | | | | | This changes the default flow to show no pins and a message about reporting, with the second tab displaying existing problems (and showing map pins). Those existing problems are the ones that would currently be on "problems on the map" followed by those currently on "problems nearby". | ||||
* | send a virtual page view when we click on the map | Struan Donald | 2014-04-04 | -0/+4 | |
| | | | | Only if universal analytics turned on and on the fixmystreet cobrand | ||||
* | Allow cobrands to set their own path to pin files | Hakim Cassimally | 2014-03-25 | -4/+4 | |
| | | | | | | | | | New cobrand function of pin_path that sets the path to where the image files for pins are located. Defaults to /i This still means they need to use the same file names but they can at least put those in a cobrand directory rather than having to overwrite the files in /i or fudge it with pin_colour | ||||
* | Tidy up panzoom bar placement. | Matthew Somerville | 2013-10-25 | -2/+7 | |
| | |||||
* | Add Google OpenLayers-based map layer. | Matthew Somerville | 2013-10-11 | -0/+4 | |
| | |||||
* | Upgrade main OpenLayers to 2.13.1. | Matthew Somerville | 2013-10-11 | -64/+46 | |
| | |||||
* | Only need zoom altering if being used for OSM permalink; adjust for other uses. | Matthew Somerville | 2013-02-21 | -2/+14 | |
| | |||||
* | Treat link from report page to around page as permalink to maintain state ↵ | Matthew Somerville | 2013-02-21 | -1/+13 | |
| | | | | better. | ||||
* | Some jslint fixes. | Matthew Somerville | 2013-02-04 | -14/+11 | |
| | |||||
* | Fix bad map JavaScript. | Matthew Somerville | 2013-02-04 | -3/+3 | |
| | |||||
* | Zurich area unfilled with thick black outline (fixes a25). | Matthew Somerville | 2013-01-31 | -0/+3 | |
| | |||||
* | Get remaining English hardcoded strings from JavaScript into translatable ↵ | Matthew Somerville | 2013-01-24 | -4/+4 | |
| | | | | template. | ||||
* | More details to Details and in translation. | Matthew Somerville | 2013-01-24 | -1/+1 | |
| | |||||
* | Add ability for multiple base map layers, add Zurich Stadtplan. | Matthew Somerville | 2013-01-18 | -10/+15 | |
| | |||||
* | Allow hide/show pins in German to work. | Matthew Somerville | 2013-01-18 | -1/+2 | |
| | |||||
* | Add some missing JS translatable strings, update .po files. | Matthew Somerville | 2013-01-16 | -3/+3 | |
| | |||||
* | Write out layer explicitly so no AJAX request necessary and deal with all OL ↵ | Matthew Somerville | 2012-11-26 | -45/+31 | |
| | | | | options the same. | ||||
* | Convert bounds from swiss to lat/lon so ajax doesn't break | Steven Day | 2012-11-26 | -1/+1 | |
| | |||||
* | Make controls and initial zoom level work | Steven Day | 2012-11-26 | -1/+6 | |
| | |||||
* | Update map-OpenLayers.js to let it work with Zurich maps | Steven Day | 2012-11-26 | -25/+46 | |
| | |||||
* | Stop home button disappearing, fixes #280. | Matthew Somerville | 2012-10-10 | -2/+2 | |
| | |||||
* | delete overlooked conflict marker? | Dave Whiteland | 2012-06-25 | -1/+0 | |
| | |||||
* | Merge branch 'master' into fmb-read-only | Dave Whiteland | 2012-06-25 | -0/+2 | |
|\ | | | | | | | | | | | | | Conflicts: .gitignore bin/make_css perllib/FixMyStreet/Cobrand/FixMyStreet.pm | ||||
| * | Merge branch 'barnet-newstyle' | Struan Donald | 2012-06-08 | -0/+2 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore perllib/FixMyStreet/Cobrand/FixMyStreet.pm perllib/FixMyStreet/Cobrand/UKCouncils.pm templates/web/default/reports/council.html templates/web/fixmystreet/header.html templates/web/fixmystreet/report/display.html web/cobrands/bromley/layout.scss web/cobrands/fixmystreet/fixmystreet.js web/js/map-OpenLayers.js | ||||
| | * | do not zoom out too far onby default on around page on mobile as it gets ↵ | Struan Donald | 2012-05-18 | -2/+13 | |
| | | | | | | | | | | | | very cluttered | ||||
| | * | Work much better if reporting pin is clicked/dragged outside council boundary | Struan Donald | 2012-05-18 | -14/+31 | |
| | | | |||||
| | * | Merge branch 'master' into barnet-newstyle | Matthew Somerville | 2012-05-17 | -4/+6 | |
| | |\ | |||||
| | * | | sort out map scrolling when click where sidebar will be | Struan Donald | 2012-05-08 | -0/+2 | |
| | | | | |||||
* | | | | Merge remote branch 'origin/master' into fmb-read-only | Dave Whiteland | 2012-05-29 | -8/+22 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/send-reports perllib/FixMyStreet/Cobrand/Default.pm perllib/FixMyStreet/Cobrand/FixMyStreet.pm templates/web/fixmystreet/alert/index.html templates/web/fixmystreet/around/display_location.html web/cobrands/fixmystreet/_layout.scss web/js/map-OpenLayers.js | ||||
| * | | | Merge branch 'master' into bromley | Matthew Somerville | 2012-05-23 | -1/+1 | |
| |\ \ \ | |||||
| | * | | | Don't want this to happen if zoom is actually 0. | Matthew Somerville | 2012-05-23 | -1/+1 | |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into bromley | Matthew Somerville | 2012-05-16 | -4/+6 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/send-reports conf/crontab.ugly conf/general.yml-example db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/DB/Result/Comment.pm perllib/FixMyStreet/DB/Result/Open311conf.pm perllib/FixMyStreet/DB/Result/Problem.pm perllib/FixMyStreet/DB/Result/User.pm templates/web/default/js/validation_strings.html templates/web/fixmystreet/auth/sign_out.html templates/web/fixmystreet/report/new/councils_text_all.html web/cobrands/fixmystreet/_base.scss | ||||
| * | | | Actually, just initially make sure zoom is at least 13. | Matthew Somerville | 2012-05-14 | -4/+7 | |
| | | | | |||||
| * | | | Have a minimum zoom on mobile version. | Matthew Somerville | 2012-05-14 | -2/+10 | |
| | | | | |||||
| * | | | display title dropdown for bromley users on main site problem page | Struan Donald | 2012-05-01 | -1/+2 | |
| | | | | |||||
| * | | | Text changes from Bromley, fix bug where multiple Title fields would appear ↵ | Matthew Somerville | 2012-04-24 | -1/+1 | |
| | | | | | | | | | | | | | | | | if pin moved. | ||||
| * | | | Work much better if reporting pin is clicked/dragged in/out of council ↵ | Matthew Somerville | 2012-04-17 | -19/+32 | |
| | | | | | | | | | | | | | | | | boundary (CM17). | ||||
| * | | | remove merge code :( | Struan Donald | 2012-04-05 | -4/+0 | |
| | | | | |||||
| * | | | Merge branch 'send-report-rewrite' into bromley-new-send-reports | Struan Donald | 2012-04-03 | -0/+4 | |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: bin/send-reports perllib/FixMyStreet/Geocode/Bing.pm web/js/map-OpenLayers.js | ||||
| * | | | add first name and last name boxes for bromley | Struan Donald | 2012-03-30 | -1/+2 | |
| | | | | |||||
| * | | | Work better if map left isn't left of window. | Matthew Somerville | 2012-03-29 | -3/+4 | |
| | | | | |||||
| * | | | On map page, move overlay to left hand side of map (and adjust pans ↵ | Matthew Somerville | 2012-03-29 | -2/+3 | |
| | | | | | | | | | | | | | | | | appropriately). | ||||
| * | | | Merge branch 'bromley-fe' into bromley | Matthew Somerville | 2012-03-27 | -3/+8 | |
| |\ \ \ | |||||
| | * | | | Adjust figures for when map might not be top left of page. | Matthew Somerville | 2012-03-26 | -3/+8 | |
| | | | | | |||||
| * | | | | initial code to display user title if council is Bromley | Struan Donald | 2012-03-23 | -0/+4 | |
| |/ / / | |||||
* | | | | Merge branch 'master' into fmb-read-only | Matthew Somerville | 2012-05-17 | -4/+6 | |
|\ \ \ \ | | |_|/ | |/| | |