21 Commits

Author	SHA1	Message	Date
Romain Neutron	c960ec7b34	Merge branch '3.8'	2013-12-09 19:13:15 +01:00
Romain Neutron	0804d01b4f	Fix ACL binary comparison	2013-12-09 18:39:51 +01:00
Romain Neutron	051d9f4035	Remove license comments	2013-11-20 16:49:29 +01:00
Romain Neutron	7e0a3c7338	Use configuration property accessor	2013-11-18 18:48:27 +01:00
Romain Neutron	56b373ee6e	Use short array declaration	2013-11-18 13:57:33 +01:00
Romain Neutron	13915dc1a8	Rename "phraseanet.configuration" service to "configuration"	2013-11-15 22:08:07 +01:00
Nicolas Le Goff	1fdf30c6af	Use ACL service provider to get user's ACL	2013-11-05 12:21:42 +01:00
Romain Neutron	baecfdceb3	Move entities to Phrasea namespace	2013-10-29 16:56:49 +01:00
Romain Neutron	35e9e692d2	Fix ACL cache issue	2013-10-25 18:47:26 +02:00
Romain Neutron	fafe2dca0f	Fix latest merge	2013-10-25 13:47:35 +02:00
Romain Neutron	762f758705	Merge branch '3.8' ... Conflicts: bower.json lib/Alchemy/Phrasea/Controller/Prod/Feed.php lib/classes/Feed/Entry/Adapter.php lib/classes/Feed/Entry/Item.php lib/classes/eventsmanager/notify/feed.php tests/classes/Feed/Entry/Feed_Entry_ItemTest.php	2013-10-24 14:05:04 +02:00
Romain Neutron	3633c1a926	Fix #1531 : Allow preview access on public feed entry items	2013-10-22 12:44:14 +02:00
Romain Neutron	dbd06e9091	Remove dead code	2013-09-04 12:14:50 +02:00
Romain Neutron	4b5d10151d	Apply time limits on template application	2013-06-14 09:47:30 +02:00
Romain Neutron	32c2d6154a	Remove phraseanet services, update configuration	2013-06-11 14:05:44 +02:00
Romain Neutron	38f38290c8	Fix CS	2013-05-29 21:21:02 +02:00
Romain Neutron	aee8919116	Fix ACLs	2013-05-14 15:13:59 +02:00
Romain Neutron	e6b3bd50ab	Merge branch '3.7'	2013-05-14 15:10:34 +02:00
Romain Neutron	c184278b40	Fix doc blocks	2013-01-29 18:34:50 +01:00
Romain Neutron	842ad40985	Bump copyright year	2013-01-21 23:28:58 +01:00
Romain Neutron	2069d40544	Use composer as application autoloader	2013-01-18 17:47:25 +01:00