aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* [Zurich] moderation cron only checks 'unconfirmed'Hakim Cassimally2013-12-09-2/+2
| | | | | | | | | | see mysociety/FixMyStreet-Commercial#459 - "a report is moderated as soon as its state has changed for the first time from Erfasst (en: Submitted / db: unconfirmed) to any other state." Thus we move 'confirmed' problems from the 1-day moderation SLA, to a 5-day one, with $include_parent unset (e.g. as with 'planned' it is with the DM, so doesn't need to be sent to the parent body also.)
* Actually include the image, doh.Matthew Somerville2013-11-20-0/+0
|
* Add OpenGraph meta elements (for #613).Matthew Somerville2013-11-20-0/+10
|
* Merge branch 'fixmindelo-privacy'Matthew Somerville2013-11-20-0/+114
|\
| * [FixMindelo] Translation of the privacy page.Jen Bramley2013-11-20-51/+80
| | | | | | | | Omitted the credits and links to further information.
| * Copy of main privacy file to work on.Matthew Somerville2013-11-20-0/+85
| |
* | Remove cached photos if hidden in admin interface.Matthew Somerville2013-11-20-3/+21
| | | | | | | | | | Use the internal hash URL of the photo so that it can still be seen in the admin interface.
* | Tidy up use of main width a bit.Matthew Somerville2013-11-13-13/+11
| |
* | Simplify .content width/margins.Matthew Somerville2013-11-13-14/+4
|/ | | | | | Reduce magic numbers by switching fixed width to a margin elsewhere. This has the added bonus of making the 'middle-width' .content have a pleasing right margin.
* Version 1.3.v1.3Matthew Somerville2013-11-12-4595/+8101
|
* Include version number on admin config page.Matthew Somerville2013-11-12-1/+10
|
* Add body deletion to admin interface.Matthew Somerville2013-11-11-7/+11
|
* Don't display categories for deleted bodiesChris Mytton2013-11-11-1/+19
| | | | | | | | | | | | When a body has been marked as deleted (currently only exposed in the Zurich cobrand's admin) the categories for that body should not be available on the report_new form. Prior to this change there was an error running the 'zurich-overdue-alert' script, because it wasn't expecting the 'bodies_str' field to have any entries in the format 'x|y,z', this prevents this problem from happening in the future (though it doesn't fix any existing entries with this issue).
* If only one cobrand given, always use it.Matthew Somerville2013-11-07-48/+104
| | | | | | | | | If the ALLOWED_COBRANDS configuration variable only contains one entry (and also work if it's a string rather than a list), always use that cobrand, no matter what the hostname is. The example Vagrantfile no longer needs the configuration changes at all.
* Reorganise admin update list to match report list.Matthew Somerville2013-11-07-9/+9
|
* Add more admin external link icons.Matthew Somerville2013-11-07-16/+16
| | | | Use a relative URL in the CSS in case it's proxied.
* Show a graphic on links to non-admin pagesAndy Lulham2013-11-07-11/+20
| | | | Graphic and css from FMT. Fixes #579.
* Use relative URLs in case being included via proxy.Matthew Somerville2013-11-07-4/+4
|
* Make sure admin start is specified for all the static files.Matthew Somerville2013-11-07-9/+9
|
* Merge remote branch 'origin/ab_date'Matthew Somerville2013-11-07-23/+48
|\
| * fix typo and localise placeholdersDave Whiteland2013-11-07-2/+2
| |
| * use local jquery ui, not CDN, for admin datepickerDave Whiteland2013-11-07-2/+16
| |
| * Add placeholder textAndrew Black2013-11-07-2/+4
| |
| * Remove trailing whitespaceAndrew Black2013-11-07-1/+1
| |
| * Create a single date fields and parse as DD/MM/YYYYAndrew Black2013-11-07-19/+12
| |
| * Add Jquery-ui files, and fixmystreet-admin.jsAndrew Black2013-11-07-1/+21
| |
| * Create a single fieldAndrew Black2013-11-07-6/+2
| |
* | [Oxfordshire] Fix map center offsetChris Mytton2013-11-07-2/+2
|/ | | | | This fixes the map so the centre is offset to the right to account for the overlayed sidebar on the left.
* remove FixMindelo header, override title insteadDave Whiteland2013-11-05-80/+2
| | | | | The staging banner didn't fit, and .wrapper{position:relative} was breaking things :-( Easier to keep it simple, drop the header and just set the title in the Cobrand module instead.
* Merge branch 'multiple_emails_per_contact'Struan Donald2013-11-04-3/+59
|\
| * Tests for contact with comma seperated multiple emailsStruan Donald2013-11-04-0/+46
| |
| * change email sender to handle multiple emails per contactStruan Donald2013-10-28-3/+13
| | | | | | | | | | splits emails on comma WIP
* | Merge branch '389-report-search-ref' of ↵Matthew Somerville2013-11-04-0/+12
|\ \ | | | | | | | | | https://github.com/andylolz/fixmystreet into andylolz-389-report-search-ref
| * | One more external id-related testAndy Lulham2013-10-26-0/+3
| | |
| * | Add a test for the external_id admin report searchAndy Lulham2013-10-26-0/+4
| | |
| * | Include external_id in admin reports search.Andy Lulham2013-10-17-0/+5
| | | | | | | | | | | | Fixes #389
* | | Piping the install script to 'sudo sh -s' is deprecatedMark Longair2013-10-29-2/+2
| |/ |/|
* | Factor out some CSS colours, so that default layout CSS has no overrides.Matthew Somerville2013-10-25-129/+93
| |
* | Work around Chrome bug with bottom fixed navbar.Matthew Somerville2013-10-25-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | The position:fixed bottom navigation does not stay fixed in Chrome, it appears to scroll with the content (though the link targets remain and swapping tabs fixes the display, so I'm pretty sure it's a bug). The bug is logged in Chrome's tracker at: https://code.google.com/p/chromium/issues/detail?id=311513 To work around it, the z-index has been removed from .container; this would mean that the sidebar notes all disappeared under the map, so they have been jigged to appear on top of the main content div instead.
* | Tidy user-meta CSS a bit.Matthew Somerville2013-10-25-17/+9
| |
* | Tidy up panzoom bar placement.Matthew Somerville2013-10-25-12/+13
| |
* | Set confirmed timestamp on any admin unconfirmed state change.Matthew Somerville2013-10-25-2/+11
| | | | | | | | This fixes #527.
* | More accurate config overriding for Zurich.Matthew Somerville2013-10-24-5/+20
| |
* | Fix test suite to run regardless of config setup.Matthew Somerville2013-10-24-611/+904
| |
* | [Zurich] Don't migrate problem_state when converting internal notesChris Mytton2013-10-22-1/+0
| | | | | | | | | | | | | | | | This caused issues with the comment.problem_state column constraints when running on the vhost as some problems were marked as hidden (under normal circumstances you can't add a comment to a hidden problem). Because this column is nullable we simply don't add it to avoid this issue.
* | [Zurich] Remove phone number requirement for mobile app reportsChris Mytton2013-10-21-1/+28
|/ | | | | | | | | | | | | | | | | The phone number was made mandatory in #541. To make this change compatible with older versions of the mobile app I've had to drop server side validation of the phone number for requests that come in from mobile apps. To determine if it's a mobile request I'm checking the 'service' parameter in the request, which is only set in requests from the mobile apps [1]. The phone validation will still happen client side for the newer versions of the app, and the web app will continue to work with the server side validations. [1] https://github.com/mysociety/zurich_mobile/blob/1fec2bc21dad9326819105cdbf5d47183e7503ba/www/js/models.js#L75
* Merge pull request #502 from mysociety/oxfordshire-usability-recommendationsChris Mytton2013-10-16-95/+176
|\ | | | | Oxfordshire: Implement usability recommendations
| * Merge branch 'master' into oxfordshire-usability-recommendationsChris Mytton2013-10-16-2192/+3645
| |\ | |/ |/|
* | [Zurich] Add missing translation stringChris Mytton2013-10-15-1/+1
| | | | | | | | Part of mysociety/FixMyStreet-Commercial#423
* | [Zurich] Capitalise translationChris Mytton2013-10-15-1/+1
| | | | | | | | Part of mysociety/FixMyStreet-Commercial#423