1184 Commits

Author	SHA1	Message	Date
Nicolas Le Goff	97454bd1fd	removed memcached as available adapter	2012-02-08 11:45:48 +01:00
Nicolas Le Goff	39e193943e	removed check for memcached extension	2012-02-08 11:44:59 +01:00
Romain Neutron	c52b77835a	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-02-08 11:24:46 +01:00
Romain Neutron	789990d019	updated vendors	2012-02-08 11:24:10 +01:00
Nicolas Le Goff	de7e4be1aa	remove memcached Support	2012-02-08 11:00:40 +01:00
Nicolas Le Goff	a4894e8497	add support for redis cache	2012-02-08 11:00:08 +01:00
Nicolas Le Goff	c0953a9b7d	fix unitTests	2012-02-08 10:59:49 +01:00
Nicolas Le Goff	3d357a04b0	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-08 10:48:55 +01:00
Romain Neutron	783804b8db	updated vendors	2012-02-08 10:42:02 +01:00
Nicolas Le Goff	2dbf155170	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-07 20:09:21 +01:00
Romain Neutron	b16f5d63ab	Fix ACL	2012-02-07 19:54:59 +01:00
Nicolas Le Goff	956270e46d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-07 19:49:29 +01:00
Nicolas Le Goff	23d209c16d	remove Configuration\Parameter object	2012-02-07 19:46:27 +01:00
Romain Neutron	b0c2c098fe	Merge with master	2012-02-07 19:46:23 +01:00
Nicolas Le Goff	0822f29536	add cached autoloading system where environment is not on debug mode	2012-02-07 19:45:55 +01:00
Romain Neutron	d3eee39ddd	Fix bug cache replication	2012-02-07 19:43:44 +01:00
Romain Neutron	26a1e3b916	Revert bad merge	2012-02-07 18:02:23 +01:00
Romain Neutron	d475e00cfa	Merge with master	2012-02-07 17:47:39 +01:00
Romain Neutron	fb2b423cd8	Fix #320	2012-02-07 17:24:52 +01:00
Romain Neutron	d0642b40ce	Fix #319	2012-02-07 17:02:38 +01:00
Romain Neutron	dfa39b8f1e	Fix bugs	2012-02-07 16:54:19 +01:00
Romain Neutron	5b28333da5	Merge with master	2012-02-07 14:51:36 +01:00
Romain Neutron	07d79f758b	Merge with master	2012-02-07 14:30:00 +01:00
Romain Neutron	3f9cf2c7a0	Fix autoregister	2012-02-07 13:25:22 +01:00
Nicolas Le Goff	1f6f81ee93	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-07 12:01:45 +01:00
Romain Neutron	a3dc2062ee	Coding standards	2012-02-06 13:25:06 +01:00
Nicolas Le Goff	1b02fedad8	add special char verification in sudef creation process	2012-02-06 12:37:09 +01:00
Romain Neutron	7ba0a6cf3a	Removes PHPUnit annotations	2012-02-06 12:25:00 +01:00
Nicolas Le Goff	47d2c433cd	fix build & add loader classes	2012-02-03 18:42:33 +01:00
Nicolas Le Goff	631c48804c	change redirect access_user from index.php to /	2012-02-03 16:14:33 +01:00
Nicolas Le Goff	90e8004fb8	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-03 16:11:06 +01:00
Nicolas Le Goff	f7cb1688c7	Change redirection from index.php to /	2012-02-03 16:10:55 +01:00
Nicolas Le Goff	683fb4cd4e	Moved gatekeeper from core to bootstrap	2012-02-03 16:10:32 +01:00
Romain Neutron	bedb6fc181	Add language	2012-02-03 15:46:32 +01:00
Nicolas Le Goff	6a437a3831	fix #312 subdef structure for a preview is duplicate	2012-02-03 15:32:52 +01:00
Romain Neutron	3e0ddf5e13	Use of new push icons	2012-02-03 13:00:09 +01:00
Romain Neutron	03988283b3	Fix #299	2012-02-02 19:58:46 +01:00
Romain Neutron	548ddc14e5	Fix build	2012-02-02 19:02:08 +01:00
Romain Neutron	0c8a7ac84e	Removed console.log	2012-02-02 16:31:31 +01:00
Romain Neutron	203770fdee	Fix typo	2012-02-02 16:27:44 +01:00
Romain Neutron	97bf29a5f2	Fix language detection	2012-02-02 16:19:27 +01:00
Romain Neutron	6935f1ac6e	Cleaning version	2012-02-02 15:56:33 +01:00
Romain Neutron	a9c7ed23cb	Coding standards	2012-02-02 15:43:12 +01:00
Romain Neutron	b3b53372c0	Push cleanup	2012-02-02 15:25:22 +01:00
Romain Neutron	8f52f9a6b2	Push & Feedback templates	2012-02-02 15:23:31 +01:00
Romain Neutron	9135de65cf	Push & Feedback templates	2012-02-02 15:21:51 +01:00
Romain Neutron	5439b3450c	Added User_Query::get_total_page method and various paramaters for query ( Activity/Templates/Position/Country/Company)	2012-02-02 11:29:45 +01:00
Romain Neutron	41e32e72bd	Code formatting	2012-02-02 11:28:14 +01:00
Romain Neutron	a332aebe68	Fix build	2012-01-31 23:33:33 +01:00
Romain Neutron	0f28f12fe7	Merge	2012-01-31 23:04:28 +01:00