aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | Merge branch 'issues/commercial/1303-bath-pin-drag-roadworks'Matthew Somerville2019-03-05-70/+48
|\ \
| * | [UK Councils] Factor roadworks functions together.Matthew Somerville2019-03-04-69/+47
| | |
| * | [BANES] Pin rather than map centre for roadworks.Matthew Somerville2019-03-04-1/+1
| |/ | | | | | | | | If the pin is dragged, then category changed, the pin will not be in the centre of the map.
* | Merge branch '2411-checkbox-gap'Matthew Somerville2019-03-05-25/+11
|\ \
| * | Improve inline checkbox spacing.Matthew Somerville2019-03-04-25/+11
| |/ | | | | | | | | | | | | | | | | | | | | Reduce the space between checkbox and label, so the text isn't lost if the page is zoomed in. Fixes #2411. Replace the creator_fixed question with segmented control to match the full questionnaire, and the admin verified checkboxes with inline-text as they need no padding. Having done that, all uses of .inline are now on their own lines, so no post-padding is needed any longer, but we’ll leave some in case of future use.
* | Merge branch 'report-links-same-domain'Matthew Somerville2019-03-05-10/+28
|\ \
| * | Use relative report links where possible.Matthew Somerville2019-03-05-10/+28
| |/ | | | | | | | | | | | | | | | | | | On some UK council cobrands, some reports listed might not have been sent to that council, so links to those must go to the national site. However, using absolute URLs for all these reports means that sometimes you change domain when you don't need to (eg. if you’re on osm.fixmystreet.com or an aliased version of the site), which can cause confusion. State when we’re happy to use a relative link (ie. web-facing report links, not emails, or share links) and do that when we can.
* | Merge branch '374-default-show-name'Matthew Somerville2019-03-05-17/+15
|\ \
| * | Default to unchecked for default_show_name.Matthew Somerville2019-03-04-17/+15
| | |
* | | Add DateRange class.Matthew Somerville2019-03-04-45/+109
| |/ |/| | | | | | | This simplifies the places where a date range is used; it also makes Dashboard date parsing more flexible.
* | Increase vertical spacing of front page example.Matthew Somerville2019-03-01-2/+4
|/
* [Bromley] Better date parsing on heatmap.Matthew Somerville2019-02-28-3/+14
| | | | IE11 does not support input type=date, so we will get whatever they write.
* Merge branch '2406-fix-admin-body-dropdown'Matthew Somerville2019-02-28-16/+31
|\
| * Fix admin index body dropdown redirect.Matthew Somerville2019-02-26-16/+31
| |
* | [Oxfordshire] Limit appears to be lower than 30.Matthew Somerville2019-02-28-4/+4
| |
* | [Bromley] Initial heatmap page.Matthew Somerville2019-02-28-11/+623
| |
* | [Bromley] Fix colour contrast on active segmented controlZarino Zappia2019-02-28-2/+6
| |
* | Do not assign bodyless reports to area IDs.Matthew Somerville2019-02-28-13/+5
| |
* | [UK] Add mapzoom to roadworks parameters.Matthew Somerville2019-02-26-0/+1
|/
* Merge remote-tracking branch 'origin/issues/commercial/1229-duplicate-reporting'Matthew Somerville2019-02-25-179/+605
|\
| * [Borsetshire] Enable duplicate suggestionZarino Zappia2019-02-25-0/+2
| |
| * Duplicate suggestion UI when reporting problems.Zarino Zappia2019-02-25-94/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previously staff-only fixmystreet.set_up.manage_duplicates() has been promoted from staff.js to its own file so that we can use it to display the duplicate suggestions on the `/report/new` form. render_duplicate_list (the old refresh_duplicate_list) no longer filters or slices the reports_list returned by the ajax call, since it turns out the server handles all of that (`sub _nearby_json` in `Report.pm` and `sub nearby` in `Nearby.pm`). Since the expandable list items include the "fancybox" image previews, the fancybox CSS now has to be included in the `/report/new` page head, hence the addition of "photo-js.html" in `fill_in_details.html`. The “Get updates” flow reuses the same JavaScript that handles the submission of the "Get updates" drawer at the bottom of around pages.
| * Internal JSON endpoint to get reports near a pointMatthew Somerville2019-02-25-4/+34
| | | | | | | | Unused right now, but will be soon, for the duplicate suggestion UI.
| * Refactor nearby() to use named parameters not listMatthew Somerville2019-02-25-34/+32
| |
| * Remove --reports from .item-list--reports__item classes in Inspector UIZarino Zappia2019-02-25-9/+6
| | | | | | | | | | There’s no need for this `--reports` to be there, so let’s start phasing it out.
| * Expandable list item componentZarino Zappia2019-02-25-35/+186
| | | | | | | | | | | | | | | | | | | | `_item_expandable.html` is an alternative to regular list items, where you can display extra information on the first click on the item, and then also, optionally, offer a further action, as a separate button. Right now the expandable list items aren’t used anywhere, but we’ll soon be using them in the duplicate report suggestion UI for council staff and the public.
| * Add space below "map page" contents on narrow screensZarino Zappia2019-02-25-13/+17
| | | | | | | | | | Moving the 4em padding from _layout.scss to _base.scss helps separate the content on /report/<id> and /report/new pages from the nav below.
* | [Buckinghamshire] Tidy up asset attributes.Matthew Somerville2019-02-25-24/+1
| |
* | [Buckinghamshire] Add contributed_by to CSV exportMatthew Somerville2019-02-25-0/+82
| |
* | Factor out test CSV content function.Matthew Somerville2019-02-25-37/+17
|/
* Merge branch 'bugfix/1957'Matthew Somerville2019-02-25-8/+20
|\
| * Filters out hidden reports from top 5 list.Joe Siltberg2019-02-25-0/+1
| |
| * [FixaMinGata] Adds a cobrand hook (threshold for responsiveness top 5 list)Joe Siltberg2019-02-25-8/+19
| | | | | | | | Fixes #1957
* | Refactor admin body/user functions to own files.Matthew Somerville2019-02-22-1143/+1226
| |
* | Merge branch 'logged-in-user-report-alert-signup'Matthew Somerville2019-02-22-181/+31
|\ \
| * | Don't ask for email on alert signup if logged in.Matthew Somerville2019-02-21-181/+31
| | | | | | | | | | | | | | | | | | | | | The “Get updates” flow on a report page, if logged in, was showing an input label but no input field (because one is not needed), but then on submission asking for your email address. Add missing name on submit button to fix this.
* | | Merge branch 'FixaMinGata-cobrand-delivery-feb-2019' of ↵Matthew Somerville2019-02-21-11/+177
|\ \ \ | | | | | | | | | | | | git://github.com/Sambruk/fixmystreet
| * | | Swedish translations (minor corrections)Joe Siltberg2019-02-21-7/+9
| | | |
| * | | [FixaMinGata] Changes to a site logo in svg.Joe Siltberg2019-02-21-4/+125
| | | | | | | | | | | | | | | | Makes sure the logo looks nice on devices with high resolution.
| * | | [FixaMinGata] Adds email templates for inactive accounts.Joe Siltberg2019-02-21-0/+43
| | |/ | |/|
* / | Reword maximum number of images error message.Matthew Somerville2019-02-21-1/+1
|/ /
* | Fix server-side WFS property filteringDave Arter2019-02-19-5/+9
| | | | | | | | | | | | | | | | The previous approach of filtering features that match one of many values worked client side for e.g. GeoJSON format WFS layers, but crashed when attemping to build the XML request for server-side feature filtering (e.g. Bristol). This code instead builds a proper Logical filter which OpenLayers can use in both situations.
* | [Bristol] Use new WFS server for street lights.Dave Arter2019-02-19-13/+77
|/
* Merge branch 'issues/commercial/1271-bromley-subcategory'Matthew Somerville2019-02-18-1/+101
|\
| * [Bromley] Allow subcategory attachment to users.Matthew Somerville2019-02-18-1/+92
| |
| * [Bromley] Store service_sub_code as subcategory.Matthew Somerville2019-02-15-0/+9
| |
* | Merge branch '2397-show-old-url-fix'Matthew Somerville2019-02-18-2/+2
|\ \ | |/ |/|
| * Add parameter to URL when “Show older” clicked.Matthew Somerville2019-02-14-2/+2
| | | | | | | | | | The behaviour should be the same whether “Show older” or “Show older reports” is clicked, but only the latter was updating the URL.
* | Merge branch 'issues/commercial/1270-user-areas'Matthew Somerville2019-02-15-46/+89
|\ \
| * | Allow user to be associated with multiple areas.Matthew Somerville2019-02-14-46/+89
| | | | | | | | | | | | | | | | | | Update database to store an array of IDs rather than only one; consequential changes to the admin and the dashboard to allow selection.