2632 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	d1a5824c19	Merge	2012-03-20 15:53:08 +01:00
Romain Neutron	ffa2ba233e	Merge	2012-03-20 15:52:36 +01:00
Romain Neutron	ad320e2193	Remove cache pseudo optimisation	2012-03-20 15:51:14 +01:00
Romain Neutron	5ed518e423	Fix upgrade	2012-03-20 15:45:32 +01:00
Romain Neutron	9bce2cf3a5	Refactor caption serialization	2012-03-20 15:44:32 +01:00
Romain Neutron	583ee314b4	Refactor caption serialization	2012-03-20 15:42:59 +01:00
Romain Neutron	a10fb04999	Remove report::getChamp	2012-03-20 14:50:36 +01:00
Romain Neutron	4c7f3897bf	Fix build	2012-03-20 13:40:00 +01:00
Romain Neutron	fa20b6abcb	Fix typo	2012-03-20 12:12:15 +01:00
Romain Neutron	d4e6a716d9	Fix typo	2012-03-20 12:11:10 +01:00
Romain Neutron	431966aec3	Fix upgrade process	2012-03-20 12:08:38 +01:00
Romain Neutron	cab124c838	Fix upgrade process	2012-03-20 12:05:36 +01:00
Romain Neutron	5390f8be8a	Merge branch 'HotFix' into Dev	2012-03-19 20:30:07 +01:00
Romain Neutron	60ef5f3f60	Fix upgrade	2012-03-19 20:29:28 +01:00
Romain Neutron	3e8719b947	Bump to 3.7.x series	2012-03-19 19:37:33 +01:00
Romain Neutron	a49157b7d6	Fix build	2012-03-19 19:36:07 +01:00
Romain Neutron	8f261f3e8e	Update vendors	2012-03-19 19:20:53 +01:00
Romain Neutron	7208f4e92e	Merge branch 'scheduler2' into Dev	2012-03-19 19:15:01 +01:00
Romain Neutron	e286c84eb1	Merge with Scheduler 2 branch	2012-03-19 19:14:10 +01:00
Romain Neutron	0c47f9229c	Merge branch 'Doctrine2.2' into Dev	2012-03-19 19:06:03 +01:00
Romain Neutron	fa698fbdda	Coding Standards	2012-03-19 19:04:48 +01:00
Romain Neutron	f8ad7136cf	Bump to version 3.6.0	2012-03-19 19:02:36 +01:00
Romain Neutron	efe4df1c0e	Upgrade vendors	2012-03-19 18:52:04 +01:00
Romain Neutron	0a6ab13d8c	Merge with 3.6	2012-03-19 18:41:03 +01:00
Romain Neutron	14c4853789	Bump to version 3.5.14 3.5.14	2012-03-19 18:28:43 +01:00
Romain Neutron	79889eba2b	Upgrade locales	2012-03-19 18:08:28 +01:00
Romain Neutron	f9f973e04a	Upgrade locales	2012-03-19 18:06:23 +01:00
Romain Neutron	4a02e5a20d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-19 17:05:11 +01:00
Nicolas Le Goff	e20999015c	Fix validation basketelements sorting	2012-03-19 17:03:05 +01:00
Nicolas Le Goff	5393b487da	Add virtual event	2012-03-19 16:21:40 +01:00
Romain Neutron	73f1de710d	Fix referesh message	2012-03-19 15:34:49 +01:00
Romain Neutron	3f66ce38cc	Fix validation visibility	2012-03-19 15:29:52 +01:00
Romain Neutron	87cb0b2299	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-19 13:40:34 +01:00
Romain Neutron	2ae33de7e9	Replace https links by http links	2012-03-19 13:37:41 +01:00
Romain Neutron	6463b6e66d	Vocabulary control can be applied only to monovalued fields	2012-03-19 13:34:47 +01:00
Nicolas Le Goff	2e63634867	fix #546 L'icone des propositions indique des "propositions" suite a un changement de page	2012-03-19 13:31:09 +01:00
Nicolas Le Goff	0b14d9584f	#fix 547 mails d'information de reception d'une commande pas envoyé	2012-03-19 12:02:57 +01:00
Nicolas Le Goff	5a300242c4	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-16 20:09:18 +01:00
Nicolas Le Goff	00ca39126a	add reset user rights from admin panel	2012-03-16 20:08:41 +01:00
Romain Neutron	18b0d24c20	Rollback	2012-03-15 18:30:36 +01:00
Romain Neutron	c682155b68	Fix fields	2012-03-15 18:05:21 +01:00
Nicolas Le Goff	8b6bf7cff2	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-15 16:44:01 +01:00
Nicolas Le Goff	bb634bb31d	fix build	2012-03-15 16:43:36 +01:00
Nicolas Le Goff	5557d8b8b7	refactor service interface	2012-03-15 16:43:23 +01:00
Romain Neutron	196b8b17ef	Merge branch 'FixStamp' into 3.6	2012-03-15 15:33:19 +01:00
Romain Neutron	d60c3ec5b0	Fix Stamp	2012-03-15 15:32:38 +01:00
Romain Neutron	d654525e81	Fix Stamp	2012-03-15 15:30:14 +01:00
Romain Neutron	ca2bcda6cc	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-15 15:15:13 +01:00
Nicolas Le Goff	7aac757a3c	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-15 15:15:00 +01:00
Romain Neutron	128fcabeae	Merge branch 'FixGray' into 3.6	2012-03-15 15:14:58 +01:00