aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * Remove ancient geolocation JS library.Matthew Somerville2017-11-06-92/+3
| |
* | Merge branch '1890-fixmystreet.com-facebook-login'Matthew Somerville2017-11-08-7/+50
|\ \
| * | [fixmystreet.com] No social login on UK councils.Dave Arter2017-11-08-0/+38
| | |
| * | Allow individual cobrands to disable Facebook/Twitter loginDave Arter2017-11-08-7/+12
| | | | | | | | | | | | This means FB/Twitter login is disabled even if FACEBOOK_APP_ID/TWITTER_KEY are set.
* | | Merge branch '1722-homepage-stats-overflow'Matthew Somerville2017-11-08-9/+16
|\ \ \ | |/ / |/| |
| * | ChangelogZarino Zappia2017-11-07-0/+1
| | |
| * | Prevent text overflow in homepage stats sectionZarino Zappia2017-11-07-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are lots of reports on a site, the big numbers on the homepage would overflow the grid and look messy. This was particularly noticeable on the fixmystreet.com homepage on 768–1024px screens. We now scale up the font size more gradually, as the container widens, and the maximum font size (3em) is slightly lower than before. Fixes #1722.
* | | [Oxfordshire] Clearly mark RDI emails if sent from stagingDave Arter2017-11-08-3/+12
| | | | | | | | | | | | Fixes mysociety/fixmystreetforcouncils#251
* | | allow admin to unban a userStruan Donald2017-11-07-10/+73
| | | | | | | | | | | | | | | | | | | | | Add an unban button to the user edit page when a user is in the abuse table. Fixes #1881
* | | do not override template when displaying body contacts as textStruan Donald2017-11-07-1/+6
|/ / | | | | | | | | | | | | move setting the body template to before `fetch_contacts` so it doesn't override setting the text only email address template. Fixes #1895
* / Fix issue editing user previously lacking a name.Matthew Somerville2017-11-07-4/+9
|/ | | | | The check that a name was entered was testing the user's current name, not the name entered in the form.
* Merge branch '1887-uk-svg-logo'Matthew Somerville2017-11-06-125/+119
|\
| * [UK] Inline SVG logo with PNG fallback.Zarino Zappia2017-11-06-4/+81
| | | | | | | | | | | | | | | | | | | | Rather than include the mobile logo as a base64-encoded data URI, we include it as an SVG, inlined on the homepage or in the CSS. The SVG should gzip better, and will work better with the critical CSS work, allowing the site logo to appear immediately on page load for mobile visitors, rather than waiting for the full stylesheet to download. Fixes #1887.
| * Remove 2x image fallbacks for SVGs.Matthew Somerville2017-11-06-121/+38
| | | | | | | | | | If the browser doesn't support SVG, they're not going to care about high-dpi images.
* | cobrand option to control prefilling of report fields for inspectorsStruan Donald2017-11-06-10/+26
|/ | | | | | | | | | Add a `prefill_report_fields_for_inspectors` config to cobrands, defaulted to 0, to control the automatic pre-population of report fields. Also add default of 1 for UKCouncil cobrand. Fixed #1854
* Fix fetching of duplicate reports.Matthew Somerville2017-11-06-2/+3
| | | | | | c9998984 altered nearby.json to use on_map rather than around_map, to prevent needless text appearing, but did not take account of the fact that it expects Problem objects, not Nearby objects.
* Fix pin size when JavaScript unavailable.Matthew Somerville2017-11-06-8/+7
| | | | 1b15964a doubled the pin icon images.
* Merge branch 'around-and-about-pagination'Matthew Somerville2017-11-06-212/+218
|\
| * Fix warning in contact test.Matthew Somerville2017-11-06-4/+3
| |
| * Add pagination to around page.Matthew Somerville2017-11-06-48/+177
| |
| * Remove Show all pins link and on_map_list_limit.Matthew Somerville2017-11-06-142/+15
| | | | | | | | | | /around will now show all reports all the time, but we are about to introduce pagination to stop that.
| * Have /around ajax use same format as others.Matthew Somerville2017-11-02-23/+28
| | | | | | | | | | Both /reports and /my work by using the same URL with ajax=1. We should use the same on /around for consistency.
* | Merge branch 'issues/forcouncils/248-duplicate-save-bug'Matthew Somerville2017-11-06-9/+21
|\ \
| * | Remove shortlist form from inspect duplicate list.Matthew Somerville2017-11-02-9/+21
| |/ | | | | | | | | This functionality isn't needed here, and causes an issue with the main form submitting due to a form inside a form.
* / Update Bing Maps parameter ID.Matthew Somerville2017-11-06-10/+10
|/
* Update Module::ScanDeps dependency.Matthew Somerville2017-10-31-21/+8
| | | | | | | This should fix #1886, which was caused by the update of Module::Build as part of f97088d6 removing Module::Build::ModuleInfo which was still being required by Module::ScanDeps. This was passing on Travis because Module::ScanDeps was already installed.
* always allow problems to be removed from shortlistStruan Donald2017-10-27-8/+165
| | | | | | | | | | If a user is trying to remove a problem from their shortlist we should always allow it regardless of the state of the problem. Previously if a problem wasn't displayed on the site then it could not be removed from the shortlist which was an issue with council cobrands and reports that had changed body. Fixes mysociety/fixmystreetforcouncils#243
* Add collapse filter to translation JavaScript.Matthew Somerville2017-10-25-0/+2
| | | | This removes unnecessary whitespace to reduce the output size.
* [demo] set email_verified to true when creating demo usersStruan Donald2017-10-23-5/+5
| | | | otherwise the login doesn't work post sms auth changes.
* Merge branch 'reports-dashboard-councils'Matthew Somerville2017-10-20-115/+456
|\
| * [fixmystreet.com] Council pages only from council.Matthew Somerville2017-10-20-11/+231
| |
| * Front end way of viewing council dashboard.Matthew Somerville2017-10-20-26/+77
| |
| * update-all-reports operate per body optionally.Matthew Somerville2017-10-20-59/+121
| |
| * Allow testing override of /reports data.Matthew Somerville2017-10-16-27/+35
| |
* | [Borsetshire] Update password-less login for new "username" fieldZarino Zappia2017-10-20-2/+2
| |
* | Merge branch 'issues/forcouncils/227-all-filter'Struan Donald2017-10-20-10/+42
|\ \
| * | select all applicable filter states on report pageStruan Donald2017-10-18-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that all relevant options in the filter status drop down are checked to handle staff users who can see the full set of states and not just open, closed and fixed Also restore custom label for no states checked. Fixes mysociety/forcouncils#227
* | | Remove hidden from default staff state dropdown.Matthew Somerville2017-10-18-1/+1
| | |
* | | Tidy up report page permission checkings.Matthew Somerville2017-10-18-20/+10
| | |
* | | [Bromley] Remove override display template.Matthew Somerville2017-10-18-69/+31
| | |
* | | [Oxfordshire] Add initials/traffic to RDI desc.Matthew Somerville2017-10-18-24/+32
| | |
* | | Fix example dashboard categories/states.Matthew Somerville2017-10-18-14/+14
|/ /
* / make sure duplicate id provided when marking as duplicateStruan Donald2017-10-17-8/+71
|/ | | | | | | It was possible to mark a report as a duplicate in the inspector panel without providing an id of the duplicate. This prevents that. Fixes mysociety/fixmystreetforcouncils#236
* Redirect inspectors correctly on creation.Matthew Somerville2017-10-16-2/+7
| | | | | Do not try and redirect to a report that won't be viewable on the cobrand being used.
* Merge branch 'sms-mssid-error'Matthew Somerville2017-10-16-84/+71
|\
| * Factor the three SMS code checking fns together.Matthew Somerville2017-10-12-27/+9
| |
| * Add option to use a Twilio Messaging Service.Matthew Somerville2017-10-12-1/+8
| |
| * Spot errors coming back when sending text.Matthew Somerville2017-10-12-56/+54
| |
* | log all state changes in admin as commentsStruan Donald2017-10-16-20/+338
| | | | | | | | | | | | | | | | | | | | | | | | Create a comment on a problem when the admin is used to change the state of the problem. If only the state is changed then create a comment with blank text. If the category and state are changing then include details of the category change in the comment. Not all the state changes are displayed at the template level by default. Fixes #1846
* | Merge branch 'bit-of-yaml-tidying'Matthew Somerville2017-10-11-76/+27
|\ \