Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'version-2.0'v2.0 | Matthew Somerville | 2016-11-15 | -23506/+39599 |
|\ | ||||
| * | Version 2.0. | Matthew Somerville | 2016-11-15 | -2/+4 |
| | | ||||
| * | Updates from Transifex. | Matthew Somerville | 2016-11-08 | -717/+374 |
| | | ||||
| * | Update translation files from source. | Matthew Somerville | 2016-11-08 | -22450/+39863 |
| | | ||||
| * | Updates from Transifex. | Matthew Somerville | 2016-11-08 | -1255/+276 |
| | | ||||
| * | Update script directory changing so works on Macs. | Matthew Somerville | 2016-11-08 | -3/+3 |
| | | ||||
* | | Merge branch 'issues/commercial/787-bristol-assets' | Matthew Somerville | 2016-11-11 | -373/+1393 |
|\ \ | ||||
| * | | Add option of only requesting some WFS attributes. | Matthew Somerville | 2016-11-11 | -0/+4 |
| | | | ||||
| * | | [UK] Hide usrn/asset_id Open311 fields. | Matthew Somerville | 2016-11-11 | -14/+36 |
| | | | ||||
| * | | [UK] Refactor WFS asset handling. | Matthew Somerville | 2016-11-11 | -353/+469 |
| | | | | | | | | | | | | | | | | | | Allow multiple asset layers, and setting of multiple asset attributes. [Bristol] Add Bristol asset layers. | |||
| * | | [Bristol] Upgrade to OpenLayers master (with WFS). | Matthew Somerville | 2016-11-11 | -5/+883 |
| | | | | | | | | | | | | Including WFS for forthcoming assets layers. | |||
| * | | Fix extra "required" by testing correct value. | Matthew Somerville | 2016-11-11 | -1/+1 |
| |/ | ||||
* / | [fixmystreet.com] Remove council message from /reports. | Matthew Somerville | 2016-11-10 | -7/+0 |
|/ | ||||
* | Merge branch 'issues/forcouncils/99-sorting' | Matthew Somerville | 2016-11-04 | -48/+111 |
|\ | ||||
| * | Add sort order options to list pages. | Matthew Somerville | 2016-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 Somerville | 2016-11-04 | -82/+98 |
|\ \ | ||||
| * | | Make sure inspect form shown if report pulled in. | Matthew Somerville | 2016-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 Somerville | 2016-10-28 | -4/+2 |
| | | | ||||
* | | | Update Net::Domain::TLD to 1.75. | Matthew Somerville | 2016-11-03 | -4/+4 |
| |/ |/| | ||||
* | | Merge branch '1544-category-change-leave-update' | Matthew Somerville | 2016-11-01 | -1/+31 |
|\ \ | ||||
| * | | Leave a public update when admin changes category. | Matthew Somerville | 2016-10-28 | -0/+12 |
| | | | ||||
| * | | Add ability for admin users to italic updates. | Matthew Somerville | 2016-10-28 | -1/+19 |
| |/ | ||||
* | | Merge branch 'issues/forcouncils/69-user-categories' | Dave Arter | 2016-10-31 | -4/+84 |
|\ \ | |/ |/| | ||||
| * | Pre-filter map pages if user has categories assigned | Dave Arter | 2016-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 admin | Dave Arter | 2016-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 permissions | Dave Arter | 2016-10-28 | -0/+4 |
|/ | ||||
* | Error if logged-in user visits admin without permission. | Matthew Somerville | 2016-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 Somerville | 2016-10-26 | -8/+12 |
| | | | | Fix title if error in adding user. Fixes #1510. | |||
* | Merge branch 'issues/forcouncils/44-two-tier-change-category' | Matthew Somerville | 2016-10-26 | -27/+98 |
|\ | ||||
| * | Redirect to correct cobrand when category changed. | Dave Arter | 2016-10-26 | -14/+46 |
| | | ||||
| * | Resend report if changing category changes body. | Dave Arter | 2016-10-26 | -13/+52 |
| | | ||||
* | | Merge branch 'issues/forcouncils/115-multi-select-clear' | Matthew Somerville | 2016-10-25 | -64/+155 |
|\ \ | |/ |/| | ||||
| * | Title case filter dropdown options. | Matthew Somerville | 2016-10-25 | -6/+6 |
| | | ||||
| * | Add simple way to return to "everything" in list filters | Zarino Zappia | 2016-10-25 | -58/+149 |
| | | ||||
* | | Update changelog. | Matthew Somerville | 2016-10-25 | -18/+85 |
|/ | ||||
* | Merge branch 'issues/forcouncils/67-mop-up' | Matthew Somerville | 2016-10-24 | -2/+10 |
|\ | ||||
| * | Fix warning in report inspect test. | Matthew Somerville | 2016-10-24 | -1/+1 |
| | | ||||
| * | Hide confirmed column if all categories confirmed. | Matthew Somerville | 2016-10-24 | -1/+9 |
| | | ||||
* | | Merge branch 'issues/forcouncils/98-inspect-straight' | Matthew Somerville | 2016-10-24 | -44/+28 |
|\ \ | ||||
| * | | Have report page show inspect form if available. | Matthew Somerville | 2016-10-24 | -44/+28 |
| |/ | ||||
* | | Merge branch 'reports-area-as-a-hole' | Matthew Somerville | 2016-10-24 | -8/+62 |
|\ \ | |/ |/| | ||||
| * | Add server-side /mapit proxy. | Matthew Somerville | 2016-10-21 | -0/+11 |
| | | ||||
| * | Invert display of areas on body pages. | Matthew Somerville | 2016-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 Somerville | 2016-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 Somerville | 2016-10-21 | -30/+17 |
|/ | | | | [Bristol] Use more zoomed-in default link zoom. | |||
* | Fix map pin clicking in IE11. | Matthew Somerville | 2016-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 Somerville | 2016-10-21 | -0/+1 |
|\ | ||||
| * | When added to shortlist, remove "other user" message. | Matthew Somerville | 2016-10-20 | -0/+1 |
| | | ||||
* | | Merge branch '1543-reports-page-fixes' | Matthew Somerville | 2016-10-21 | -19/+108 |
|\ \ | |/ |/| | ||||
| * | Update pagination when status/categories changed. | Matthew Somerville | 2016-10-18 | -5/+33 |
| | |