aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* [Bristol] Upgrade to OpenLayers master (with WFS).Matthew Somerville2016-11-11-5/+883
| | | | Including WFS for forthcoming assets layers.
* Fix extra "required" by testing correct value.Matthew Somerville2016-11-11-1/+1
|
* Merge branch 'issues/forcouncils/99-sorting'Matthew Somerville2016-11-04-48/+111
|\
| * Add sort order options to list pages.Matthew Somerville2016-11-04-48/+111
| | | | | | | | | | | | | | | | Includes newest, oldest, least/most recently updated, and most comments. The default remains the same, which is last updated on /reports, and newest on /my and /around (the latter plus not-in-view sorted-by-distance ones).
* | Merge branch 'issues/forcouncils/116-inspect-show-bug'Matthew Somerville2016-11-04-82/+98
|\ \
| * | Make sure inspect form shown if report pulled in.Matthew Somerville2016-11-04-78/+96
| | | | | | | | | | | | | | | | | | | | | | | | The inspect form, if shown, is in a sibling div to the report div, so make sure that it is shown/hidden as appropriate. We consolidate the inspect JavaScript setup into one function, so that it can be called on load, and when pulled in.
| * | Only return active shortlisted user for a problem.Matthew Somerville2016-10-28-4/+2
| | |
* | | Update Net::Domain::TLD to 1.75.Matthew Somerville2016-11-03-4/+4
| |/ |/|
* | Merge branch '1544-category-change-leave-update'Matthew Somerville2016-11-01-1/+31
|\ \
| * | Leave a public update when admin changes category.Matthew Somerville2016-10-28-0/+12
| | |
| * | Add ability for admin users to italic updates.Matthew Somerville2016-10-28-1/+19
| |/
* | Merge branch 'issues/forcouncils/69-user-categories'Dave Arter2016-10-31-4/+84
|\ \ | |/ |/|
| * Pre-filter map pages if user has categories assignedDave Arter2016-10-31-3/+38
| | | | | | | | | | This pre-filters the 'all reports' link in the main nav and the /around page reached via the front page postcode form
| * Add UI for assigning categories to a user in adminDave Arter2016-10-28-1/+42
| | | | | | | | | | - A user can be assigned to any number of its body's categories - The category ids are stored as a list in the user's extra field
| * Add all/none UI to user permissionsDave Arter2016-10-28-0/+4
|/
* Error if logged-in user visits admin without permission.Matthew Somerville2016-10-26-17/+14
| | | | | This is less confusing than redirecting to /auth and then to /my (as they're logged in). Fixes #1566.
* Show admin user edit errors.Matthew Somerville2016-10-26-8/+12
| | | | Fix title if error in adding user. Fixes #1510.
* Merge branch 'issues/forcouncils/44-two-tier-change-category'Matthew Somerville2016-10-26-27/+98
|\
| * Redirect to correct cobrand when category changed.Dave Arter2016-10-26-14/+46
| |
| * Resend report if changing category changes body.Dave Arter2016-10-26-13/+52
| |
* | Merge branch 'issues/forcouncils/115-multi-select-clear'Matthew Somerville2016-10-25-64/+155
|\ \ | |/ |/|
| * Title case filter dropdown options.Matthew Somerville2016-10-25-6/+6
| |
| * Add simple way to return to "everything" in list filtersZarino Zappia2016-10-25-58/+149
| |
* | Update changelog.Matthew Somerville2016-10-25-18/+85
|/
* Merge branch 'issues/forcouncils/67-mop-up'Matthew Somerville2016-10-24-2/+10
|\
| * Fix warning in report inspect test.Matthew Somerville2016-10-24-1/+1
| |
| * Hide confirmed column if all categories confirmed.Matthew Somerville2016-10-24-1/+9
| |
* | Merge branch 'issues/forcouncils/98-inspect-straight'Matthew Somerville2016-10-24-44/+28
|\ \
| * | Have report page show inspect form if available.Matthew Somerville2016-10-24-44/+28
| |/
* | Merge branch 'reports-area-as-a-hole'Matthew Somerville2016-10-24-8/+62
|\ \ | |/ |/|
| * Add server-side /mapit proxy.Matthew Somerville2016-10-21-0/+11
| |
| * Invert display of areas on body pages.Matthew Somerville2016-10-21-8/+51
| | | | | | | | | | This makes it easier to use the map, as the land outside the area is shaded, rather than the area itself.
* | Store and use initial URL to fix JavaScript bugs.Matthew Somerville2016-10-21-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | If you were on a body page, selected a report, then another report, the "Back to all reports" link then had an incorrect URL. Also, going "Back to all reports" after one report would fetch an incorrect Ajax query of reports to show (as the URL had not yet been updated). Both of these are fixed by storing the URL on page load, and using that for the "Back to all reports" link and the URL used by the Ajax call. There is still an issue with the URL shown if you filter, then select a report, then click "Back to all reports", but the contents are okay.
* | Use default link zoom for all map types.Matthew Somerville2016-10-21-30/+17
|/ | | | [Bristol] Use more zoomed-in default link zoom.
* Fix map pin clicking in IE11.Matthew Somerville2016-10-21-3/+3
| | | | | | It turns out that whilst IE9+ defines MouseEvent, it's not in the form that can be used as a constructor until Edge. To fix this we check that MouseEvent is a function before using it as one.
* Merge branch 'issues/forcouncils/87-update-shortlist-name'Matthew Somerville2016-10-21-0/+1
|\
| * When added to shortlist, remove "other user" message.Matthew Somerville2016-10-20-0/+1
| |
* | Merge branch '1543-reports-page-fixes'Matthew Somerville2016-10-21-19/+108
|\ \ | |/ |/|
| * Update pagination when status/categories changed.Matthew Somerville2016-10-18-5/+33
| |
| * Add ajax pin fetching to reports/my pages.Matthew Somerville2016-10-14-14/+62
| | | | | | | | | | This matches the behaviour on /around, and prevents a refresh when changing the state or category filters.
| * Improve history API URL when query string empty.Matthew Somerville2016-10-14-1/+11
| |
| * Include fancybox code on reports/my pages.Matthew Somerville2016-10-14-0/+3
| | | | | | | | | | This is so the photo modal works for pulled in report pages. Fixes #1543.
* | Merge branch 'issues/forcouncils/100-fix-template-list'Matthew Somerville2016-10-20-4/+20
|\ \
| * | Fix list of response templates for a problem.Matthew Somerville2016-10-20-4/+20
| |/ | | | | | | | | Instead of returning all templates for the problem's body, return those for the problem's category (or with no category).
* | Add ‘form-control’ class where missing from <select> elementsDave Arter2016-10-19-6/+6
| |
* | Merge branch 'issues/forcouncils/66-priority-description'Dave Arter2016-10-19-28/+78
|\ \
| * | Clarify category behaviour for response prioritiesDave Arter2016-10-19-1/+11
| | | | | | | | | | | | | | | - Priorities with no categories selected are available to all categories - Display active categories in response priorities table
| * | Refactor template/priority category checkboxes into own templateDave Arter2016-10-19-26/+41
| | | | | | | | | | | | | | | - Also adds add select all/none UI - Adds admin hint for empty category list behaviour
| * | Add ‘description’ field to ResponsePriority modelDave Arter2016-10-19-3/+28
|/ / | | | | | | Used internally to provide more details about when a priority is applicable.
* | Merge branch 'issues/forcouncils/71-category-form-improvements'Dave Arter2016-10-19-297/+297
|\ \