Mike Ng 30f49bdd35 resolve conflict

2018-01-08 15:57:13 +04:00

..

AccessRestriction.php

Getting collection calls access_restriction which is not properly cached.

2016-01-27 18:55:49 +01:00

Compiler.php

bump copyright year

2016-01-05 13:38:14 +01:00

Configuration.php

PHRAS-1289 Add group rights to compiled configuration

2016-12-06 15:01:12 +01:00

ConfigurationInterface.php

bump copyright year

2016-01-05 13:38:14 +01:00

DisplaySettingService.php

PORT PHRAS-1559 and PHRAS-1560 to 4.1

2017-12-13 10:26:24 +04:00

HostConfiguration.php

Add access restriction

2014-02-25 19:00:53 +01:00

PropertyAccess.php

Bump copyright year

2014-01-06 15:40:56 +01:00

RegistrationManager.php

Refactor && Typo && Use plain objects as function parameters instead of ids

2014-02-26 12:10:54 +01:00

RegistryFormManipulator.php

Porting custom-links to 4.1

2017-12-11 17:44:55 +04:00

RegistryManipulator.php

Refactor setup controller and registry manipulator

2016-11-25 14:03:01 +01:00

SessionHandlerFactory.php

PHRAS-1236 Add native session handler config option

2016-10-13 14:29:23 +02:00

StructureTemplate.php

resolve conflict

2018-01-08 15:57:13 +04:00