aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | Merge branch '1205-hardcoded-site-name'Matthew Somerville2015-09-28-197/+96
|\ \
| * | A slightly better translation string on alert pageMatthew Somerville2015-09-28-116/+16
| | | | | | | | | | | | Fixes #348. Also combine base/fixmystreet _list.html templates in one.
| * | Remove remaining hardcoded site name from strings.Matthew Somerville2015-09-28-83/+82
| | | | | | | | | | | | Add a site_name template parameter available to all templates.
* | | Send altered confirmation email if not being sent.Matthew Somerville2015-09-28-2/+46
|/ / | | | | | | Fixes #1210.
* / Streamline navigation menu CSS.Matthew Somerville2015-09-28-355/+263
|/ | | | | Reduce need for specificity. Also fix some bugs in Harrogate base menu display, and couple of other cobrand tweaks.
* Make sure Vagrantfile checks out git submodules.Matthew Somerville2015-09-24-0/+11
| | | | Fixes #1197. Thanks to Dave Arter for helping out with this.
* Merge remote-tracking branch 'mysociety/1164-up-to-date-maintenance'Matthew Somerville2015-09-22-21/+90
|\
| * Bring down page up to date, and work via proxy.Matthew Somerville2015-09-21-21/+90
| | | | | | | | Fixes #1164.
* | Merge remote-tracking branch 'mysociety/838-giant-map-icon'Matthew Somerville2015-09-22-0/+1
|\ \
| * | Add missing background-size to retina image.Matthew Somerville2015-09-22-0/+1
| |/ | | | | | | Fixes #838.
* | Merge remote-tracking branch 'mysociety/1093-physical-address'Matthew Somerville2015-09-22-0/+21
|\ \
| * | Add physical address and more opt out instructionsMatthew Somerville2015-09-21-0/+21
| |/ | | | | | | Fixes #1093.
* | Merge remote-tracking branch 'mysociety/1077-recursive-path'Matthew Somerville2015-09-22-0/+3
|\ \
| * | Prevent potential recursion in session cookie.Matthew Somerville2015-09-21-0/+3
| |/ | | | | | | Unlikely to crop up, but this fixes #1077.
* / If a sign-in button explicitly clicked, use it.Matthew Somerville2015-09-21-3/+5
|/ | | | Fixes #1091.
* Improve accessibility of map pages.Matthew Somerville2015-09-18-7/+11
| | | | | | | | Hide the map with aria-hidden, as all report links are duplicated in the main content. Fix skip map link on mobile (it was disappearing). Place delegate handler on body to prevent e.g. VoiceOver announcing everything underneath .container as clickable. Remove header report button rather than hide off-screen, as is a duplicate link to the previous.
* Allow Google map/hybrid initial view to be chosen.Matthew Somerville2015-09-17-9/+17
| | | | | The GoogleOL layer will default to map, unless the fixmystreet_google_default variable is set to 'satellite'.
* Fix Google Maps GoogleOL maps layer.Matthew Somerville2015-09-17-1/+1
| | | | | Pin the version of the Google Maps API loaded to one that continues to work. Fixes #1215.
* Merge branch '557-email-confirmation-pages'Matthew Somerville2015-09-17-228/+144
|\
| * Remove `fixmystreet` cobrand version of login pageZarino Zappia2015-09-17-140/+59
| | | | | | | | | | | | | | The `base` and `fixmystreet` login templates were basically the same, so this commit combines them and puts the result in the `base` cobrand. Since most cobrands inherit from `fixmystreet` anyway, this shouldn’t cause any major issues.
| * Centre the login and password reset pages.Zarino Zappia2015-09-17-14/+13
| | | | | | | | Remove unnecessary authpage things from other cobrands.
| * Conciser text on the email confirmation pages.Zarino Zappia2015-09-17-71/+57
| | | | | | | | | | It’s best if Zurich keeps the old text, so now they have their own overrides for those template files.
| * Improve "check your emails" page layout.Zarino Zappia2015-09-17-19/+31
| | | | | | | | | | Use the same layout as the "success" screen you will see after you click the emailed link.
* | Merge branch 'issues/#1104-questionnaire-form-design'Matthew Somerville2015-09-17-153/+144
|\ \
| * | Show report details more clearly on questionnaire pageZarino Zappia2015-09-17-153/+144
| |/ | | | | | | Fixes #1104.
* / [UK Councils] Add contact_email addresses to cobrandsSteven Day2015-09-17-5/+25
|/ | | | | | | | | This sets the contact email for: - East Sussex - Greenwich - Oxfordshire - Stevenage
* Improve alert form box padding.Matthew Somerville2015-09-17-1/+1
|
* Add some inline docs about using right-to-left.Matthew Somerville2015-09-17-0/+7
|
* Update JavaScript to handle right-to-left layout.Matthew Somerville2015-09-17-25/+44
|
* Update SCSS to handle right-to-left layout.Matthew Somerville2015-09-17-352/+378
| | | | | Adds a '$direction' parameter that can be used to switch all layout to either left or right.
* Add 'iel8' class to handle IE6-8 things.Matthew Somerville2015-09-17-66/+65
| | | | Remove unused 'oldie' (that was IE6-9).
* Remove unused JavaScript file.Matthew Somerville2015-09-17-37/+0
|
* Add way to see "Please check your email" pages.Matthew Somerville2015-09-17-0/+11
| | | | This makes testing easier.
* Update terminal title with CSS writing progress.Matthew Somerville2015-09-17-2/+2
|
* Update URL hash when menu nav button clicked.Matthew Somerville2015-09-17-0/+1
|
* Use Modernizr to decide whether to show mobile mapMatthew Somerville2015-09-17-28/+6
| | | | Fixes #1192.
* Mock MapIt postcode call to fix broken tests.Matthew Somerville2015-09-15-17/+39
| | | | SW1A 1AA has moved, who'd have thought.
* [Travis] Use bundled carton on Travis.Matthew Somerville2015-09-07-2/+1
|
* Merge branch '1202-improve-gettext-extract-and-more'Matthew Somerville2015-09-07-3338/+80890
|\
| * Improve gettext-extract to work without fuss.Matthew Somerville2015-09-04-0/+94
| | | | | | | | | | | | | | Use bundled carton to install required module separately, using a minimal cpanfile (and Debian squeeze generated snapshot). Fixes #1202.
| * Bundle carton.Matthew Somerville2015-09-04-7/+80536
| | | | | | | | | | | | | | | | | | | | | | | | | | This was generated using 'carton fatpack' as follows: bin/cpanm -L local-carton --with-recommends Carton export PERL5LIB=<absolute path to local-carton>/lib/perl5/ local-carton/bin/carton fatpack (It needs to be an absolute path in order to locate the meta files.) This was done on a Debian squeeze box to make sure any too-old core modules were updated and included in the bundle.
| * Upgrade bundled cpanm.Matthew Somerville2015-09-04-185/+235
| |
| * Tidy up .gitignore file.Matthew Somerville2015-09-04-23/+22
| |
| * [fixmystreet.com] Remove unused Barnet code.Matthew Somerville2015-09-03-3123/+3
| |
* | Merge branch 'fix-cobrand-restriction-warning'Matthew Somerville2015-09-04-20/+19
|\ \ | |/ |/|
| * Use base URL in cobrand alert for no-body report.Matthew Somerville2015-09-03-20/+19
| | | | | | | | | | | | If a cobrand has a body restriction, then a report without any body won't be shown on it, so we need to make sure links to the report (in email alerts and RSS) are to the base URL, not the cobrand.
* | Allow through reply-to header in send_email.Matthew Somerville2015-09-01-1/+1
| | | | | | | | This might be used now by e.g. the contact form.
* | Fix location bug fetching category extras.Matthew Somerville2015-09-01-7/+2
| | | | | | | | | | On a form, except one where you skipped the map, the category change call would use the initial map centre, rather than the map pin location.
* | Merge branch '1179-translate-states-in-admin'Matthew Somerville2015-09-01-28/+47
|\ \
| * | Translate state column in admin index and lists.Matthew Somerville2015-09-01-28/+47
| | | | | | | | | | | | Fixes #1179.