aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
|
* 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
|\
| * Assume alert is not confirmed if not logged in.Matthew Somerville2012-05-23-19/+18
| |
| * Don't want this to happen if zoom is actually 0.Matthew Somerville2012-05-23-1/+1
| |
* | 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
| * Allow through octet-stream uploads, catch error from jhead better.Matthew Somerville2012-05-22-3/+72
| |
| * Move photo processing functions to the photo controller.Matthew Somerville2012-05-22-91/+92
| |
| * Don't have URL path passed through to 404 as error message.Matthew Somerville2012-05-22-1/+1
| |
| * Initialise variables so that we don't try and encode undef.Matthew Somerville2012-05-22-2/+3
| |
| * Shrink pin PNGs somewhat.Matthew Somerville2012-05-18-0/+0
| |
| * don't truncate 'nearest address' until sending it (Barnet send-reports)Dave Whiteland2012-05-18-1/+1
| |
| * fix bug: failed to encode entities for nearest address in Barnet sendDave Whiteland2012-05-18-2/+2
| |
| * Try and work if given a JPEG but with an incorrect MIME type, thanks Citrix.Matthew Somerville2012-05-18-0/+1
| |
| * Stop warning by checking existence first.Matthew Somerville2012-05-18-1/+1
| |
| * StreetReport seems to have disappeared.Matthew Somerville2012-05-18-53/+34
| |
| * Add a .mailmap fileMark Longair2012-05-18-0/+33
| | | | | | | | | | Among other things, this means that authors are identified correctly in the output of "git shortlog".
| * Have crontab mail set more appropriately on non-live sites.Matthew Somerville2012-05-17-3/+3
| |
* | 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
| |\|
| | * Add squeeze+testing packages file for ruby-compass.Matthew 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
| * Unneeded file.Matthew Somerville2012-05-16-12/+0
| |
| * Update council text.Matthew Somerville2012-05-15-8/+13
| |
| * Bit of padding above the mobile bottom menu.Matthew Somerville2012-05-14-1/+1
| |