aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Tweak WMTS JavaScript to match merged branch.Matthew Somerville2016-07-11-16/+13
| | | | Use $.each rather than .forEach.
* Merge branch '1351-report-list-ajax'Matthew Somerville2016-07-11-1537/+1804
|\
| * [fixmystreet.com] Update share buttons to be linksMatthew Somerville2016-07-11-17/+23
| | | | | | | | | | Having them as SDK-included buttons causes issues with the ajax report pull-ins, plus Firefox doesn't like them being hidden.
| * Merge two fixmystreet.js file.Matthew Somerville2016-07-11-209/+201
| |
| * Add history polyfill for <=IE9.Matthew Somerville2016-07-11-1/+41
| |
| * Fix map page popstate / mobile nav menu bugZarino Zappia2016-07-11-1/+15
| | | | | | | | | | | | | | | | | | | | | | Previously, pressing the mobile menu icon would change the location hash, which fired a history popstate event with an empty state object, causing trouble for our map page JavaScript. Now, pressing the mobile menu icon triggers a pushState, instead of changing the location hash. This means our map page popstate logic is unaffected, but mobile users can still use their browser's Back button to escape out of the mobile menu.
| * Move to using pushState for new report.Zarino Zappia2016-07-11-95/+96
| | | | | | | | | | Update the URL whenever location of pin is updated (first time, drag, or reclick), make sure it works when clicking back.
| * Fix top of content display if scrolled previously.Matthew Somerville2016-07-11-1/+2
| |
| * Load in report details on around page via ajax.Zarino Zappia2016-07-11-51/+282
| | | | | | | | | | | | | | | | | | | | | | Include URL changing, using history.pushState. Show a larger marker icon for the selected report. Make sure title is updated, and correct sub_map_links are shown. The /report/new template is now wrapped in a <div id="side-form"> rather than <div id="side"> for consistency with the /around page, which keeps display_all_reports_in_area() simpler, because it can always assume "#side" means "list of reports".
| * Simplify "rap-notes" visibility togglingZarino Zappia2016-07-11-44/+42
| | | | | | | | | | On mobile, the notes in `#report-a-problem-sidebar` are hidden by default, and can be toggled using the `.rap-notes-trigger`.
| * Edge case fixes for window resizes mid process.Matthew Somerville2016-07-11-3/+3
| |
| * Only match the actual ID, not same-ending others.Matthew Somerville2016-07-11-2/+2
| |
| * Increase opacity a bit on non-hovered pins.Matthew Somerville2016-07-11-1/+1
| |
| * Tidy up JavaScript functions.Matthew Somerville2016-07-11-1240/+1215
| | | | | | | | Split big functions into smaller more descriptive ones.
| * Move most JavaScript mobile map changes to CSS.Zarino Zappia2016-07-01-36/+46
| |
* | Merge branch 'issues/commercial/500-cobrand-reporting-issues-redux'Dave Arter2016-07-08-79/+251
|\ \
| * | [UK Councils] Show all reports on cobrand /around mapDave Arter2016-07-08-13/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a concern that excluding district council reports from a two-tier council's cobrand's /around page might lead to duplicate reports or reports never being seen. This commit adds them to the map and the sidebar and displays the destination council in the report list item. Clicking the pin or the report link leads to the report on FMS.com. Reports sent to the a council other than the the active cobrand are shown as grey pins on the map, and the receiving council's name is shown in the sidebar list.
| * | Include link back to originating cobrand on fms.com reportsDave Arter2016-07-08-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | When viewing a report on FMS.com whose recipient council has a FMS cobrand, turns the council name into a link to view the same report on that council's cobranded site. Includes methods cribbed from Hakim's Open311 refactor branch from commit 47daa02420a4f5a4264c31efcf2a2e8611c2f23e.
| * | Display link to FMS for Councils on reportsDave Arter2016-07-08-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | When viewing on FMS.com a report made via a council cobrand, this adds a link to the FMS for Councils page for more info. This works by breaking out the report meta line ('Reported in the Street lighting category by Joe Bloggs at 09:51, Tuesday 1 March 2016') into its own template which can be overridden for the fixmystreet.com cobrand.
| * | Clarify wording of two-tier confirmation emailDave Arter2016-07-08-1/+2
| | |
| * | Restructure & clarify problem confirmation pageDave Arter2016-07-08-6/+14
| | | | | | | | | | | | | | | | | | | | | The message shown to the user if the report was sent to a council other than the cobrand owner was confusing so the wording has been clarified. Also added a call to action to view the report on FMS.com or the cobranded FMS.
| * | Add two-tier responsibility note to confirm emailDave Arter2016-07-08-1/+10
| | |
| * | [UK Councils] Use correct cobrand base URL if STAGING_SITEDave Arter2016-07-08-6/+12
| | | | | | | | | | | | | | | Instead of using BASE_URL as the base URL on council cobrands when STAGING is true, use the UK councils default (which is cobrand name prepended to BASE_URL).
| * | Refactor sending of problem confirmation emailDave Arter2016-07-08-32/+67
| | | | | | | | | | | | | | | | | | | | | | | | Replaced duplicate code blocks that are responsible for sending confirmation of problem email with a function. Should make it easier to do two-tier conditional messages later on. Also fixes a minor bug where the wrong confirmation email would be sent for reports from the mobile app to unresponsive councils.
| * | Show actual report destination in confirm messageDave Arter2016-07-08-20/+6
|/ / | | | | | | | | | | | | | | | | | | | | For two-tier authorities, it is possible to send a report from a cobrand to an authority other than the cobrand's owner. If this is the case, then highlight it on the confirmation message along with a link to view the problem report on the main fixmystreet.com site. The Hart-specific template is no longer required.
* | [East Herts] Cobranded frontendDave Arter2016-07-08-1/+681
| | | | | | | | For mysociety/FixMyStreet-Commercial#773.
* | [Bristol] Only show Open311 categories on Bristol cobrandDave Arter2016-07-08-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | This adds a new Cobrand::Default::categories_restriction method that can be used to limit what categories are available when making a new report on a per-cobrand basis. This is used by Cobrand::Bristol to only show Open311 categories when making a new report on fixmystreet.bristol.gov.uk but allowing all categories on FMS.com. Also removes the Hart::hidden_categories and uses the new categories_restriction method to achieve the same thing.
* | Stub out calls to Gaze when running testsDave Arter2016-07-08-1/+4
| | | | | | | | The tests were running slowly because of gaze.mysociety.org's rate-limiting.
* | Merge branch 'issues/commercial/769-zurich-lv95'Dave Arter2016-07-08-602/+376
|\ \
| * | [Zurich] Don’t include unpublished photos in CSV exportDave Arter2016-07-08-1/+1
| | |
| * | [Zurich] Update help text & translationsDave Arter2016-07-08-34/+41
| | |
| * | Don’t cache geocoder results when STAGING_SITE is 1Dave Arter2016-07-08-4/+4
| | |
| * | [Zurich] Use new LV95/CH1903+ geocoder and base map tilesDave Arter2016-07-07-563/+330
|/ / | | | | | | | | | | | | | | | | | | | | - Use new `getLocation95` method for geocoding addresses - Replace Coordinates::CH1903 with Coordinates::CH1903Plus - Refactor Map::Zurich to use WMTSBase instead of duplicating code - Slightly refactor map templates to make using custom WMTS tiles easier - Use correct sizes for marker pins on maps Closes mysociety/FixMyStreet-Commercial#769. Closes mysociety/FixMyStreet-Commercial#768.
* | Add change_category_text cobrand hook.Matthew Somerville2016-07-06-26/+19
| |
* | [Oxfordshire] Use relative image paths in CSS.Matthew Somerville2016-07-06-13/+13
| |
* | Update changelog with version 1.8.4 details.Matthew Somerville2016-07-06-6/+27
| |
* | Fix two XSS vulnerabilities.Matthew Somerville2016-07-06-6/+6
| | | | | | | | | | | | | | | | | | The title in the OpenGraph header was not being properly escaped, and the hide pins/all pins links were using single quotes which were able to be broken out of. Also remove the single quotes around rss_feed_uri, though this is not a vulnerability as its contents were sanitised (postcode or co-ords).
* | Standardise footer UTM tracking with other sitesZarino Zappia2016-07-05-3/+3
| |
* | Fix CSRF issue with new login during process.Matthew Somerville2016-07-05-0/+4
| | | | | | | | | | | | If you had no session cookie, started reporting a problem, logged in through that process, you would then get a CSRF error as the token had been created before the session was.
* | Update OpenLayers image paths in templates.Matthew Somerville2016-07-04-25/+21
| | | | | | | | This was missed in 688169c.
* | Merge branch 'fix-admin-proxy'Matthew Somerville2016-07-04-503/+566
|\ \
| * | Remove need to customise OpenLayers built script.Matthew Somerville2016-07-04-376/+461
| | | | | | | | | | | | | | | This also allows the map to work in a proxied admin. Upgrade Angus OL to master branch code.
| * | Make sure map JS works through an admin proxy.Matthew Somerville2016-07-04-113/+104
| | | | | | | | | | | | | | | Tidy up use of absolute URLs when in the admin. Have the 404 handler spot static files in admin as a fallback.
| * | Use static files for validation_rules.js.Matthew Somerville2016-07-04-16/+3
| |/ | | | | | | | | No need for this to be generated via a template, it only differs occasionally by cobrand.
* / [Oxfordshire] Remove broken JS and update base URLMatthew Somerville2016-07-04-7/+1
|/
* Update wording about changing email/passwordabimysoc2016-06-30-7/+6
| | | Fixes #1440.
* [fixmystreet.com] Add theme-color meta element.Matthew Somerville2016-06-29-0/+1
|
* [UK Councils] Clarify who receives messages from the contact form.Dave Arter2016-06-29-0/+9
| | | | | The default wording says messages do not go to a council, which is not true for UK council cobrands.
* Merge branch '1347-fold-back-zurich'Matthew Somerville2016-06-29-184/+256
|\
| * Add external field editing to admin report edit.Matthew Somerville2016-06-29-70/+51
| | | | | | | | Show bodies for which details are missing, and any send method used.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 00:04:00 +0000