aboutsummaryrefslogtreecommitdiffstats
path: root/web/js/map-OpenLayers.js
Commit message (Collapse)AuthorAgeLines
...
* | | | Merge remote branch 'origin/master' into fmb-read-onlyDave Whiteland2012-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 bromleyMatthew Somerville2012-05-23-1/+1
| |\ \ \
| | * | | Don't want this to happen if zoom is actually 0.Matthew Somerville2012-05-23-1/+1
| | | |/ | | |/|
| * | | Merge branch 'master' into bromleyMatthew Somerville2012-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 Somerville2012-05-14-4/+7
| | | |
| * | | Have a minimum zoom on mobile version.Matthew Somerville2012-05-14-2/+10
| | | |
| * | | display title dropdown for bromley users on main site problem pageStruan Donald2012-05-01-1/+2
| | | |
| * | | Text changes from Bromley, fix bug where multiple Title fields would appear ↵Matthew Somerville2012-04-24-1/+1
| | | | | | | | | | | | | | | | if pin moved.
| * | | Work much better if reporting pin is clicked/dragged in/out of council ↵Matthew Somerville2012-04-17-19/+32
| | | | | | | | | | | | | | | | boundary (CM17).
| * | | remove merge code :(Struan Donald2012-04-05-4/+0
| | | |
| * | | Merge branch 'send-report-rewrite' into bromley-new-send-reportsStruan Donald2012-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 bromleyStruan Donald2012-03-30-1/+2
| | | |
| * | | Work better if map left isn't left of window.Matthew Somerville2012-03-29-3/+4
| | | |
| * | | On map page, move overlay to left hand side of map (and adjust pans ↵Matthew Somerville2012-03-29-2/+3
| | | | | | | | | | | | | | | | appropriately).
| * | | Merge branch 'bromley-fe' into bromleyMatthew Somerville2012-03-27-3/+8
| |\ \ \
| | * | | Adjust figures for when map might not be top left of page.Matthew Somerville2012-03-26-3/+8
| | | | |
| * | | | initial code to display user title if council is BromleyStruan Donald2012-03-23-0/+4
| |/ / /
* | | | Merge branch 'master' into fmb-read-onlyMatthew Somerville2012-05-17-4/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Deactivate SelectFeature whilst pins are hidden, to fix #297.Matthew Somerville2012-05-09-4/+6
| | |/ | |/|
* | | Allow display of areas on /around.Matthew Somerville2012-05-08-15/+19
| | |
* | | Work much better if reporting pin is clicked/dragged in/out of council ↵Matthew Somerville2012-04-26-14/+32
|/ / | | | | | | boundary (CM17).
* | On map page, move overlay to left hand side of map (and adjust pans ↵Matthew Somerville2012-03-30-2/+3
| | | | | | | | appropriately).
* | Adjust figures for when map might not be top left of page.Matthew Somerville2012-03-30-3/+8
|/
* Return an error if map clicked outside boundary, fixes #270.Matthew Somerville2012-03-16-0/+5
|
* Only move pan zoom on around page on mobile.Matthew Somerville2012-03-15-1/+1
|
* Manually call setCenter rather than zoomToExtent, so that can force zoom ↵Matthew Somerville2012-03-14-1/+4
| | | | event trigger. Fixes centering of area on area pages, I think.
* Merge branch 'redesign'Matthew Somerville2012-03-14-43/+175
|\ | | | | | | | | | | | | | | Conflicts: .gitignore notes/INSTALL perllib/FixMyStreet/App/Controller/Photo.pm perllib/FixMyStreet/Cobrand/FixMyStreet.pm
| * Move most mobile-related JS into resize() so that site keeps working on ↵Matthew Somerville2012-03-14-0/+4
| | | | | | | | browser resize.
| * .data() doesn't appear to work here in Firefox 3.6 (though does in the other ↵Matthew Somerville2012-03-13-2/+2
| | | | | | | | place it's used, sigh), so set our own variable instead. Set gallery of all images, typo.
| * Shared JS file, this function might not be defined.Matthew Somerville2012-03-12-1/+3
| |
| * Fix bug whereby Firefox did not move the pin from under the help when it ↵Matthew Somerville2012-03-09-0/+4
| | | | | | | | appeared.
| * Hide sub map links when report process started (fixes #265); bit of space ↵Matthew Somerville2012-03-07-1/+1
| | | | | | | | under key tools in mobile environment, and fix typo.
| * Put padding on inner div to stop animation jump, no important on hidden-js ↵Matthew Somerville2012-03-07-1/+1
| | | | | | | | so that size can be calculated by JS.
| * Remove stray heightFixJosh Angell2012-03-06-1/+0
| | | | | | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
| * Heading spacing.Matthew Somerville2012-03-05-1/+1
| |
| * Change map button back to OK if used, as otherwise use of try again was ↵Matthew Somerville2012-03-03-11/+10
| | | | | | | | forced potentially unnecessarily.
| * Fix issue with overlapping map/form due to map height changing, by fixing ↵Matthew Somerville2012-03-02-3/+7
| | | | | | | | height once we know it.
| * Enable scroll wheel if mobile full screen map view.Matthew Somerville2012-03-02-0/+3
| |
| * Fix hashchange not working in IE6 for #246, and better animatino when ↵Matthew Somerville2012-03-02-6/+4
| | | | | | | | clicking underneath where the sidebar will appear.
| * Allow back button to work when reading mobile reporting notes, fixes #260.Matthew Somerville2012-03-01-1/+9
| |
| * Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-03-01-5/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | supercool Conflicts: web/js/map-OpenLayers.js Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
| | * Change links once the scrolling is complete, not before.Matthew Somerville2012-03-01-4/+5
| | |
| * | Add scroll to top js when map is completed on mobileJosh Angell2012-03-01-2/+6
| |/ | | | | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
| * Initial styles for mobile completed map buttonsJosh Angell2012-03-01-1/+2
| | | | | | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
| * Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-03-01-1/+7
| |\ | | | | | | | | | supercool
| | * Remember pin hiding state in case they try again.Matthew Somerville2012-03-01-0/+5
| | |
| | * Move popups to come out of the middle of the pin.Matthew Somerville2012-03-01-1/+2
| | |
| * | Add class for when map is 'complete'Josh Angell2012-03-01-1/+4
| |/ | | | | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
| * Initial scroll event for when user clicks ok on mobile map, also altered how ↵Josh Angell2012-03-01-0/+10
| | | | | | | | | | | | the Notes scroll so they use offset instead Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
| * Linter fixJosh Angell2012-03-01-1/+1
| | | | | | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>