aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | [fixmystreet.com] Improve fixture descriptions.Matthew Somerville2017-12-07-15/+147
| | |
* | | [Borsetshire] Amend sign in instruction text.Matthew Somerville2017-12-07-29/+82
|/ /
* | Upgrade commonlib to get stable RABX outputDave Arter2017-12-06-0/+0
| | | | | | | | | | This solves the issue with duplicate ContactsHistory entries being created when extra has no substantive changes.
* | Add opt-in cobrand hook for category groupsDave Arter2017-12-06-9/+11
|/
* Ensure Mock::Nominatim JSON is encoded in en-gb localeDave Arter2017-12-05-1/+3
| | | | | This was causing an error in "Test ajax decimal points" in fixamingata.t due to "importance" being encoded with a comma decimal separator.
* Merge branch 'issues/commercial/925-fms-pro-in-council-notification-email'Matthew Somerville2017-12-05-20/+74
|\
| * [fixmystreet.com] Prominent FMS Pro promo in email to councilZarino Zappia2017-12-01-20/+74
| | | | | | | | Fixes mysociety/fixmystreet-commercial#925.
* | Merge branch 'issues/forcouncils/264-stop-csv-human-dates'Matthew Somerville2017-12-05-11/+19
|\ \
| * | Stop using 'readable' dates in CSV export.Matthew Somerville2017-12-01-9/+10
| | | | | | | | | | | | We want machine-readable dates in a data export.
| * | Fix potential update issues with CSV export.Matthew Somerville2017-11-30-1/+2
| | | | | | | | | | | | | | | Only look at confirmed updates, and spot updates using mark_fixed and not problem_state (e.g. questionnaire responses).
| * | Fix issues with Problem->as_hashref.Matthew Somerville2017-11-30-2/+8
| |/ | | | | | | | | Include actual times, not just human-readable ones, and make sure state is translated correctly.
* | Merge branch 'issues/forcouncils/40-open311-groups'Dave Arter2017-12-05-11/+134
|\ \
| * | Use JS to split category UI into category/subcategoryDave Arter2017-12-05-1/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit splits the category dropdown into two fields: a top-level "category" field populated with the category groups, and a "subcategory" field for the options in each <optgroup> in the original HTML. It does some short-circuiting, e.g. for optgroups that only have a single option the subcategory field won't be shown.
| * | Group categories on new report formDave Arter2017-12-05-9/+36
| | | | | | | | | | | | Ensures ‘Other’ group is last in the list, if it exists.
| * | Store group on Contacts in Open311 PopulateServiceListDave Arter2017-12-05-1/+22
|/ /
* | Merge branch 'issues/forcouncils/263-auto-response-templates'Dave Arter2017-12-04-34/+277
|\ \
| * | Only allow one auto-response template per category/state.Dave Arter2017-12-04-11/+162
| | |
| * | Improve ordering and docs of template editing pageDave Arter2017-12-04-16/+67
| | |
| * | Use response template for Open311 updates without ‘description’ textDave Arter2017-12-04-7/+48
|/ / | | | | | | | | | | | | If an Open311 service request update with an empty description field is received and there is a matching ResponseTemplate for the problem's category & state (and it's marked as auto-response) then the text from that ResponseTemplate will be used for the created update.
* / [fixmystreet.com] Add job banner.Matthew Somerville2017-11-30-0/+43
|/
* Merge branch '1919-consolidate-statistics'Matthew Somerville2017-11-29-2010/+568
|\
| * Consolidate summary statistics pages.Matthew Somerville2017-11-29-1930/+476
| |
| * Refactor stats pages to their own controller.Matthew Somerville2017-11-29-154/+167
| |
* | Merge branch 'access-token-auth'Matthew Somerville2017-11-29-0/+367
|\ \
| * | allow dashboard CSV export access using token authStruan Donald2017-11-29-0/+21
| | |
| * | Staff user page for generating an access token.Struan Donald2017-11-29-0/+162
| | | | | | | | | | | | | | | Adds a link from /my to a page for generating an access token which is then stored in the user's extra field.
| * | Add an access token authentication credential.Matthew Somerville2017-11-29-0/+184
| |/ | | | | | | This allows access if you have a token associated with your user.
* / [East Herts] Preserve 'Other' category in PopulateServiceListDave Arter2017-11-29-0/+8
|/
* Nicer multi-select elements in Admin pagesZarino Zappia2017-11-29-38/+53
| | | | Fixes #1589.
* Merge remote-tracking branch ↵Matthew Somerville2017-11-28-2/+8
|\ | | | | | | 'origin/1920-back-once-again-for-the-renegade-master'
| * Fix back bug, from report after using list filtersMatthew Somerville2017-11-28-2/+8
| | | | | | | | | | | | | | | | | | The popstate event for a filter change assumed that the list was already being displayed, but it was not if you were going back from a report. The reports_list function to display the list page is idempotent (though this commit makes it more so), so can happily be called whether the list page is currently displayed or not.
* | display council contacts on council dashboardStruan Donald2017-11-28-5/+100
|/ | | | | | | | Display a list of the email addresses used to contact the council on the council dashboard. Does not display emails if the council has an integration, rejects FMS reports or is currently turned off. Fixes mysociety/fixmystreetforcouncils#941
* Remove intro text when showing location disambiguationsDave Arter2017-11-27-2/+6
| | | | | | | | | | | The intro header takes up a lot of vertical screen space, which on small devices means that the suggestion links end up beneath the fold. This can make it seem as though nothing has happened at all when you enter a search term on the front page. This commit removes the intro header if there are location suggestions, and also shifts the second sentence of the help text to the bottom of the list where it's more likely to be read.
* Second, more prominent Hide Pins linkZarino Zappia2017-11-27-7/+68
| | | | An experiment towards fixing #525.
* Add js=1 to links to /around from the front pageDave Arter2017-11-24-0/+5
| | | | | | The location disambiguation page uses the frontpage JavaScript and has lots of links pointing to /around, so the code should make sure those links include the `js` parameter.
* Ensure calculated lat/lon are sent to DB in correct formatDave Arter2017-11-24-6/+7
| | | | | | | | When viewing /around without the `js=1` parameter in a Spanish locale the incorrect decimal separator was being passed to the DB query, causing a crash. Fixes mysociety/fixmystreet-commercial#942
* Hide geolocation link if not on HTTPSDave Arter2017-11-24-1/+3
| | | | | | | Modern browsers disable geolocation on non-HTTPS pages, but sadly still report it as available with the `navigator.geolocation` object. This commit adds a check for HTTPS and hides the link if it won’t work.
* Fix UI bug stopping superusers making reportsDave Arter2017-11-24-0/+2
| | | | | | | | | | The `fixmystreet.update_pin` function removes the 'body' option from the 'report as' dropdown, which was leaving the UI in an inconsistent state if the 'body' option had previously been selected. This commit ensures the change handler is called when the content of the dropdown is modified. Fixes #1913.
* Reinstate appcache_enabled staging flagDave Arter2017-11-24-1/+5
| | | | | This can optionally disable appcache for superusers which can be handy in development.
* Allow cobrands to disable moderation emailsDave Arter2017-11-22-11/+59
| | | | | | | This adds a new send_moderation_notifications method which can be overridden by cobrands to prevent “your report has been moderated” emails from being sent. Fixes mysociety/fixmystreet-commercial#936
* Switch to minified jQuery multi-select library.Matthew Somerville2017-11-22-339/+11
| | | | And fix reference to it in the front page prefetch list.
* Fix update-all-reports for all bodies generation.Matthew Somerville2017-11-21-1/+2
| | | | | Only works on bodies with an associated area, and requires the object to be passed in, not just its ID.
* Move jquery.multi-select.js into vendor directoryZarino Zappia2017-11-20-1/+1
| | | | | The multi-select plugin is a separate project, and should be treated as a vendor file.
* Upgrade to latest version of jquery.multi-select.jsDave Arter2017-11-20-35/+38
| | | | | | | In particular, this lets us ensure only one multiselect can be open at a time – for example in the "Show [X] reports about [Y]" list filters. Fixes mysociety/fixmystreetforcouncils#247.
* Prevent multiple 'Expand map' links appearing.Matthew Somerville2017-11-16-2/+3
| | | | | | | On mobile, if you e.g. selected one report and then another, you'd get another "Expand map" appearing. Check that one is needed before adding it, and also make sure the handler is only attached once to prevent it conflicting with itself (and so cancelling itself out).
* Treat dashboard end date as that given, inclusive.Matthew Somerville2017-11-16-3/+4
| | | | | If someone selects 15-16th November, they want reports from both those dates, not just the 15th.
* Hide update form for inspectors in HTML.Matthew Somerville2017-11-16-11/+18
| | | | | This prevents the form scroll going to the wrong place when the form was being hidden later on.
* Merge branch '1901-js-deferring'Matthew Somerville2017-11-15-1790/+397
|\ | | | | | | Updated geolocation.js with concurrent changes.
| * Have front page load minimal JS necessary.Matthew Somerville2017-11-15-4/+31
| | | | | | | | | | | | By creating a small file with only what is needed (focus, js flagging), we can drop loading jQuery and all the application JavaScript on the front page, prefetching them instead.
| * [fixmystreet.com] Factor out front-page-only JavaScript.Matthew Somerville2017-11-15-31/+53
| |