Phraseanet

mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00

Files

Mike Ng a08a55b58e Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

# Conflicts:
#	.bowerrc

2018-01-08 16:37:46 +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

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

DataboxController.php

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

DataboxesController.php

PHRAS-508_acl-cache

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

FeedController.php

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

2016-04-20 16:22:14 +02:00

SetupController.php

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