aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge remote branch 'origin/master' into fmb-read-onlyDave Whiteland2012-05-29-1809/+5851
|\ | | | | | | | | | | | | | | | | | | | | 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
| * only look for service lists on open311 end pointsStruan Donald2012-05-28-1/+3
| |
| * Merge branch 'bromley'Matthew Somerville2012-05-28-1639/+5625
| |\
| | * Wrapper around Email::Send::SMTP to set sender.Matthew Somerville2012-05-28-1/+13
| | |
| | * test FMS get_council_senderStruan Donald2012-05-27-0/+30
| | |
| | * Merge remote-tracking branch 'origin/bromley' into bromleyStruan Donald2012-05-25-30/+45
| | |\
| | | * Allow map override from cobrand.Matthew Somerville2012-05-25-6/+16
| | | |
| | | * Bromley details in cobrand.Matthew Somerville2012-05-25-3/+15
| | | |
| | | * Have as a normal div, otherwise no-JS IE7 can't style it and the wrong logo ↵Matthew Somerville2012-05-25-2/+2
| | | | | | | | | | | | | | | | appears.
| | | * Enforce the MRO that I thought was happening but turns out wasn't.Matthew Somerville2012-05-25-0/+1
| | | |
| | | * Tidy up tile domain URL generation.Matthew Somerville2012-05-24-8/+6
| | | |
| | | * Multiple domains for Bromley tiles.Matthew Somerville2012-05-24-20/+14
| | | |
| | * | do not put empty arrays into extra field of contacts and ignore them if they ↵Struan Donald2012-05-25-2/+6
| | |/ | | | | | | | | | are there
| | * send media_url if comment has a photoStruan Donald2012-05-24-0/+23
| | |
| | * Fix input display in IE7 due to margin inheritance bug.Matthew Somerville2012-05-24-0/+8
| | |
| | * Merge branch 'master' into bromleyMatthew Somerville2012-05-23-20/+19
| | |\
| | * | Text tweaks.Matthew Somerville2012-05-23-4/+4
| | | |
| | * | Merge remote-tracking branch 'origin/bromley' into bromleyStruan Donald2012-05-23-34/+68
| | |\ \
| | | * | Pins yellow on /my for Bromley.Matthew Somerville2012-05-22-6/+13
| | | | |
| | | * | Text updates from Bromley.Matthew Somerville2012-05-22-28/+55
| | | | |
| | * | | send address_id with NOTPINPOINTED to Bromley if not used map and no postcodeStruan Donald2012-05-23-5/+33
| | | | |
| | * | | address_string and not addressStruan Donald2012-05-23-3/+3
| | | | |
| | * | | use correct photo urlStruan Donald2012-05-22-1/+1
| | |/ /
| | * | If from an existing report page you click 'Nearby problems' > skip mapStruan Donald2012-05-22-1/+12
| | | | | | | | | | | | | | | | | | | | then you end up with used_map=f and nothign in postcode so we should not attempt to send the postcode over open311 as it won't be there
| | * | Secure only cookie, please.Matthew Somerville2012-05-22-0/+1
| | | |
| | * | Merge branch 'master' into bromleyMatthew Somerville2012-05-22-151/+237
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/send-reports perllib/FixMyStreet/App/Controller/Report/New.pm
| | * | | Only Bromley cobrand has first/last name fields, all have title.Matthew Somerville2012-05-21-1/+8
| | | | |
| | * | | No questionnaires for Bromley.Matthew Somerville2012-05-21-5/+26
| | | | |
| | * | | Text on update form, YR13.Matthew Somerville2012-05-21-6/+8
| | | | |
| | * | | Remove some duplicate code.Matthew Somerville2012-05-18-57/+3
| | | | |
| | * | | Tidy up Bromley templates a bit.Matthew Somerville2012-05-17-224/+26
| | | | |
| | * | | Improve map display in IE6/7.Matthew Somerville2012-05-17-11/+5
| | | | |
| | * | | Patch fancybox to work under SSL on IE6 without warning.Matthew Somerville2012-05-17-6/+6
| | | | |
| | * | | Merge remote-tracking branch 'origin/bromley' into bromleyStruan Donald2012-05-17-1/+39
| | |\ \ \
| | | * \ \ Merge branch 'master' into bromleyMatthew Somerville2012-05-16-1/+39
| | | |\ \ \
| | * | | | | put back in code to list skipped count if verbose mode onStruan Donald2012-05-17-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | small bugfixes for Barnet plus comments on debuging
| | * | | | | make banner tests a bit more tolerantStruan Donald2012-05-16-4/+17
| | |/ / / /
| | * | | | Fixes and improvements for tests.Matthew Somerville2012-05-16-94/+114
| | | | | |
| | * | | | remove unused variableMatthew Somerville2012-05-16-1/+0
| | | | | |
| | * | | | move barnet report sending code over to new send-reportMatthew Somerville2012-05-16-0/+217
| | | | | |
| | * | | | Merge branch 'master' into bromleyMatthew Somerville2012-05-16-2202/+6383
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Have crontab mail set more appropriately on non-live sites.Matthew Somerville2012-05-15-0/+4
| | | | | | |
| | * | | | | 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
| | | | | | |
| | * | | | | Override council name in alert list only.Matthew Somerville2012-05-14-0/+2
| | | | | | |
| | * | | | | Put photos back at bottom of page, where they should be, and fix desktop ↵Matthew Somerville2012-05-14-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | display in a simpler way.
| | * | | | | Better council text on alert page.Matthew Somerville2012-05-14-9/+19
| | | | | | |
| | * | | | | Log content type if it's bad.Matthew Somerville2012-05-14-0/+1
| | | | | | |
| | * | | | | Bromley questionnaire email text.Matthew Somerville2012-05-14-0/+24
| | | | | | |
| | * | | | | Fix width as input now has border-box in effect.Matthew Somerville2012-05-11-1/+1
| | | | | | |