aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'issues/forcouncils/19-add-planned-list'Dave Arter2016-08-22-23/+370
|\
| * [Oxfordshire] Add planned reports link to navigation.Matthew Somerville2016-08-22-0/+6
| |
| * Add user planned reports.Matthew Somerville2016-08-22-23/+364
|/ | | | | | A user with the appropriate permission can add/remove reports from their list of planned reports using a button on a report page. The list can be viewed at /my/planned.
* Make sure Open311 passed coordinate is decimal.Matthew Somerville2016-08-21-2/+3
|
* Get contribution state from server with map click.Matthew Somerville2016-08-19-4/+40
| | | | This makes sure the correct dropdown is shown.
* Fix broken permalink link.Matthew Somerville2016-08-19-10/+8
| | | | | | The map JavaScript assumes that the permalink div already exists. [Bristol] Make sure the control is added.
* Make sure PanZoom works in older OpenLayers.Matthew Somerville2016-08-19-39/+8
| | | | | Remove unused code that is same as upstream (it was added when the map middle didn't match the visible middle), and the world button.
* Move non-JavaScript pan/zoom to same as with JS.Matthew Somerville2016-08-17-81/+42
| | | | | No need to use old OpenLayers PanZoom defaults, or load images we don't want to use.
* Merge branch 'harrogate-zurich-fixes'Matthew Somerville2016-08-17-293/+218
|\
| * [Bristol,Zurich] Factor out pin to template for shared use.Matthew Somerville2016-08-17-65/+31
| |
| * [Zurich] Fix server side map tile URL generation.Matthew Somerville2016-08-17-5/+4
| | | | | | | | | | | | @scales does not include the hidden zoom levels, so we need to offset the matrix ID to be correct in the URL but not do so to calculate the tile row and column.
| * Fix typo in WMTS number of zoom levels.Matthew Somerville2016-08-17-2/+2
| |
| * [Harrogate,Zurich] Remove inline/header script.Matthew Somerville2016-08-17-203/+181
| |
| * [Harrogate,Hart] Remove text, reports shown on mapMatthew Somerville2016-08-17-18/+0
| |
* | Merge branch 'issues/forcouncils/30-permission-management'Dave Arter2016-08-17-53/+592
|\ \ | |/ |/|
| * Restrict admin config/stats pagesDave Arter2016-08-17-30/+46
| | | | | | | | | | The config page is only accessible by superusers. The stats page only shows figures for the user’s from_body unless superuser.
| * Allow user permissions to be granted/revoked in adminDave Arter2016-08-17-51/+418
| |
| * Restrict from_body editing to superusersDave Arter2016-08-17-19/+40
| | | | | | | | | | | | | | Superusers can set a user's from_body to any value, but a normal staff user can only set another user's from_body to the same as their own or undefined. This is presented in the UI as a 'staff' tickbox.
| * Restrict user editing in adminDave Arter2016-08-17-3/+84
| | | | | | | | | | | | | | | | The 'user_edit' permission is required to edit users. The admin pages on UK council cobrands only allow editing of users whose from_body is the same as the logged-in user, or who have sent reports or updates to the council.
| * Require 'report_edit' permission for editing reports in adminDave Arter2016-08-17-0/+54
|/
* Make sure pin ID is an integer.Matthew Somerville2016-08-17-7/+11
| | | | This was originally fixed in c36a425b, but lost again in c87f28e.
* [fixmystreet.com] Don't show things to Page Speed.Matthew Somerville2016-08-17-2/+2
|
* Remove use of new window.Function for CSP.Matthew Somerville2016-08-17-1/+1
| | | | Even though it is empty.
* Simplify blank popState case.Matthew Somerville2016-08-17-1/+13
| | | | Prevent possible infinite loops during internal hashref change.
* Improve try again button by making it go back.Matthew Somerville2016-08-16-0/+4
|
* [fixmystreet.com] Add Content-Security-Policy.Matthew Somerville2016-08-16-7/+15
|
* Move most JavaScript to end, inline the remaining.Matthew Somerville2016-08-16-69/+71
|
* [fixmystreet.com] Factor out poster JavaScript.Matthew Somerville2016-08-16-21/+32
|
* Factor out most inline JavaScript.Matthew Somerville2016-08-16-77/+109
| | | | | No need for a special no-map case in the filters case, as all pages now have fixmystreet.page set if needed.
* Prefer using an auto.min.js file if present/newer.Matthew Somerville2016-08-16-4/+15
| | | | | This lets you choose to e.g. minimize JS files during a deploy, without making it mandatory as with the CSS.
* Do HTML class and JS variable setting ASAP.Matthew Somerville2016-08-16-12/+23
|
* Use separate mobile banner HTML to simplify changeMatthew Somerville2016-08-16-37/+30
|
* Split up modernizr/html5shiv/yepnope.Matthew Somerville2016-08-16-4/+15
| | | | | We only need html5shiv for <IE9, and we only use yepnope on the front page.
* Move modernizer/extra_js into common template.Matthew Somerville2016-08-16-17/+2
|
* Remove unused category_extras_json code.Matthew Somerville2016-08-16-7/+0
|
* Shrink test sample photo.Matthew Somerville2016-08-16-5/+5
|
* Only set Back link when first report pulled in.Matthew Somerville2016-08-16-3/+4
| | | | | Otherwise subsequent report views set the Back link to a report URI, so clicking it goes back to the list but with an incorrect address.
* Fix issue with add_links not interpolating.Matthew Somerville2016-08-15-1/+1
| | | | Double quoted string is needed for $1 and $2 to not be used exactly.
* Prevent error if latitude or longitude of 0 given.Matthew Somerville2016-08-15-1/+1
|
* Fix a crash on /admin/timelineDave Arter2016-08-15-2/+2
| | | | | The 'created' and 'state' column names are shared between the 'problem' and 'comment' tables, and this was causing ambiguous column references in the SQL.
* Fix invalid SQL being generated by moderation lookupDave Arter2016-08-15-2/+2
|
* Remove some unused code/ database handle.Matthew Somerville2016-08-12-29/+1
|
* Convert single newlines in text to <br>s.Matthew Somerville2016-08-12-0/+17
| | | | Fixes #306.
* Switch link adding to use double quotes.Matthew Somerville2016-08-12-3/+2
|
* Switch add_links template function to filter.Matthew Somerville2016-08-12-11/+12
|
* Update changelog.Matthew Somerville2016-08-12-4/+23
|
* Fix Moderate button labels, other labels/spacing.Matthew Somerville2016-08-10-14/+12
| | | | | | | Fixes #855. TODO: Prettifying of report moderation needs to be applied to the update form too.
* Direct report moderated emails correctly.Matthew Somerville2016-08-10-12/+12
|
* Merge branch '1474-absolutely-fabulous'Matthew Somerville2016-08-10-12/+13
|\
| * Make UPLOAD_DIR/GEO_CACHE relative to project rootMatthew Somerville2016-08-10-12/+13
| | | | | | | | | | If they are absolute already, do nothing. Switch a couple of uses to Path::Tiny as well.