Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'zurich' | Matthew Somerville | 2013-03-14 | -3/+11 |
|\ | | | | | | | | | | | | | | | | | Conflicts: locale/FixMyStreet.po locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | |||
| * | Use internal proxy for maps for now. | Matthew Somerville | 2013-03-12 | -2/+2 |
| | | ||||
| * | Also detect zueri in URI for JS. | Matthew Somerville | 2013-03-12 | -1/+1 |
| | | ||||
| * | Colour in Zurich words to match pins. | Matthew Somerville | 2013-03-11 | -0/+8 |
| | | ||||
| * | file input needs width otherwise pushes out on iPhone. | Matthew Somerville | 2013-02-22 | -0/+4 |
| | | ||||
* | | Remove other uses of green on front page. | Matthew Somerville | 2013-03-08 | -2/+2 |
| | | ||||
* | | Have total on EHA front page be all time. | Matthew Somerville | 2013-03-08 | -1/+1 |
| | | ||||
* | | Add link to /local from front page and around page. | Matthew Somerville | 2013-03-08 | -1/+5 |
| | | ||||
* | | Update EHA footer to have orange background. | Matthew Somerville | 2013-03-08 | -3/+3 |
| | | ||||
* | | file input needs width otherwise pushes out on iPhone. | Matthew Somerville | 2013-02-22 | -0/+4 |
| | | ||||
* | | Only need zoom altering if being used for OSM permalink; adjust for other uses. | Matthew Somerville | 2013-02-21 | -5/+17 |
| | | ||||
* | | Track map panning on report page link back to /around. | Matthew Somerville | 2013-02-21 | -0/+5 |
| | | ||||
* | | Zurich admin table styles carried across to default admin templates, and ↵ | Matthew Somerville | 2013-02-21 | -53/+55 |
|/ | | | | tidy display of admin a bit. | |||
* | Translate and smudge Zurich shadow so that it's only visible at the top. | Matthew Somerville | 2013-02-21 | -1/+1 |
| | ||||
* | Merge remote branch 'origin/zurich' | Matthew Somerville | 2013-02-21 | -28/+172 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | (locale ignored, will rerun .po extraction after to get all changes.) Conflicts: locale/FixMyStreet.po locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po templates/web/fixmystreet/report/banner.html templates/web/zurich/faq/faq-de-ch.html | |||
| * | Right-align login on Zurich map pages. | Matthew Somerville | 2013-02-21 | -1/+3 |
| | | ||||
| * | Remove type=file styling, until such time it's done much better. | Matthew Somerville | 2013-02-21 | -13/+1 |
| | | ||||
| * | Treat link from report page to around page as permalink to maintain state ↵ | Matthew Somerville | 2013-02-21 | -1/+18 |
| | | | | | | | | better. | |||
| * | Activate IE admin drag onload, as with the pins. | Matthew Somerville | 2013-02-20 | -25/+33 |
| | | ||||
| * | Fix height to match background. | Matthew Somerville | 2013-02-20 | -1/+1 |
| | | ||||
| * | Fix link order so that you can click on Zurich banner logo. | Matthew Somerville | 2013-02-20 | -1/+1 |
| | | ||||
| * | No pin image on Zurich closed banner. | Matthew Somerville | 2013-02-20 | -0/+4 |
| | | ||||
| * | Only needed on map page. | Matthew Somerville | 2013-02-15 | -1/+3 |
| | | ||||
| * | Fixed so doesn't scroll with page. | Matthew Somerville | 2013-02-14 | -0/+1 |
| | | ||||
| * | remove percentage width on zurich postcode form to fix iphone ↵ | Dave Whiteland | 2013-02-11 | -0/+22 |
| | | | | | | | | portrait/landscape flipping bug | |||
| * | Add static map to front page (36). | Matthew Somerville | 2013-02-11 | -6/+36 |
| | | ||||
| * | Separate login/registration to two forms, as it's admin only (fixes a7). | Matthew Somerville | 2013-02-08 | -1/+3 |
| | | ||||
| * | Allow Zurich admin to change location of pin, with confirmation (fixes a1). | Matthew Somerville | 2013-02-08 | -0/+29 |
| | | ||||
| * | Fix display of map controls, turn off arrow nav on Zurich. | Matthew Somerville | 2013-02-07 | -2/+15 |
| | | ||||
| * | simply remove padding and margin from Zurich type=file inputs, to stop ugly ↵ | Dave Whiteland | 2013-02-07 | -0/+6 |
| | | | | | | | | text lineup in e.g., Chrome | |||
| * | Start of Zurich admin table sort ordering (DM). | Matthew Somerville | 2013-02-06 | -0/+3 |
| | | ||||
| * | Separate out link to Stadt Zurich, and front page (fixes b2). | Matthew Somerville | 2013-02-06 | -4/+9 |
| | | ||||
| * | new green and red *big* colourful pins | Dave Whiteland | 2013-02-05 | -0/+0 |
| | | ||||
| * | Slightly fix display of pagination line. | Matthew Somerville | 2013-02-05 | -3/+2 |
| | | ||||
| * | use white (geocode) loading spinner on white background | Dave Whiteland | 2013-02-05 | -1/+2 |
| | | ||||
| * | FMZ added bolding to 'labels' | Dave Whiteland | 2013-02-05 | -0/+4 |
| | | ||||
| * | FMZ suppress bullets on 3-way assignation (not quite so obvious this one ↵ | Dave Whiteland | 2013-02-05 | -0/+3 |
| | | | | | | | | shouldn't be bulleted? Not clear it's a choice-of-three) | |||
| * | FMZ suppress bullets on report li | Dave Whiteland | 2013-02-05 | -1/+6 |
| | | ||||
* | | Add C4/TA logos to REH site. | Matthew Somerville | 2013-02-12 | -1/+1 |
| | | ||||
* | | ID name of button has changed in master branch. | Matthew Somerville | 2013-02-12 | -1/+1 |
| | | ||||
* | | Merge remote branch 'origin/master' into oxfordshire-header | Dave Whiteland | 2013-02-06 | -104/+1186 |
|\| | ||||
| * | Fix white text in white bubbles. | Matthew Somerville | 2013-02-04 | -0/+5 |
| | | ||||
| * | Some jslint fixes. | Matthew Somerville | 2013-02-04 | -14/+11 |
| | | ||||
| * | Fix bad map JavaScript. | Matthew Somerville | 2013-02-04 | -3/+3 |
| | | ||||
| * | Merge remote branch 'origin/zurich' | Matthew Somerville | 2013-02-04 | -93/+1173 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/open311-populate-service-list bin/send-comments bin/update-all-reports conf/crontab.ugly db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/App/Controller/Reports.pm perllib/FixMyStreet/Cobrand/Default.pm perllib/FixMyStreet/Cobrand/LichfieldDC.pm perllib/FixMyStreet/DB/Result/Open311conf.pm perllib/FixMyStreet/DB/Result/Problem.pm perllib/FixMyStreet/DB/ResultSet/Problem.pm perllib/FixMyStreet/SendReport.pm perllib/FixMyStreet/SendReport/Email.pm perllib/FixMyStreet/SendReport/Open311.pm perllib/Open311/GetServiceRequestUpdates.pm perllib/Open311/PopulateServiceList.pm t/app/controller/report_new.t t/app/controller/rss.t templates/web/bromley/report/display.html templates/web/default/admin/council_contacts.html templates/web/default/common_header_tags.html templates/web/default/dashboard/index.html templates/web/default/front/stats.html templates/web/default/report/_main.html templates/web/default/report/update-form.html templates/web/emptyhomes/index.html templates/web/emptyhomes/report/display.html templates/web/emptyhomes/report/new/councils_text_all.html templates/web/emptyhomes/reports/body.html templates/web/emptyhomes/reports/index.html templates/web/fixmystreet/report/new/fill_in_details_form.html templates/web/fixmystreet/report/update-form.html web/cobrands/fixmystreet/fixmystreet.js web/js/fixmystreet.js | |||
| | * | Zurich area unfilled with thick black outline (fixes a25). | Matthew Somerville | 2013-01-31 | -0/+5 |
| | | | ||||
| | * | More Zurich header box shadow fixes. | Matthew Somerville | 2013-01-31 | -0/+6 |
| | | | ||||
| | * | Shadow from Zurich header on to map (fixes a37). | Matthew Somerville | 2013-01-31 | -0/+3 |
| | | | ||||
| | * | Remove two further out Zurich zoom levels, add 1:500 (fixes a9). | Matthew Somerville | 2013-01-31 | -3/+3 |
| | | | ||||
| | * | Fix Zurich blue. | Matthew Somerville | 2013-01-25 | -6/+6 |
| | | |