aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Merge branch 'trusty-tahr'Matthew Somerville2014-11-07-51/+255
|\
| * Reinstate some cpanfile.snapshot entries.Matthew Somerville2014-11-07-1/+184
| | | | | | | | | | | | | | This puts back any missing snapshot modules removed in 1708bc30af7176f95f0ec5718289d3a633daf32b, as they are required for installation on squeeze, which misses or does not have the required version of these.
| * Remove unused variable.Matthew Somerville2014-11-07-1/+0
| | | | | | | | | | Also, s///r isn't present in 5.10, and FixMyStreet should still install on squeeze.
| * Remove liberror-perl and libsoap-lite-perl.Matthew Somerville2014-11-05-24/+13
| | | | | | | | | | | | Try and save other people the potential pain of installing SOAP::Lite; only UK FixMyStreet and Zurich geocoder use it, so set it as an optional feature in the cpanfile instead.
| * Update to use bundler and work on Ubuntu Trusty.Matthew Somerville2014-11-05-25/+58
| | | | | | | | | | | | | | | | Switching to bundler saves confusion about gem paths when running sass/compass to compile the CSS. Trusty can use precisely the same packages as precise, with a few tweaks to generalise the contents.
* | EastSussex. z-index fixes for IE7Hakim Cassimally2014-11-04-2/+13
|/ | | | | | | | | | | | The #map_box div wasn't clickable, so we had to reset its z-index from the broken -1 to 0. IE7 doesn't like setting z-index to 0 in javascript (as it's a falsy value) so instead we set the z-index of parent and sibling elements (body and site-header) to 1 to make sure they are visible. position:relative in base.scss is to make sure that the header is now shown (similar to @6296cb33) See https://github.com/mysociety/FixMyStreet-Commercial/issues/639
* Warwickshire. front page wording for Street LightingHakim Cassimally2014-10-30-0/+7
| | | | At Noel's request.
* correct path for oxfordshire logo on council pageStruan Donald2014-10-28-1/+1
| | | | fixmystreet/com -> fixmystreet.com
* Category should be escaped in RSS feeds.Matthew Somerville2014-10-24-1/+1
| | | | In case it contains an ampersand or somesuch.
* Allow filtering by category on All Reports page.Matthew Somerville2014-10-24-0/+6
| | | | If you know to change the URL, anyway, for now.
* [fixmystreet.com] Experiment, no pins by default.Matthew Somerville2014-10-17-12/+149
| | | | | | | | This changes the default flow to show no pins and a message about reporting, with the second tab displaying existing problems (and showing map pins). Those existing problems are the ones that would currently be on "problems on the map" followed by those currently on "problems nearby".
* [fixmystreet.com] Remove login content experiment.Matthew Somerville2014-10-17-142/+1
| | | | This gave no conclusive results, which was interesting.
* Move some fixmystreet.com-only stuff into cobrand.Matthew Somerville2014-10-17-17/+17
|
* [Warwickshire] beta noticeHakim Cassimally2014-10-16-0/+3
| | | | | | | see https://github.com/mysociety/FixMyStreet-Commercial/issues/596 (in separate commit with inline style, to hopefully make easy to revert)
* [Warwickshire] raise z-index of map, working around chrome bugHakim Cassimally2014-10-16-1/+2
| | | | | | | | | | | | | works around https://github.com/mysociety/FixMyStreet-Commercial/issues/614 (This is a chrome bug, but as it doesn't happen with standard FMS, we investigated further with @stevenday and @zarino. For reasons I don't understand, the issue is fixed by: - removing negative z-index from map - this then makes the site-header not display, so we set position:relative -- not having done this before might be the reason for the previous negative index? )
* [Warwickshire]. PopulateServiceList deletion tweakHakim Cassimally2014-10-16-4/+15
| | | | | | as WCC is (during beta) mixed email (manually updated) and Open311, override the behaviour to delete contacts not returned by service list, to ignore ones that look like email addresses.
* [Warwickshire] Integration bits during/after visitHakim Cassimally2014-10-16-218/+291
| | | | | | | - Tweaks required to get things working in WCC environment - update Open311 to onsite changes - updated Open311 parameters after WCC's Bentley and County Highways workshop. - ... including ce_cpr_id
* Open311: FMS <-> Open311 Endpoint End to end testsHakim Cassimally2014-10-16-281/+447
| | | | | Uses LWP::Protocol::PSGI to avoid having to spawn external processes in order to test these end to end.
* Open311 tweaks to get round-tripping workingHakim Cassimally2014-10-16-3/+10
| | | | | If https://github.com/mysociety/fixmystreet/pull/792 is accepted then this should be rewritten in terms of that.
* Open311. Remove extraneous 'jurisdiction' parameterHakim Cassimally2014-10-16-1/+0
| | | | | | | This parameter was added in 3eb93cea4acd5f9b76efdc0910466363a0b9b445 and is superfluous (as jurisdiction*_id* is the correct parameter, and is already sent.) That commit mentions only api_key so understand this wrong parameter is an artefact.
* Open311 Warwick (Exor) IntegrationHakim Cassimally2014-10-16-21/+906
| | | | | | | | | | | | | | | | | | | | | | | ::Integration::Warwick subclasses ::Integration::Exor refactor request_class and new_request Exor service Warwickshire updates retrieval, with datetimes stubbing out of Oracle constants, for local testing We also edit FMS's core PopulateServiceList routine to hide system fields from FMS: Bromley/Warwickshire send metadata in their services/FOO.xml advising that you can pass, e.g. attributes[easting]. FMS by default shows all of these to the user to fill in, however we don't *want* the user to supply these, rather they are added by the cobrand. Bromley had an exception for this (keyed by $body->areas->id). We write this more generally for Warwickshire too, keying instead by $body->name (as this is far less likely to be overridden for installs using global or custom Mapit's)
* Open311 Role for accepting default config fileHakim Cassimally2014-10-16-0/+54
| | | | | | | | See also MooX::ConfigFromFile, but that's underdocumented and seems overengineered -- may be worth implementing if requirements become more complex however. (See also Config::Any, which is well worth doing in future, using YAML only reflects current usage in FMS though.)
* Open311 Endpoint mySociety extensions roleHakim Cassimally2014-10-16-6/+478
| | | | | | | | | | | | | | * Get Service Request Updates This requires a new object ::Service::Request::Update, which of course is not part of standard spec. So, in order to make the core not too contaminated by : * the endpoint should instantiate ::Service::Request::mySociety objects which know about updates * have added a learn_additional_types callback from Schema to Endpoint, so that core doesn't need to know about /open311/service_request_update * (but ::Spark knows about the exception for updates... meh, but is 1-line)
* Open311 EndpointHakim Cassimally2014-10-16-9/+2273
| | | | | | | | | | | | | | | | | | | | | Subsystems include * ::Spark encoding conventions for xml/json * ::Schema using Rx to validate form of inputs and outputs, including validation for, e.g., dates and CSV as part of Open311 Handles following paths: * Open311 attributes for Service Definition http://wiki.open311.org/GeoReport_v2#GET_Service_Definition * POST service request * GET Service Requests * GET Service Request Objects: * ::Service * ::Service::Request
* [Warwickshire] cobrand workDave Arter2014-10-16-3/+12498
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First Warwickshire styling - imported WCC's header and footer files - Use Warwickshire colours for page elements - Include FMS elements in header - Use correct Warwickshire colours on map - Use full-screen map on desktop. - Improve display of homepage elements - Ensure correct classes are added to body tag - Make sure site header has correct height on front page - Tidy-up of unused header content and wrappers - Improve display of map - Position map beneath other elements Improve map display - Take some CSS from Warwickshire styles to ensure its applied - Fix container widths on map page - Make sure map wrapper is the correct width - Add style overrides to match Warwickshire.gov.uk - Ensure map controls are visible Nav and mobile styling - Make sure sticky sidebar nav is usable - Improve mobile front page - Ensure map is full-screen on mobile - Improve front page display on mobile - Fix map display on desktop - Fix Warwickshire and FMS nav on mobile - Add viewport meta tag for mobile devices - Tighten up vertical spacing on front page - Fix header height on tablet size screens - Set pan/zoom position in CSS, not JS Styling tweaks - correct styling of nav for wider screens (previous hidden by media query) - Add draft Warwickshire FAQ - Fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/611 - Warwickshire. remove all reports link as requested. - see https://github.com/mysociety/FixMyStreet-Commercial/issues/609 - Update WCC footer - see https://github.com/mysociety/FixMyStreet-Commercial/issues/597 Bring WCC css locally, and override - Override for https://github.com/mysociety/FixMyStreet-Commercial/issues/612 - favicon https://github.com/mysociety/FixMyStreet-Commercial/issues/616 - update contact details - custom FAQ - fix padding on mobile https://github.com/mysociety/FixMyStreet-Commercial/issues/617
* Merge branch 'issues/commercial/603/generic-problems-clause-for-two-tier'Hakim Cassimally2014-10-16-21/+37
|\
| * UK. Generic problems_clause for two-tier councilsHakim Cassimally2014-10-10-21/+37
| | | | | | | | | | | | Replace copy-pasted problems_cause declarations in Hart, Oxfordshire, and East Sussex with a generic override in UKCouncils.pm (as a bonus also overrides Stevenage)
* | Paginate admin search results.Matthew Somerville2014-10-13-24/+27
| |
* | Copy changes, add new FMS deploysMartin Wright2014-10-13-6/+8
| | | | | | | | | | Conflicts: templates/web/fixmystreet.com/static/council.html
* | [fixmystreet.com] correct pricing for back end scopingStruan Donald2014-10-13-1/+1
|/
* ESCC. bodies_clause specialisationHakim Cassimally2014-10-10-0/+8
| | | | | patch for https://github.com/mysociety/FixMyStreet-Commercial/issues/603 more generic fix to follow
* EastSussex: set is_two_tierHakim Cassimally2014-10-09-1/+1
| | | | | | I appear to have left this commented out. Comments from both ESCC and a district council (Wealden) on same day seem to point to this as root of error.
* Update links to point to new /council page.Matthew Somerville2014-10-09-23/+25
|
* [FixMyStreet.com] Add information for councils.Matthew Somerville2014-10-09-3/+844
| | | | Fixes #765.
* Merge remote-tracking branch 'origin/issues/739-move-diligency-table'Matthew Somerville2014-10-09-8/+3
|\
| * Move diligency table to bottom of page.Matthew Somerville2014-10-07-8/+3
| | | | | | | | | | Not that useful in most cases, only if you wanted some admin competition on category entering/checking. Fixes #739.
* | Merge remote-tracking branch 'origin/issues/516-body-warning'Matthew Somerville2014-10-09-8/+12
|\ \
| * | Tweak summary output on bodies page.Matthew Somerville2014-10-07-8/+12
| |/ | | | | | | | | Show more detail of unconfirmed/deleted categories; highlight and warn if no categories, or if all categories are deleted. Fixes #516.
* | Prevent overhang of admin body categories table.Matthew Somerville2014-10-08-21/+25
| | | | | | | | Group things together more simply. Fixes #738.
* | Validate category name/email/note in admin.Matthew Somerville2014-10-08-24/+51
| | | | | | | | This prevents the creation of a category with a blank name. Fixes #556.
* | replace Mailman cross-sell with Mailchimp signup formZarino Zappia2014-10-08-4/+7
| |
* | Couple of tests missing MapIt override.Matthew Somerville2014-10-08-2/+10
|/ | | | Looks like Travis doesn't like connections back to itself.
* Remove margin from fieldsets, tidy box sizes.Matthew Somerville2014-09-25-49/+5
|
* Move most 'change location' text to main column.Matthew Somerville2014-09-25-33/+29
|
* [Oxfordshire] Lower min-height offset to cover mapMatthew Somerville2014-09-25-0/+3
|
* Tweak reporting form i18n and style.Matthew Somerville2014-09-25-6/+4
| | | | | | Factor out "(public)" to its own string, and only remove the label top margin if it's an immediate child (otherwise labels inside divs halfway down lose their margin).
* Remove .general-sidebar-notes, inline text insteadMatthew Somerville2014-09-25-159/+101
| | | | | This removes all "hanging on" sidebars apart from the main reporting a problem one, interspersing the text in the form instead.
* Fix map page content minimum height.Matthew Somerville2014-09-25-6/+3
| | | | | | Reduce the default by 3em to match the .content margin change. Include East Sussex in this calculation again, but set a .mappage padding-bottom so that there's no gap at the bottom of the page.
* Various fixes to cobrands post zero content marginMatthew Somerville2014-09-24-26/+17
|
* Don't output footer navigation on map page.Matthew Somerville2014-09-24-14/+20
| | | | It's invisible anyway and pushes content bottom up a bit.