3336 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	9e640c27cf	Switch PHPMailer, MoovRelocator, Zend Gdata, TCPDF, Oauth2, PhlickR, PHPShortener from git submodules to Composer	2012-03-30 20:13:40 +02:00
Nicolas Le Goff	f835ea84e8	Merge branch 'Fix36' into Dev	2012-03-30 15:19:25 +02:00
Romain Neutron	01c84dd020	Merge branch 'Fix36' into Dev	2012-03-30 15:17:19 +02:00
Romain Neutron	36bf05dd4b	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-03-30 15:17:11 +02:00
Romain Neutron	0b87655456	Add label to checkboxes	2012-03-30 15:16:46 +02:00
Nicolas Le Goff	9bb9e93052	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-03-30 15:06:14 +02:00
Nicolas Le Goff	c953190ed6	Fix error page	2012-03-30 14:59:38 +02:00
Nicolas Le Goff	2783790b8f	Remove upload access when useless	2012-03-30 14:58:43 +02:00
Romain Neutron	cc554909c0	Merge 3.6 fixes	2012-03-30 14:52:43 +02:00
Romain Neutron	0594b5135e	Fix push user add box	2012-03-30 14:49:13 +02:00
Romain Neutron	bcd970e434	Default period is 10 seconds	2012-03-30 14:37:09 +02:00
Romain Neutron	46f1dba42a	Default period is 10 seconds	2012-03-30 14:34:40 +02:00
Romain Neutron	e7df74ebfe	Use Composer for dependencies instead of git submodules	2012-03-30 13:51:28 +02:00
Romain Neutron	30df661cb8	Fix unit tests	2012-03-30 13:46:08 +02:00
Romain Neutron	14cb8dcc41	Remove useless variable declaration	2012-03-30 13:44:48 +02:00
Romain Neutron	e3af882050	Fix templates using business fields	2012-03-30 13:44:19 +02:00
Romain Neutron	361ef0d9ff	Fix typo	2012-03-30 13:43:50 +02:00
Romain Neutron	5d45635747	Remove Unused $app['debug']	2012-03-30 13:43:31 +02:00
Romain Neutron	fb02cbb684	Use Composer for dependencies instead of git submodules	2012-03-30 13:40:23 +02:00
Romain Neutron	9acaf0b211	Use Composer for dependencies instead of git submodules	2012-03-30 13:39:44 +02:00
Romain Neutron	c9ff84c345	Fix unit tests	2012-03-30 13:34:42 +02:00
Romain Neutron	1b1e0627ed	Fix Apc cache unit tests	2012-03-30 13:32:46 +02:00
Romain Neutron	575f37ea38	Migrate to Doctrine Data-Fixtures 2.2	2012-03-30 13:32:14 +02:00
Romain Neutron	2bb663c096	Merge branch 'FixPermalinks' into Dev	2012-03-27 18:56:06 +02:00
Romain Neutron	64b80b5d45	Fix token renewal on subdefinitions re-creation	2012-03-27 18:55:15 +02:00
Romain Neutron	fd3d46ddcd	Merge branch 'FixExtension' into Dev	2012-03-27 15:21:37 +02:00
Romain Neutron	dfe6a75846	Fix extension parameters load	2012-03-27 15:17:54 +02:00
Romain Neutron	fe75dac089	Cleanup	2012-03-27 15:10:13 +02:00
Romain Neutron	87ad76fc02	Fix check extension for businessfields	2012-03-27 15:09:53 +02:00
Romain Neutron	e5ffd6fa57	Merge branch 'FixTasks' into Dev	2012-03-27 14:44:09 +02:00
Romain Neutron	5427d334c3	Fix tasks for 3.6+	2012-03-27 14:43:05 +02:00
Romain Neutron	e11ac4275e	Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into Dev	2012-03-27 13:39:53 +02:00
Romain Neutron	a2554577f7	Merge pgrade scripts	2012-03-27 13:39:12 +02:00
Romain Neutron	5b0963e5f2	Fix upgrade scripts for large volumes	2012-03-27 13:35:07 +02:00
jygaulier	8d504605e6	fix : business fields were not serialized in xml	2012-03-26 17:19:54 +02:00
jygaulier	3a3ae5dc1c	Merge branch 'BusinessFields' into Dev	2012-03-26 16:41:59 +02:00
jygaulier	fa3d131432	test extension	2012-03-26 16:40:38 +02:00
Romain Neutron	c0dfe1657b	Merge branch 'BusinessFields' into Dev	2012-03-26 14:21:16 +02:00
Romain Neutron	938cd9276d	Merge branch 'master' into Dev	2012-03-26 14:20:52 +02:00
Romain Neutron	5acfdf0f3c	Merge with 3.5	2012-03-26 14:12:52 +02:00
Romain Neutron	85f32e4e23	Add check on Video icon on video thumbnail	2012-03-26 13:57:50 +02:00
Romain Neutron	5478e668d8	Add correct Exit status	2012-03-26 13:57:30 +02:00
Romain Neutron	f85d159ea0	Add correct Exit status	2012-03-26 13:48:06 +02:00
Romain Neutron	b35ece6eab	Remove metadata key	2012-03-26 13:31:27 +02:00
Romain Neutron	05b0e4ede5	Fix console	2012-03-26 13:02:16 +02:00
Romain Neutron	4d6cad987b	Fix patches	2012-03-26 13:02:02 +02:00
Romain Neutron	1189cece49	Merge with master	2012-03-23 17:43:51 +01:00
Romain Neutron	c7632846bb	Fix Error loading	2012-03-23 17:41:24 +01:00
Romain Neutron	a9ea620875	Fix DQL syntax	2012-03-23 17:41:01 +01:00
Romain Neutron	84c0d2cdf0	Fix unit tests	2012-03-23 17:39:39 +01:00