aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Merge branch '2346-unescape-titles'Matthew Somerville2018-12-13-7/+38
|\
| * Don’t escape entities in report titles via ajax.Matthew Somerville2018-12-12-1/+31
| |
| * Activate test_mode on JS testing.Matthew Somerville2018-12-12-6/+7
| | | | | | | | | | | | This is so front-end tests will not try and send email, or call Gaze. Various co-ordinates have to be updated because the default zoom level of the map has now changed.
* | Merge branch 'bucks-roads-message-tweak'Matthew Somerville2018-12-13-7/+46
|\ \ | |/ |/|
| * [Buckinghamshire] Nicer not-our-road messages.Matthew Somerville2018-12-11-7/+46
| |
* | [UK Councils] Fix undefined body_validation_rules.Matthew Somerville2018-12-11-25/+22
|/ | | | The core validation_rules.js is not included on e.g. the front page.
* [Zurich] Add 2019/2020 extra holidays.Matthew Somerville2018-12-11-0/+2
|
* [Buckinghamshire] New tracking code.Matthew Somerville2018-12-08-14/+26
|
* [Bromley] Tidy up some form templates.Matthew Somerville2018-12-08-83/+33
|
* Show email form after logging in as leaving updateMatthew Somerville2018-12-08-12/+12
| | | | | | | | | With the recent login changes, the user form was being hidden after logging in while leaving an update, meaning you had to click "Continue" to see the thing it was asking you to check. Refactor the update flow slightly in this area to be more like reporting, showing the relevant bit of the user form immediately (and thus also not having it within a hidden section).
* Specify type variable to both in and out templatesMatthew Somerville2018-12-08-3/+3
| | | | All templates call private_details.html, which uses this variable.
* Make sure locale path specified in JS controller.Matthew Somerville2018-12-08-1/+3
| | | | | This doesn't appear to cause any issues on Linux, but on Mac it fails to find the translation file without this. Matches the code in App.pm.
* [Open311] Prevent warning on bad error response.Matthew Somerville2018-12-08-2/+5
|
* [fixmystreet.com] More categories in fixture.Matthew Somerville2018-12-08-11/+71
|
* Fix issue with multiple button IDs on page.Matthew Somerville2018-12-05-15/+48
| | | | | | When a report is pulled in via ajax, it means there are then two sets of login flow buttons on the page, and the JS setup only attaches to the first of these.
* Make sure form_section_preview set up with ajax.Matthew Somerville2018-12-05-0/+1
|
* Merge branch '642-new-report-flow-changes'Matthew Somerville2018-12-05-668/+476
|\
| * Move email input nearer password input on forms.Zarino Zappia2018-12-05-31/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the email input from `user_loggedout.html` closer to the password inputs in `user_loggedout_{by_email,password}.html`, because we want to emphasise the connection between your login email/username and your password, and, now that only one "Yes I have an account / No I do not have an account" fieldset is displayed at a time, there was no reason to ask for the email/username up front. This, however, now means the form includes two username inputs, so: * `Report/New.pm` and `Report/Update.pm` now pick the first non-empty username param and use that. * `user_loggedout_email.html` now expects a `name` parameter, so that we can give the two username inputs unique ids in the markup. Also: * The "optional" phone and email inputs in user_loggedout_by_email.html are printed *after* the main username input if SMS login is enabled (since one or other of them is unhidden by javascript, based on whether you entered a phone number or and email address into the "username" input, and it would look weird to have an input become unhidden *above* the input you’re currently editing).
| * Update sign in flow for new reports/updates.Matthew Somerville2018-12-05-164/+306
| | | | | | | | Co-authored-by: Zarino Zappia <zarino@mysociety.org>
| * Prevent horizontal space between sibling block-level buttonsZarino Zappia2018-12-05-0/+7
| |
| * Fix form_email/form_username typo in logged-in report formZarino Zappia2018-12-05-1/+1
| |
| * Form submit buttons no longer inline with inputs.Zarino Zappia2018-12-05-17/+16
| | | | | | | | | | | | This was a cute space-saving feature at the time, but the layout made it look like the button was specific to that input, rather than submitting the whole form. Make similar buttons full width, and improve spacing.
| * Simplify category required attribute.Matthew Somerville2018-12-05-10/+6
| |
| * Consolidate the report/update loggedout templates.Matthew Somerville2018-12-05-334/+93
| |
| * Tweak update templates to better match reporting.Matthew Somerville2018-12-04-43/+49
| | | | | | | | Remove update/form_name.html template.
| * Remove form-focus-trigger/hidden behaviour.Matthew Somerville2018-12-04-39/+22
| |
| * Do not show second email form if SMS_AUTHENTICATION off.Matthew Somerville2018-12-04-23/+3
| |
| * Remove “Keep me signed in” box.Matthew Somerville2018-12-04-83/+2
| |
| * [Oxfordshire] Fix test warning.Matthew Somerville2018-12-04-0/+1
| |
* | Fix moderation without JavaScript.Matthew Somerville2018-12-04-9/+59
|/
* Merge branch 'hide-pin-no-location'Matthew Somerville2018-12-03-0/+3
|\
| * Don't draw a pin for a problem with no location.Martin Wright2018-12-03-0/+3
| |
* | [Bucks] display street light numbers upon selectStruan Donald2018-12-03-1/+73
|/ | | | | | When a user selects a street light display the street light column number beneath the asset on the map. Also replace the "Select a street light" text with an indication of which street light has been selected.
* Merge branch 'joe/2331-handlemail-cobrand'Matthew Somerville2018-12-03-9/+148
|\
| * Spot more autoreply headers, and set our own.Matthew Somerville2018-11-30-1/+10
| |
| * Adds documentation for handlemail.Joe Siltberg2018-11-28-0/+120
| |
| * Read in autoresponse template as UTF-8.Matthew Somerville2018-11-27-4/+3
| |
| * Adds cobrand support for handlemail.Joe Siltberg2018-11-27-5/+16
| | | | | | | | Fixes #2331
* | Include missing package in handlemail-support.Matthew Somerville2018-11-29-0/+1
| |
* | Consistent behaviour of ‘problems nearby’ linkDave Arter2018-11-27-24/+33
| |
* | Restore zoom level when navigating back to /around from /reportDave Arter2018-11-27-2/+53
| | | | | | | | Fixes #1649.
* | Associate moderation history with admin log.Matthew Somerville2018-11-27-65/+115
| |
* | Show moderation history in report/update admin.Matthew Somerville2018-11-26-2/+177
| |
* | Store all moderation change history in database.Matthew Somerville2018-11-26-70/+74
| | | | | | | | | | Currently keeping the same front end functionality of only reverting to the original.
* | Improve update display on admin report edit page.Matthew Somerville2018-11-26-16/+20
| |
* | Assume no IM if testing, as it changes sample image.Matthew Somerville2018-11-26-0/+1
|/
* [UK] fix line break in translated stringStruan Donald2018-11-26-2/+1
| | | | To avoid adding a new, but identical translation
* [UK] council specific javascript validationStruan Donald2018-11-26-3/+91
| | | | | | | | | use the bodies array of reporting_data to check if there is council specific javascript validation and, if so, load that into the JS validation rules. This does mean we reset the validation rules each time you select a category.
* Fix getservicerequestupdates test failuresStruan Donald2018-11-26-4/+4
| | | | | | | | Some of these were occasional failures due to timing issues. One was due to a hard coded body id meaning the addition of bodies in other tests meant this was creating two bodies with the same id, which happened to be used in a test which depended on the bodies having different ids.
* [UK] server side cobrand specific validationStruan Donald2018-11-26-8/+230
| | | | | | `report_check_for_errors` now fetches the cobrand for the current report and, if present, runs `report_validation` method from cobrand over the report.