aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
...
| * | Remove hardcoded states from Problem model.Matthew Somerville2017-08-31-46/+202
| * | Add state table to database.Matthew Somerville2017-08-29-63/+140
* | | Stop make_css failing if run on fresh checkout.Matthew Somerville2017-08-31-1/+7
* | | Merge branch 'issues/commercial/840-groundcontrol'Dave Arter2017-08-31-11/+315
|\ \ \ | |_|/ |/| |
| * | Add Extra->get_extra_field_valueDave Arter2017-08-31-0/+58
| * | Add ability for area outlines on /reports to be hidden by cobrandDave Arter2017-08-31-1/+4
| * | Add SIGNUPS_DISABLED config flagDave Arter2017-08-31-4/+124
| * | Add LOGIN_REQUIRED config keyDave Arter2017-08-31-6/+125
| * | [Ground Control] Add cobrand to .gitignoreMatthew Somerville2017-08-30-0/+4
|/ /
* | Merge branch 'some-dev-improvements'Matthew Somerville2017-08-29-89/+287
|\ \
| * | Use our fork of Devel::Cover::Report::Codecov.Matthew Somerville2017-08-29-1/+1
| * | Add debug toolbar middleware.Matthew Somerville2017-08-29-85/+283
| * | Stop using File::Slurp in make_css.Matthew Somerville2017-08-29-3/+3
* | | Merge branch 'move-report-states-to-database-part-1'Matthew Somerville2017-08-29-86/+30
|\ \ \ | |/ / |/| / | |/
| * Drop council_states and $visible_states.Matthew Somerville2017-08-29-50/+6
| * Show "Fixed" for fixed states only when warranted.Matthew Somerville2017-08-29-9/+10
| * Sort languages in template.Matthew Somerville2017-08-25-2/+2
| * Make sure gettext domain specified in all tests.Matthew Somerville2017-08-25-20/+2
| * Stop admin_reportextrafields.t info messages.Matthew Somerville2017-08-25-0/+4
| * [Zurich] Move Zurich specific setup to its cobrand.Matthew Somerville2017-08-25-5/+6
* | Redirect to original URL after inspectingDave Arter2017-08-24-22/+69
|/
* Merge remote-tracking branch 'origin/empty-alert-urls'Matthew Somerville2017-08-23-2/+81
|\
| * Fix missing URLs in alert emailsDave Arter2017-08-22-2/+81
* | Merge branch '1815-fix-dropzone-thumbnail-display'Matthew Somerville2017-08-23-2/+7
|\ \
| * | Fix redisplay of uploaded photo thumbnails.Matthew Somerville2017-08-23-2/+7
| |/
* | Merge branch 'speeed-up-reports'Matthew Somerville2017-08-23-5/+29
|\ \ | |/ |/|
| * Join response_priority if needed, and reorder template conditional to not che...Matthew Somerville2017-08-23-3/+12
| * Use a schema cache to remember body lookups.Matthew Somerville2017-08-23-2/+17
* | [Travis] Run code coverage on 5.24.Matthew Somerville2017-08-21-3/+3
* | [Bristol] Fix 500 error on /report/newDave Arter2017-08-21-1/+46
|/
* Merge branch 'speed-up-reports'Matthew Somerville2017-08-18-12/+51
|\
| * Update changelog.Matthew Somerville2017-08-18-3/+6
| * Cache Problem->bodies and prefetch the body areas.Matthew Somerville2017-08-18-7/+15
| * Faster /reports for inspectors, reduce db queries.Dave Arter2017-08-18-2/+30
* | Merge branch 'zurich-upgrade-openlayers'Matthew Somerville2017-08-18-1398/+660
|\ \ | |/ |/|
| * [Zurich] Bring all reports in line with upstream.Matthew Somerville2017-08-18-15/+20
| * [Zurich] Upgrade OpenLayers to master, matching others.Matthew Somerville2017-08-18-1377/+625
| * Allow co-ords to be supplied to fixture script.Matthew Somerville2017-08-18-6/+15
* | Reduce queries on /report when loading defect types/prioritiesDave Arter2017-08-18-2/+6
|/
* Make sure /around permalink/redirect have js paramMatthew Somerville2017-08-18-0/+7
* Merge branch 'js-you-only-load-once'Matthew Somerville2017-08-17-98/+63
|\
| * Do not fetch pins server side if JS enabled.Matthew Somerville2017-08-17-0/+9
| * Fix replaced sidebar losing hover behaviour.Matthew Somerville2017-08-17-3/+4
| * Refactor /around list code to share with others.Matthew Somerville2017-08-17-95/+50
* | Merge branch 'issues/forcouncils/201-show-all-report-updates'Matthew Somerville2017-08-17-22/+94
|\ \
| * | show all report updates, even if no public textStruan Donald2017-08-17-22/+94
* | | Merge branch 'issues/forcouncils/187-all-reports-filter-by-substates'Matthew Somerville2017-08-17-0/+105
|\ \ \
| * | | allow body users to filter on all problem categoriesStruan Donald2017-08-17-0/+105
| |/ /
* | | Merge branch 'edit-defecttypes-tests'Matthew Somerville2017-08-17-0/+193
|\ \ \ | |/ / |/| |
| * | tests for the defect types admin interfaceStruan Donald2017-08-17-0/+193