Mike Ng 4f518c605d Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 ...

# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf
#	resources/www/admin/styles/main.scss

2018-01-09 11:00:03 +04:00

..

CollectionController.php

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00

ConnectedUsersController.php

bump copyright year

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

DashboardController.php

Demote Admin users on request

2016-02-09 12:25:28 +01:00

DataboxController.php

Merge branch 'clean-boxes' into merge-clean-boxes

2016-01-06 19:53:43 +01:00

DataboxesController.php

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00

FeedController.php

Merge branch 'clean-boxes' into merge-clean-boxes

2016-01-06 19:53:43 +01:00

FieldsController.php

Merge branch 4.0

2016-12-05 15:26:48 +01:00

PluginsController.php

bump copyright year

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

RootController.php

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00

SearchEngineController.php

porting PHRAS-1578/PHRAS-1579/PHRAS-1621/PHRAS-1675/PHRAS-1404/PHRAS-1336 to 4.1

2018-01-03 15:26:43 +04:00

SetupController.php

Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

2018-01-08 16:37:46 +04:00

SubdefsController.php

resolve conflict

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

TaskManagerController.php

Fix document substitution

2016-11-24 17:21:11 +01:00

UserController.php

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00