aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * Refactor problem response priority into its own modelDave Arter2016-09-09-88/+525
|/ | | | | | | This moves the response priority values from a cobrand-specific method to a full DB model, and includes management screens in the admin for administering them. For mysociety/fixmystreetforcouncils#66
* Merge branch 'issues/forcouncils/50-instruct-report'Dave Arter2016-09-09-13/+111
|\
| * Add ‘Inspection required’ field to categoriesDave Arter2016-09-09-13/+111
|/ | | | | | | | | | | Categories can now require reports to be marked as 'inspected' via the frontend before they're sent by send-reports. A side-effect here is that send-reports will perform an extra n queries for each report, where n is the number of bodies that report is being sent to, but hopefully in practice this won't matter as it's an offline cronjob. See mysociety/fixmystreetforcouncils#50
* Merge branch 'issues/forcouncils/6-oxfordshire-photo-guidance'Matthew Somerville2016-09-09-22/+40
|\
| * Pluralize "Photos" form label after Dropzone loadsZarino Zappia2016-09-09-12/+30
| | | | | | | | | | A very subtle nudge that you can/should upload multiple photos. With a fallback to singular if Dropzone fails to load for some reason.
| * Show photo guidance for all cobrands.Zarino Zappia2016-09-09-10/+10
| |
* | Merge remote-tracking branch 'github/issues/forcouncils/41-location-guidance'Matthew Somerville2016-09-09-4/+4
|\ \
| * | Improve "Summary" and "Description" form guidanceZarino Zappia2016-09-08-4/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Form labels now describe what the user should do, and placeholders give a supporting example of what their input should look like. Placeholder text in the "Summary" box now suggests that people include a location in their summary. Likewise with a timescale in the "Description" box. Placeholders use potholes as an example, since potholes are the most common complaint on FMS. Maybe eventually we might want to change the placeholder text based on the category the user selects…
* | Add confirm step to Remove from site button.Matthew Somerville2016-09-09-2/+2
| |
* | Remove inline onclick handlers.Matthew Somerville2016-09-09-57/+10
| |
* | Fix form validation issue with multiple IDs.Matthew Somerville2016-09-09-40/+34
| | | | | | | | | | | | Firefox would, on a page that pulled in a report via ajax, only return the reporting form's name field with #form_name. Switch to using a class on the relevant fields.
* | Add validName validation to update form.Matthew Somerville2016-09-09-6/+2
| |
* | Fix scrolling error into view.Matthew Somerville2016-09-09-1/+3
| | | | | | | | Firefox still only scrolls precisely to the focus.
* | Tidy/remove some old validation code.Matthew Somerville2016-09-09-44/+3
| |
* | Show 'Remove from site' button based on report.Matthew Somerville2016-09-09-1/+1
| | | | | | | | | | | | | | | | If the user is a member of the body the report was sent to (and the cobrand has the option enabled), show the remove from site button. This was previously cobrand-based (it was shown if the user was a member of the body the cobrand has hardcoded as its council_id), which was confusing and harder to implement. Fixes #1508.
* | [Oxfordshire] Display confirmed reports as received by the CouncilDave Arter2016-09-08-4/+17
| | | | | | | | | | | | | | | | This introduces a new `is_council_with_case_management` flag for Cobrands, that, when active, considers any report that's been confirmed as having been received by the Council in question. See mysociety/fixmystreetforcouncils#65
* | Merge branch 'issues/forcouncils/31-response-templates'Dave Arter2016-09-08-57/+327
|\ \ | |/ |/|
| * [Oxfordshire] Fix narrow nav on adminDave Arter2016-09-08-1/+1
| |
| * Simplify some permissions logic with extra helper methodDave Arter2016-09-08-11/+33
| |
| * 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
|/