1702 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	7716a34523	Updating Silex	2012-01-20 13:05:23 +01:00
Romain Neutron	d2e8893a46	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-20 13:00:17 +01:00
Romain Neutron	72bee22918	Add databox_field vocabularies	2012-01-20 13:00:12 +01:00
Nicolas Le Goff	3bbe23b7f0	fix testRouteCaptionSearchEngine	2012-01-20 12:43:25 +01:00
Nicolas Le Goff	eabcb349ef	delete Basket.php	2012-01-20 12:35:09 +01:00
Nicolas Le Goff	ec7b3837ca	convert numeric characters to int when unserializing json	2012-01-20 12:34:14 +01:00
Nicolas Le Goff	f28d7d3a75	fix testExtract_metadatas	2012-01-20 12:32:27 +01:00
Nicolas Le Goff	64831e19fb	cleanup	2012-01-20 12:32:03 +01:00
Nicolas Le Goff	5662adcd22	rename basket to basketeTest	2012-01-20 12:30:36 +01:00
Nicolas Le Goff	752b5b82f1	exclude boilerplate file	2012-01-20 12:30:19 +01:00
Nicolas Le Goff	878c040d0f	fix add and share list to a user controller	2012-01-20 12:29:33 +01:00
Nicolas Le Goff	31a24d5f73	fix testSet_record_metadatas test	2012-01-20 12:27:45 +01:00
Nicolas Le Goff	2c2a9c4494	add missing parentheses	2012-01-20 12:27:19 +01:00
Nicolas Le Goff	d55516bb29	fix #243 set proper cache according to php cache extensions available	2012-01-19 19:00:48 +01:00
Nicolas Le Goff	15375a4b41	fix #249 missing servername when config.yml is created	2012-01-19 18:56:41 +01:00
Nicolas Le Goff	78d1c046ef	change default environment to prod	2012-01-19 18:54:16 +01:00
Nicolas Le Goff	66db240f0d	check if configuration is installed	2012-01-19 17:57:50 +01:00
Romain Neutron	d462f0b6c4	Use of JS new objects in editing	2012-01-19 17:56:35 +01:00
Romain Neutron	1aadc0956c	Use of JS new objects in editing	2012-01-19 17:54:57 +01:00
Romain Neutron	5b2c53a8d1	Add jquery.Edit.recordField JS in prod	2012-01-19 17:54:26 +01:00
Romain Neutron	51ed30621d	Add jquery.Edit.recordField JS object	2012-01-19 17:54:10 +01:00
Nicolas Le Goff	2b38f37c11	merge	2012-01-19 16:22:06 +01:00
Nicolas Le Goff	2fd53d31a1	get services with new service builder	2012-01-19 16:17:26 +01:00
Nicolas Le Goff	ed90b1fa4d	replace path to test sqlite database with realpath	2012-01-19 16:16:47 +01:00
Nicolas Le Goff	9fc05289a5	get services from new service builder	2012-01-19 16:16:22 +01:00
Nicolas Le Goff	652b20efdd	add cache service	2012-01-19 16:14:58 +01:00
Nicolas Le Goff	17ab05d32d	get service with new service builder	2012-01-19 16:13:40 +01:00
Nicolas Le Goff	2c82b3f142	replace path to sqlite test database with realpath	2012-01-19 16:13:17 +01:00
Nicolas Le Goff	59f48e023a	get services from new builder	2012-01-19 16:12:04 +01:00
Nicolas Le Goff	6b017a91a3	remove ini_set	2012-01-19 16:11:42 +01:00
Nicolas Le Goff	4255a99ebc	handle display_errors, add getCache service method	2012-01-19 16:10:41 +01:00
Nicolas Le Goff	f5e241a25b	remove exit	2012-01-19 16:09:50 +01:00
Nicolas Le Goff	87a97c0a2c	add cache service	2012-01-19 16:09:36 +01:00
Nicolas Le Goff	3ad5dd489d	add dependencies to services constructor	2012-01-19 16:09:03 +01:00
Nicolas Le Goff	843bbbc027	delete old cache service	2012-01-19 16:07:52 +01:00
Nicolas Le Goff	61d93bd03b	rename cache service	2012-01-19 16:06:30 +01:00
Nicolas Le Goff	1a742a826e	add service builder system from configuration file	2012-01-19 16:03:08 +01:00
Nicolas Le Goff	fc65582166	remove service builder	2012-01-19 16:02:02 +01:00
Romain Neutron	0d1cc50632	Merge with master	2012-01-19 12:32:57 +01:00
Romain Neutron	080648e9f4	Updated vendor	2012-01-19 12:24:35 +01:00
Romain Neutron	8b15f3b732	Fix granted bases order	2012-01-19 12:24:09 +01:00
Romain Neutron	c7abf22256	Fix basket use of searchEngine options	2012-01-19 12:08:55 +01:00
Romain Neutron	0ba1d57340	Fix masks on ACL transfer	2012-01-19 10:51:43 +01:00
Romain Neutron	09d092ce83	Fix User Edit	2012-01-19 10:36:28 +01:00
Romain Neutron	0af3396131	Fix Helper Edit	2012-01-19 10:36:10 +01:00
Romain Neutron	cca613e5f4	Removed @cover annotations	2012-01-19 01:03:19 +01:00
Romain Neutron	9d4f7f0b62	Cleanup TearDown	2012-01-18 20:21:39 +01:00
Romain Neutron	fc43b1ae6a	Add datas	2012-01-18 20:16:00 +01:00
Romain Neutron	162ab83513	caption_field refactor	2012-01-18 20:15:35 +01:00
Romain Neutron	0f591c521d	Proper delete of bridge API	2012-01-18 20:06:58 +01:00