Damian Mooyman a3c52f901a

Merge remote-tracking branch 'origin/4.0' into 4 ...

# Conflicts:
#	src/Core/TempFolder.php
#	src/ORM/DataObject.php
#	src/View/ThemeResourceLoader.php
#	src/includes/constants.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
#	tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
#	tests/php/View/RequirementsTest.php

2018-01-22 14:57:05 +13:00

..

Bogey.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

Bracket.php

FIX Bracket should implement TestOnly

2017-05-30 22:44:24 +01:00

CEO.php

Fixing string concat CS issues

2018-01-16 18:39:30 +00:00

Company.php

Fixing string concat CS issues

2018-01-16 18:39:30 +00:00

EquipmentCompany.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

ExtendedTeamComment.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

Fan.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

FieldlessSubTable.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

FieldlessTable.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

Fixture.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

OtherSubclassWithSameField.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

Play.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

Player.php

Fixing string concat CS issues

2018-01-16 18:39:30 +00:00

Ploy.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

RelationChildFirst.php

API Ensure that all DataQuery joins are aliased based on relationship name

2017-05-26 13:38:58 +12:00

RelationChildSecond.php

API Ensure that all DataQuery joins are aliased based on relationship name

2017-05-26 13:38:58 +12:00

RelationParent.php

API Ensure that all DataQuery joins are aliased based on relationship name

2017-05-26 13:38:58 +12:00

Sortable.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

Staff.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

SubEquipmentCompany.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

SubTeam.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

Team_Extension.php

BUG Fix incorrect merge of associative / non-associative summary fields

2017-12-14 14:17:19 +13:00

Team.php

Merge remote-tracking branch 'origin/4.0' into 4

2018-01-22 14:57:05 +13:00

TeamComment.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00

ValidatedObject.php

Apply PSR2 / Namespace to remaining admin / tests

2016-12-19 16:08:19 +13:00