aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Include /admin link on top-level nav for admin usersDave Arter2017-02-16-0/+4
| | | | Fixes mysociety/fixmystreetforcouncils#166
* [Oxfordshire] Open311 update timestamps should be in UTCDave Arter2017-02-15-1/+17
| | | | | | | | | | The timestamps returned from the database are in server-local time, not UTC. Because FMS expects timestamps in Open311 responses to be UTC, the timestamps of updates from OCC appear one hour ahead when DST is in effect. This commit converts the timestamps to UTC before outputting them. Fixes mysociety/FixMyStreet-Commercial#499
* Merge branch 'issues/forcouncils/127-exor-rdi-csv-output'Dave Arter2017-02-15-57/+483
|\
| * [Oxfordshire] Add Exor RDI file download featureDave Arter2017-02-15-5/+342
| | | | | | | | | | | | | | | | | | | | The RDI file format encapsulates information about inspections that have taken place, and can be uploaded into Exor to create defects in bulk. This commit adds a page to the Oxfordshire cobrand's admin allowing RDI files to be generated and downloaded from FMS. For mysociety/fixmystreetforcouncils#127
| * [Oxfordshire] Don't show user reputation on other cobrandsDave Arter2017-02-15-8/+9
| |
| * [Oxfordshire] Add initials field to admin user edit formDave Arter2017-02-15-0/+36
| |
| * Allow cobrands to control which states affect reputationDave Arter2017-02-15-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | Rather than assigning +1 to a user's reputation every time a report is inspected, this allows cobrands to specify which states should increment or decrement the reputation value when a report is inspected. The default behaviour is for reputation to never be changed, but the Oxfordshire cobrand will increment the reputation when a report is marked as 'action scheduled'. For mysociety/fixmystreetforcouncils#119
| * Clarify ‘inspected’ behaviourDave Arter2017-02-15-14/+20
| | | | | | | | | | | | A report is now considered 'inspected' if its state was changed by an inspector. Additionally, an AdminLog entry is created so the time of inspection and inspector can be recorded.
| * Add external_id field to ResponsePriority for use with ExorDave Arter2017-02-15-2/+23
| |
| * Add cobrand call_hook fn, calls a fn if defined.Matthew Somerville2017-02-15-25/+23
|/
* Merge branch 'issues/forcouncils/51-close-old-reports'Dave Arter2017-02-15-11/+584
|\
| * [Oxfordshire] Old report archiving scriptpezholio2017-02-15-0/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script can be used for the bulk closure of old reports that haven't been updated in a long time. Reports that haven't been updated in a *really* long time (since 2014, by default) are simply closed, and those that haven't been updated since 2015 (by default) are closed and an email explaining the closure is sent to the report creator. This script can be used for other cobrands, but they'll need an archive.{txt,html} template in order for the emails to be sent. For mysociety/fixmystreetforcouncils#51
| * Use Token params for redirect on loginpezholio2017-02-15-3/+7
| | | | | | | | | | Tokens can include a 'p' field in their data to set query params for the post-login redirect URL.
| * Add Problem->tokenised_url for logging user inpezholio2017-02-15-2/+55
| | | | | | | | | | | | This method creates a token that logs the reporting user in, optionally with some parameters which are stored with the token for use when redirecting after login.
| * Allow users to reopen closed reportspezholio2017-02-15-3/+7
| | | | | | | | Users can reopen their own reports when leaving an update.
| * Add Problem->time_ago for pretty-printed durationpezholio2017-02-15-0/+58
| |
| * Utils::prettify_duration improvementspezholio2017-02-15-3/+38
|/ | | | | - Add year and month to $nearest options - Allow prettify_duration to choose a sensible $nearest if omitted
* Merge branch 'issues/forcouncils/69-redirect-on-login'Dave Arter2017-02-14-245/+135
|\
| * [SeeSomething] Use new main_nav.html for main menuDave Arter2017-02-14-9/+4
| |
| * [UK Councils] Use new main_nav.html for main menuDave Arter2017-02-14-205/+30
| |
| * Refactor main nav into reusable blocksDave Arter2017-02-14-29/+80
| |
| * Redirect to category-filtered /reports on loginDave Arter2017-02-14-1/+20
| | | | | | | | If the user has a from_body and at least one category set.
| * Follow redirect to /admin after login if allowedDave Arter2017-02-14-1/+1
|/
* [Harrogate] Remove unused cobrandDave Arter2017-02-09-1621/+0
|
* [Oxfordshire] Show simpler state list on inspect formDave Arter2017-02-08-17/+63
| | | | | | | | | | Limits the state dropdown to those states which will be useful to OCC inspectors, as well as removing a few from the base template on the inspect form. Some slight template refactoring has made it easier for other cobrands to override the list, as well as sharing the template with the admin report_edit form to allow all states to be selected. Fixes mysociety/fixmystreetforcouncils#129
* [Oxfordshire] Allow cobrand-specific traffic management optionsDave Arter2017-02-08-2/+42
| | | | Fixes mysociety/fixmystreetforcouncils#159
* Fix crash on reports with empty bodies_strDave Arter2017-02-07-1/+17
|
* Add shortlist filterspezholio2017-02-07-6/+88
|
* Ignore some more fixmystreet-international symlinksDave Arter2017-02-06-0/+1
|
* [Greenwich] Add a badge to official status updatesrbg-joe2017-02-06-0/+2
| | | | | | | | | Adding an official badge to Greenwich updates so as to avoid exchanges in which public contributions are mistaken for official ones. As per the Bromley version e.g. https://fix.bromley.gov.uk/report/973784 - this helps to avoid situations where public contributions are mistaken for official ones.
* Merge branch 'version-2.0.2'v2.0.2Matthew Somerville2017-02-03-11273/+15944
|\
| * Version 2.0.2.Matthew Somerville2017-02-03-2/+40
| |
| * Update changed strings, maintaining translations.Matthew Somerville2017-02-02-600/+717
| |
| * Update translations with new source strings.Matthew Somerville2017-02-02-6925/+8995
| |
| * Update translations from Transifex.Matthew Somerville2017-02-02-4231/+6679
| |
| * Make gettext-nget-patch be consistent in output.Matthew Somerville2017-02-02-1/+1
| |
| * Show ‘unable to fix’ state as ‘no further action’.Dave Arter2017-02-02-8/+6
| | | | | | | | Bromley had this already in its update state change messages.
* | Merge branch 'open311-field-closest-address'Matthew Somerville2017-02-03-1/+3
|\ \
| * | Add a 'closest_address' hidden Open311 attribute.Matthew Somerville2017-02-03-1/+3
| |/ | | | | | | This joins easting, northing and an external ID field.
* | [Greenwich] Reduce on-map age further to 21 daysDave Arter2017-02-03-1/+1
| |
* | Call base_url_with_lang in base_url_for_report.Altin Ukshini2017-02-03-3/+3
|/ | | | | | This function is used e.g. in report lists, and if you were using the multiple language subdomain functionality, those links could take you to a different language.
* Simplify response template selector HTMLDave Arter2017-01-31-4/+2
| | | | | | | | | | | Using a div inside a p isn't valid, so the DOM was being restructured by the browser causing the 'save with public update' toggle on the inspect form to not work. This fixes the issue by removing the wrapper <div> and selecting the appropriate elements for toggling with the js- class on the <select>. Fixes mysociety/fixmystreetforcouncils#153
* Wrap problem list in `js-reports-list`pezholio2017-01-31-0/+2
|
* Return JSON if `ajax` in paramspezholio2017-01-31-0/+16
|
* Merge branch 'inspect-save-to-shortlist'Matthew Somerville2017-01-31-0/+6
|\
| * Redirect to shortlist if user has shortlist perms.Matthew Somerville2017-01-24-0/+6
| | | | | | | | | | Assume that if they inspect and save a report, they want to go back to their shortlist.
* | [Greenwich] Show reports up to 3 months old by defaultDave Arter2017-01-27-0/+4
| |
* | Lowercase email when signing in.Matthew Somerville2017-01-26-0/+1
| |
* | Fire shortlist JavaScript only on report lists.Matthew Somerville2017-01-24-1/+1
|/ | | | | It was also catching update lists, which have their own submit buttons (e.g. for moderation).
* Mark two missing strings for translation.mccheung2017-01-21-2/+2
| | | | Fixes #1604.