aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch '1474-absolutely-fabulous'Matthew Somerville2016-08-10-12/+13
|\
| * Make UPLOAD_DIR/GEO_CACHE relative to project rootMatthew Somerville2016-08-10-12/+13
| | | | | | | | | | If they are absolute already, do nothing. Switch a couple of uses to Path::Tiny as well.
* | Fix "Problems nearby" link on /my and /reports.Matthew Somerville2016-08-10-1/+5
| | | | | | | | | | Problems nearby should load the /around page from those pages, rather than act like "Back to all reports" but changing to an incorrect URL.
* | Merge branch 'issues/forcouncils/10-report-as-dropdown'Matthew Somerville2016-08-10-15/+448
|\ \ | |/ |/|
| * Feature to create report as body/other user.Zarino Zappia2016-08-10-15/+448
| | | | | | | | | | | | | | | | | | | | | | | | This allows users who have the correct permissions to add reports on behalf of the body or another user. We enable editing of the email box by default, so that if JavaScript isn't available, someone can still change the email for the 'another user' option. For mysociety/fixmystreetforcouncils#10 and mysociety/fixmystreetforcouncils#11
* | Don't error if static map tile fetch fails.Matthew Somerville2016-08-10-3/+14
| | | | | | | | Also don't fetch tiles if running tests.
* | Remove non-working links (no RSS in Google Maps).Matthew Somerville2016-08-10-6/+0
| |
* | Add config for Open311 request limit, default 1000.Matthew Somerville2016-08-10-6/+9
| | | | | | | | Fixes #1313.
* | Do not send alerts for hidden reports.Matthew Somerville2016-08-10-0/+2
| | | | | | | | Fixes #1461.
* | Skip incoming Open311 update if no ID or content.Matthew Somerville2016-08-10-0/+1
| |
* | Set mappage class on map skipped page.Matthew Somerville2016-08-10-1/+1
| | | | | | | | Fixes #1479.
* | Merge branch 'test-tweaks'Matthew Somerville2016-08-09-2/+20
|\ \ | |/ |/|
| * Generate unique config per test run.Matthew Somerville2016-08-09-2/+17
| | | | | | | | | | | | | | | | This allows multiple test suites to run simultaneously (beforehand, a second run would overwrite the same config file and lose its database connection). Clean up the created config file on exit.
| * [Zurich] Add areas in test reports to fix warning.Matthew Somerville2016-08-09-0/+3
| |
* | Remove check constraint on user body permissions.Dave Arter2016-08-09-5/+15
|/ | | | We'll soon be adding more new permission types.
* Merge branch '1469-html-email-fixes'Matthew Somerville2016-08-08-102/+60
|\
| * Factor out HTML email sidebar to own template.Matthew Somerville2016-08-08-64/+28
| |
| * Try and ensure emails have no lines of spaces.Matthew Somerville2016-08-08-43/+43
| | | | | | | | | | One mail server we send to appears to reject messages containing =20, even though those are perfectly acceptable quoted-printable messages.
| * Log failure to send email.Matthew Somerville2016-08-08-1/+2
| |
| * Move host/IP to footer in HTML contact email.Matthew Somerville2016-08-08-8/+1
| |
| * Avoid illegible email repliesZarino Zappia2016-08-08-2/+2
| | | | | | | | | | | | | | | | | | HTML emails now have a white body background-color, so that replies sent from Outlook (which inserts the reply message inside the body of the original message) will have a white background. Part of #1469.
* | Fix other "keys on reference" warning.Matthew Somerville2016-08-08-1/+1
| | | | | | | | This is a continuation of b45b29c8.
* | Run createsuperuser script as vagrant user.Matthew Somerville2016-08-08-1/+1
|/
* [fixmystreet.com] Replace councils page with temporary pageMartin Wright2016-08-02-710/+37
| | | | | | Temporarily removes the councils page as the information was out of date. Replaces it with a holding page. New page is on the way.
* [East Sussex] Remove East Sussex cobrandDave Arter2016-08-02-1195/+1
|
* Merge branch '1281-html-emails'Dave Arter2016-08-01-494/+1562
|\
| * [UK Councils] Email themes for 4 UK councilsZarino Zappia2016-08-01-0/+78
| | | | | | | | Email themes for Oxfordshire, Bromley, Warwickshire, and Greenwich.
| * Add HTML email templates.Matthew Somerville2016-08-01-433/+1322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Design is all Zarino. This adds the ability to send HTML emails, including attached inline images. When included, this is done as a multipart/related email containing a multipart/alternative (of plain and HTML) and any attached images, so that the images are available even if HTML mail is not. The alert emails list data has been improved so it can be constructed in the templates rather than the code. Various templates have been tidied. Various workarounds for email clients have been made, including: * <th> is used so that the Android 4.x mail client can give them `block` styling in the small screen media query. * Font settings defined on every table cell (<th>) so that sans-serif fonts are used in Outlook, rather than Times New Roman. * A three-column wrapper table to create a 620px centred content area that also shrinks down on narrow screens. (Outlook doesn’t like max-width, so this is the simplest alternative.) * Enforcing a sensible (500px) min-width for the main content area, on clients that don’t support media queries (eg: native Gmail app). * Giant borders on buttons so Outlook displays them * Image alignment with align rather than float.
| * Add static map output view for a report.Matthew Somerville2016-08-01-13/+113
| |
| * Move photoset stuff to new Role.Matthew Somerville2016-08-01-42/+39
| |
| * Test for Image::Magick installation better.Matthew Somerville2016-08-01-6/+10
|/ | | | (VERSION disappears in some recent version.)
* [Zurich] Send admin emails from the do-not-reply addressDave Arter2016-07-28-5/+4
| | | | | Also takes the opportunity to fix the incorrectly-encoded sender name which was appearing to some clients as "Züri Wie Neu".
* Merge branch 'pinished'Dave Arter2016-07-26-106/+78
|\
| * Refactor map pin/feature functions.Matthew Somerville2016-07-21-106/+78
|/
* Fix crash on /my page due to missing pin.problemDave Arter2016-07-21-0/+1
|
* Fix "keys on reference is experimental" warning in Perl 5.20+Dave Arter2016-07-21-1/+1
|
* Merge branch 'admin-using-normal-login'Dave Arter2016-07-20-179/+352
|\
| * Respect cobrand restriction for unsent reportsDave Arter2016-07-19-1/+1
| |
| * Disallow empty name when creating/editing bodies in adminDave Arter2016-07-19-17/+46
| |
| * Use improved TestMech::create_user_ok instead of User::find_or_createDave Arter2016-07-19-132/+47
| | | | | | | | | | This improves create_user_ok to work more like create_body_ok where extra params can be passed in and set on the model.
| * Restrict add/editing of bodies in admin to superusersDave Arter2016-07-19-17/+24
| |
| * [UK Councils] Council users can only see their own council's adminDave Arter2016-07-19-9/+50
| |
| * Use normal user authentication to control access to /adminMatthew Somerville2016-07-19-26/+207
|/ | | | | | | | | - Adds is_superuser flag to User - Logged-in user must be a superuser or have from_body set in order to access anything within /admin - has_permission_to on a superuser will always return true - Only superusers can create/grant superusers - New `createsuperuser` command for creating superusers
* Merge branch '400-editing-category'Matthew Somerville2016-07-15-41/+65
|\
| * Allow editing of category on admin report edit.Matthew Somerville2016-07-15-5/+50
| | | | | | | | This also updates the body column to match the category.
| * Remove bit of unused/needed code.Matthew Somerville2016-07-15-24/+3
| |
| * Check extras for all retrieved contacts.Matthew Somerville2016-07-15-12/+12
| |
* | Stop using collapse filter in category template.Matthew Somerville2016-07-15-33/+30
| | | | | | | | | | | | If a category had eg. a double space, the use of the filter meant it was output in the HTML with only a single space and so woudn't match the database entry. Switch to more explicit template space chomping.
* | Work correctly for alt-click/cmd-click etc.Matthew Somerville2016-07-14-3/+39
| |
* | Only set document.title after any pushState call.Matthew Somerville2016-07-14-2/+2
|/ | | | pushState stores the title at the time for e.g. the Back dropdown.