aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * Extend response templates to work across all cobrandsDave Arter2016-09-08-48/+296
|/ | | | | | | | | | | This builds on the response templates in the Zürich cobrand: - Allow response templates to be assigned to categories - Also adds a auto_response flag, which will be used to automatically create updates when reports are made. - Include response templates select box on update form For mysociety/fixmystreetforcouncils#31
* Merge branch jonkri:master.Matthew Somerville2016-09-07-15/+31
|\
| * [FixaMinGata] Add Open Graph informationJon Kristensen2016-09-07-0/+10
| |
| * [FixaMinGata] Fix broken "sign in again" linkJon Kristensen2016-09-07-1/+1
| |
| * [FixaMinGata] Change two "FixMyStreet" stringsJon Kristensen2016-09-07-2/+2
| |
| * [FixaMinGata] Switch from HTTP to HTTPS in some placesJon Kristensen2016-09-07-3/+3
| |
| * [FixaMinGata] Add "user-info" margin on front pageJon Kristensen2016-09-07-1/+3
| |
| * Fetch MapQuest images via HTTPS rather than HTTPJon Kristensen2016-09-07-9/+9
| |
| * [FixaMinGata] Decrease header size and logo padding on front pageJon Kristensen2016-09-07-0/+4
|/
* Merge branch 'issues/forcouncils/60-mapping-layer'Matthew Somerville2016-09-06-0/+2
|\
| * [Oxfordshire] Set map type to OSM.Matthew Somerville2016-09-06-0/+2
| |
* | Merge branch 'issues/forcouncils/22-inspector-markup'Dave Arter2016-09-06-70/+469
|\ \ | |/ |/|
| * A couple of CSS improvements on report pageZarino Zappia2016-09-06-24/+27
| | | | | | | | | | | | | | | | - Harmonise two-column sidebar with .with-notes convention `body.mappage.twocol` is now `body.mappage.with-actions` to make it more obvious that it’s just a special case like `.with-notes`. - Make sidebar padding-bottom work with floated children - Display a.btn elements correctly in Safari
| * Add inspector report detail viewDave Arter2016-09-06-69/+465
|/ | | | | | | | | | | | | Users with the `report_inspect` permission can click a new 'inspect' button on a report page to input more detailed problem information into a new form that appears in a column alongside the report detail. - Inspector data is stored in problem's 'extra' field - Report category/state can be edited - Location can be changed by dragging the pin or HTML5 geolocation (Factored out Zurich admin pin drag into own function) For mysociety/fixmystreetforcouncils#22
* [Zurich] Call add_links filter correctlyDave Arter2016-09-06-2/+2
| | | | Fixes a bug with updates not being displayed correctly in the app.
* Merge branch 'photo-preview-fix'Matthew Somerville2016-09-05-23/+36
|\
| * Fix photo preview display after submission.Matthew Somerville2016-09-05-23/+36
| | | | | | | | | | | | If the form is submitted and reshown, due to an error or logging in, the image preview is loaded from the server, rather than the client. We need to get the image source data to get the Exif data out of it.
* | Update Net::Domain::TLD.Matthew Somerville2016-09-05-4/+4
|/
* Merge branch 'stevenage-open311'Matthew Somerville2016-08-26-3899/+140
|\
| * Warnfix test by specifying areas for problem.Matthew Somerville2016-08-24-1/+3
| |
| * Automatically spot Open311 co-ord/ID attributes.Matthew Somerville2016-08-24-49/+116
| |
| * Pass back Open311 request through send_reports for tests.Matthew Somerville2016-08-24-10/+20
| |
| * Remove Open311 endpoint to separate repo.Matthew Somerville2016-08-23-3839/+1
| |
* | Merge remote-tracking branch 'origin/fix-ajax-moderation'Matthew Somerville2016-08-26-56/+51
|\ \
| * | Make sure moderation works on AJAX-loaded report.Dave Arter2016-08-26-56/+51
| | | | | | | | | | | | | | | | | | | | | | | | This refactors the moderation JS into a fixmystreet.set_up function, and ensures the button handlers are attached when a new report is loaded over AJAX. A side effect of bringing it into fixmystreet.js instead of its own moderate.js file is the few extra kb each user will have to download, but hopefully gzip and caching will help ameliorate this.
* | | Merge branch 'issues/forcouncils/8-change-password-tweaks'Matthew Somerville2016-08-26-6/+15
|\ \ \ | |/ / |/| |
| * | Improve change password form/success page.Matthew Somerville2016-08-25-6/+15
| | |
* | | Fix inverted logic on report anonymity when moderatingDave Arter2016-08-25-2/+2
|/ /
* / Fix updating email field when reporting as anotherMatthew Somerville2016-08-23-2/+3
|/ | | | | | When the form is shown via JavaScript, we need the email box to start off editable as it is if you hadn't used JavaScript, and we also need the change() to be fired on the right field.
* Merge branch 'issues/forcouncils/37-user-area-management'Dave Arter2016-08-22-246/+364
|\
| * Allow user to have an area assigned in adminDave Arter2016-08-22-246/+364
|/
* Merge branch 'issues/forcouncils/16-search-by-reference'Dave Arter2016-08-22-0/+56
|\
| * Allow searching for reports with ref: prefix in postcode fieldDave Arter2016-08-22-0/+56
|/ | | | | | | | | Searches the `id` and `external_id` fields. This takes you directly to the report if only a single report matches, otherwise a disambiguation page is shown. For mysociety/fixmystreetforcouncils#16
* Catch content changes with delegation/selectors.Matthew Somerville2016-08-22-4/+4
| | | | | e.g. if a report is pulled in to the page via JavaScript, we need this to run on the entry in the update form.
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 14:47:33 +0000