Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge remote branch 'origin/master' into fmb-read-only | Dave Whiteland | 2012-05-29 | -112/+173 |
|\ | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | Tidy up tile domain URL generation. | Matthew Somerville | 2012-05-24 | -7/+5 |
| | | ||||
| * | Multiple domains for Bromley tiles. | Matthew Somerville | 2012-05-24 | -13/+7 |
| | | ||||
| * | 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 |
| | | | ||||
| * | | Patch fancybox to work under SSL on IE6 without warning. | Matthew Somerville | 2012-05-17 | -6/+6 |
| | | | ||||
| * | | 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 |
| | | | ||||
| * | | Fix some URLs so that it works under HTTPS. | Matthew Somerville | 2012-05-11 | -11/+17 |
| | | | ||||
| * | | Different map base for Bromley. | Matthew Somerville | 2012-05-11 | -4/+9 |
| | | | ||||
| * | | 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/+11 |
| | | | | ||||
| * | | | 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). | |||
| * | | | Old style design JS left is just to open a box, so that's say that. | Matthew Somerville | 2012-03-28 | -213/+214 |
| | | | | ||||
| * | | | Start to consolidate disparate JavaScript files. | Matthew Somerville | 2012-03-28 | -156/+190 |
| | | | | ||||
| * | | | Merge branch 'bromley-fe' into bromley | Matthew Somerville | 2012-03-27 | -7/+12 |
| |\ \ \ | ||||
| | * | | | Shrink modernizr a bit, removing unneeded bits. | Matthew Somerville | 2012-03-27 | -4/+4 |
| | | | | | ||||
| | * | | | Adjust figures for when map might not be top left of page. | Matthew Somerville | 2012-03-26 | -3/+8 |
| | | | | | ||||
| * | | | | Merge remote-tracking branch 'origin/master' into bromley | Struan Donald | 2012-03-27 | -8/+14 |
| |\| | | | ||||
| * | | | | 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 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||
| * | | | | Deactivate SelectFeature whilst pins are hidden, to fix #297. | Matthew Somerville | 2012-05-09 | -4/+6 |
| | |_|/ | |/| | | ||||
* | | | | Allow display of areas on /around. | Matthew Somerville | 2012-05-08 | -15/+19 |
| | | | | ||||
* | | | | Work much better if reporting pin is clicked/dragged in/out of council ↵ | Matthew Somerville | 2012-04-26 | -14/+32 |
|/ / / | | | | | | | | | | boundary (CM17). | |||
* | | | On map page, move overlay to left hand side of map (and adjust pans ↵ | Matthew Somerville | 2012-03-30 | -2/+3 |
| | | | | | | | | | | | | appropriately). | |||
* | | | Adjust figures for when map might not be top left of page. | Matthew Somerville | 2012-03-30 | -3/+8 |
| |/ |/| | ||||
* | | Extra maxResolution option was needed for MapQuest tiles | Guillaume | 2012-03-20 | -1/+6 |
| | | ||||
* | | Removed obsolete Osmarender, added MapQuestOpen | Guillaume | 2012-03-20 | -8/+9 |
|/ | ||||
* | Return an error if map clicked outside boundary, fixes #270. | Matthew Somerville | 2012-03-16 | -0/+5 |
| | ||||
* | Only move pan zoom on around page on mobile. | Matthew Somerville | 2012-03-15 | -1/+1 |
| | ||||
* | Manually call setCenter rather than zoomToExtent, so that can force zoom ↵ | Matthew Somerville | 2012-03-14 | -1/+4 |
| | | | | event trigger. Fixes centering of area on area pages, I think. | |||
* | Merge branch 'redesign' | Matthew Somerville | 2012-03-14 | -620/+2482 |
|\ | | | | | | | | | | | | | | | 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 Somerville | 2012-03-14 | -0/+4 |
| | | | | | | | | browser resize. | |||
| * | Changed the placeholder polyfill for a better one that works. | Josh Angell | 2012-03-14 | -25/+2 |
| | | ||||
| * | Add placeholder polyfill for IE (see #221) abd also some Ie testing in ↵ | Josh Angell | 2012-03-13 | -4/+29 |
| | | | | | | | | general, removed quite a bit that was just breaking layouts in IE. | |||
| * | fancybox must come later in order for it to work in e.g. FF3.6. Fix CSS ↵ | Matthew Somerville | 2012-03-13 | -16/+16 |
| | | | | | | | | paths for it to work in IE6. For #209 | |||
| * | .data() doesn't appear to work here in Firefox 3.6 (though does in the other ↵ | Matthew Somerville | 2012-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 Somerville | 2012-03-12 | -1/+3 |
| | | ||||
| * | Add fancybox assets and include in the fixmystreet cobrand head file. | Josh Angell | 2012-03-12 | -0/+1647 |
| | | ||||
| * | Fix bug whereby Firefox did not move the pin from under the help when it ↵ | Matthew Somerville | 2012-03-09 | -0/+4 |
| | | | | | | | | appeared. | |||
| * | Hide sub map links when report process started (fixes #265); bit of space ↵ | Matthew Somerville | 2012-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 Somerville | 2012-03-07 | -1/+1 |
| | | | | | | | | so that size can be calculated by JS. | |||
| * | Upgrade modernizr to include html5shiv | Josh Angell | 2012-03-06 | -4/+4 |
| | | | | | | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk> | |||
| * | Remove stray heightFix | Josh Angell | 2012-03-06 | -1/+0 |
| | | | | | | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk> |