aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | Fix test breakageHakim Cassimally2013-12-23-6/+23
| | | | | | | | for Zurich tests, count how many reports already exist as a baseline.
* | [Zurich] don't hardcode division ID in cleanup()Hakim Cassimally2013-12-23-8/+9
| |
* | Merge branch 'issues/commercial/462-zurich-overdue-row-colour'Hakim Cassimally2013-12-20-4/+41
|\ \
| * | [Zurich] admin template to respect closed_overdueHakim Cassimally2013-12-20-4/+41
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This value is now cached, but the template calls the function, calculating it anew, so for old reports (closed within SLA) the problem_row.html template showed these as overdue. Instead, we point the template at a function which first checks the cached value. (Attempting to roll this functionality into the .overdue() method itself caused a fair amount of collateral test breakage, and it seems safest to extract the caching function for now.) Closes https://github.com/mysociety/FixMyStreet-Commercial/issues/462
* | .gitignore for conf/crontabHakim Cassimally2013-12-17-0/+2
| | | | | | | | | | | | This is required after changes in 59eb44959e9cb8ccd21e9be813e4d1c8baaa1dcc for mySociety internal deployment toolchain.
* | Merge branch 'issues/commercial/461-zurich-export-hidden-stats'Hakim Cassimally2013-12-17-12/+20
|\ \
| * | [Zurich] stats export include 'hidden'Hakim Cassimally2013-12-17-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/mysociety/FixMyStreet-Commercial/issues/461 Again, we just need to substitute the %params line (which elides hidden reports) for the less restrictive %date_params. This commit includes very basic tests for the previously untested ?export=1 functionality.
* | | Merge branch 'issues/commercial/460-trailing-slashes-on-base-url'Hakim Cassimally2013-12-17-5/+21
|\ \ \ | |/ / |/| |
| * | Test for admin_base_url in RS::ProblemHakim Cassimally2013-12-17-1/+17
| | | | | | | | | | | | | | | Test that the slash is added in correct place (the base URL should not have its own trailing slash).
| * | Rationalise trailing slashes from admin_base_urlHakim Cassimally2013-12-11-5/+5
|/ / | | | | | | | | | | Remove from admin_base_url (which wraps config vars like {ADMIN_,}BASE_URL) and add to places in code which aren't expecting it.
* | Update path with new crontab location.Matthew Somerville2013-12-11-1/+1
| |
* | Merge branch 'crontab-move'Hakim Cassimally2013-12-10-0/+0
|\ \
| * | Rename crontab-exampleHakim Cassimally2013-12-10-0/+0
| | | | | | | | | | | | (for mysoc internal processing of .ugly file)
* | | Merge branch 'crontab-move'Hakim Cassimally2013-12-10-83/+0
|\| |
| * | Remove crontab.uglyHakim Cassimally2013-12-10-83/+0
| | | | | | | | | | | | | | | This is a mySociety internal deployment detail, and should be handled elsewhere.
* | | Merge branch 'zurich-problem-status-stats'Hakim Cassimally2013-12-10-57/+136
|\ \ \ | |/ / |/| |
| * | [Zurich] testing - create superuser earlierHakim Cassimally2013-12-10-2/+7
| | | | | | | | | | | | So that tests pass on clean dataset such as travis...
| * | [Zurich] also allow hidden reports for closed_overdueHakim Cassimally2013-12-10-3/+3
| | |
| * | [Zurich] fix moderated statistics to include hiddenHakim Cassimally2013-12-10-54/+128
| | | | | | | | | | | | | | | | | | As per comments after testing mysociety/FixMyStreet-Commercial#459, the business logic of the actual state changes is fine, but the stats do also then need to include hidden records.
* | | Merge branch 'zurich-problem-status-stats'Hakim Cassimally2013-12-09-29/+174
|\| |
| * | [Zurich] log admin changesHakim Cassimally2013-12-09-6/+23
| | | | | | | | | | | | | | | To allow us to infer additional stats changes requirements such as in mysociety/FixMyStreet-Commercial#459 better in future.
| * | remove action check on admin_logHakim Cassimally2013-12-09-4/+15
| | | | | | | | | | | | to allow a wider range of action logging.
| * | [Zurich] move mech test into override_config stanzaHakim Cassimally2013-12-09-2/+2
| | | | | | | | | | | | | | | This was causing previous test failures when config != Zurich, due to expected logic not getting triggered.
| * | [Zurich] test factor out cleanup() routineHakim Cassimally2013-12-09-4/+9
| | |
| * | [Zurich] test /admin/statsHakim Cassimally2013-12-09-0/+40
| | | | | | | | | | | | | | | | | | | | | First test that this page is only available to superuser. Then test that the moderated and fixed stats are doing something that is (hopefully) the spec in mysociety/FixMyStreet-Commercial#459
| * | [Zurich] log details for closed_overdueHakim Cassimally2013-12-09-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see mysociety/FixMyStreet-Commercial#459 the new requirement is for "Innerhalb von fübeitstagen abgeschlossen" - a report is dealt with (abgeschlossen) as soon as the public state is Beantwortet (db: fixed - council or closed) or Unsichtbar (en: Invisible, db: hidden). Have added this as {closed_overdue} but have retained the logic for {subdiv_overdue} logged in the %extra hash for now, in case it is needed. Note: as per Matthew "as with confirmed/in progress this should be 6 - it's five days from moderation so is most simply just done as being six since creation"
| * | [Zurich] quash undef warning on date-checkHakim Cassimally2013-12-09-1/+1
| | |
| * | [Zurich] test moderated_overdueHakim Cassimally2013-12-09-0/+43
| | | | | | | | | | | | | | | | | | - is set to 0 on state change within time-limit - is set to 1 on state change after time-limit - only marks overdue on first time
| * | [Zurich] report is moderated on first status changeHakim Cassimally2013-12-09-7/+14
| | | | | | | | | | | | | | | | | | | | | mysociety/FixMyStreet-Commercial#459 - we move "confirmed" to being a moderated-but-not-complete state, and run the check for ->overdue also on changing status from 'unconfirmed' (but only the first time, so only if $extra->{moderated_overdue} isn't already set.
| * | Suppress 'once' warningHakim Cassimally2013-12-09-2/+5
| | |
| * | [Zurich] moderation cron only checks 'unconfirmed'Hakim Cassimally2013-12-09-2/+2
|/ / | | | | | | | | | | | | | | | | | | see mysociety/FixMyStreet-Commercial#459 - "a report is moderated as soon as its state has changed for the first time from Erfasst (en: Submitted / db: unconfirmed) to any other state." Thus we move 'confirmed' problems from the 1-day moderation SLA, to a 5-day one, with $include_parent unset (e.g. as with 'planned' it is with the DM, so doesn't need to be sent to the parent body also.)
* | Actually include the image, doh.Matthew Somerville2013-11-20-0/+0
| |
* | Add OpenGraph meta elements (for #613).Matthew Somerville2013-11-20-0/+10
| |
* | Merge branch 'fixmindelo-privacy'Matthew Somerville2013-11-20-0/+114
|\ \
| * | [FixMindelo] Translation of the privacy page.Jen Bramley2013-11-20-51/+80
| | | | | | | | | | | | Omitted the credits and links to further information.
| * | Copy of main privacy file to work on.Matthew Somerville2013-11-20-0/+85
| | |
* | | Remove cached photos if hidden in admin interface.Matthew Somerville2013-11-20-3/+21
| | | | | | | | | | | | | | | Use the internal hash URL of the photo so that it can still be seen in the admin interface.
* | | Tidy up use of main width a bit.Matthew Somerville2013-11-13-13/+11
| | |
* | | Simplify .content width/margins.Matthew Somerville2013-11-13-14/+4
|/ / | | | | | | | | | | Reduce magic numbers by switching fixed width to a margin elsewhere. This has the added bonus of making the 'middle-width' .content have a pleasing right margin.
* | Version 1.3.v1.3Matthew Somerville2013-11-12-4595/+8101
| |
* | Include version number on admin config page.Matthew Somerville2013-11-12-1/+10
| |
* | Add body deletion to admin interface.Matthew Somerville2013-11-11-7/+11
| |
* | Don't display categories for deleted bodiesChris Mytton2013-11-11-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | When a body has been marked as deleted (currently only exposed in the Zurich cobrand's admin) the categories for that body should not be available on the report_new form. Prior to this change there was an error running the 'zurich-overdue-alert' script, because it wasn't expecting the 'bodies_str' field to have any entries in the format 'x|y,z', this prevents this problem from happening in the future (though it doesn't fix any existing entries with this issue).
* | If only one cobrand given, always use it.Matthew Somerville2013-11-07-48/+104
| | | | | | | | | | | | | | | | | | If the ALLOWED_COBRANDS configuration variable only contains one entry (and also work if it's a string rather than a list), always use that cobrand, no matter what the hostname is. The example Vagrantfile no longer needs the configuration changes at all.
* | Reorganise admin update list to match report list.Matthew Somerville2013-11-07-9/+9
| |
* | Add more admin external link icons.Matthew Somerville2013-11-07-16/+16
| | | | | | | | Use a relative URL in the CSS in case it's proxied.
* | Show a graphic on links to non-admin pagesAndy Lulham2013-11-07-11/+20
| | | | | | | | Graphic and css from FMT. Fixes #579.
* | Use relative URLs in case being included via proxy.Matthew Somerville2013-11-07-4/+4
| |
* | Make sure admin start is specified for all the static files.Matthew Somerville2013-11-07-9/+9
| |
* | Merge remote branch 'origin/ab_date'Matthew Somerville2013-11-07-23/+48
|\ \