1938 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Nicolas Le Goff	6538cc279f	change to new interface	2012-03-15 15:14:55 +01:00
Romain Neutron	b693ea1331	Fix Gray Theme	2012-03-15 15:14:11 +01:00
Romain Neutron	cdf4a33c45	Fix use of events manager	2012-03-15 14:55:36 +01:00
Romain Neutron	990e33e6ce	Remove cache service	2012-03-15 14:40:10 +01:00
Romain Neutron	c6aad35bef	Cleanup	2012-03-15 14:39:30 +01:00
Romain Neutron	0d996d6105	Code Cleanup	2012-03-15 14:37:40 +01:00
Romain Neutron	a11846cabe	Coding Standards	2012-03-15 14:36:56 +01:00
Romain Neutron	a917934595	Cleanup	2012-03-15 14:36:32 +01:00
Romain Neutron	08ac6d881b	Remove unused autoload	2012-03-15 14:35:16 +01:00
Romain Neutron	78db649450	Coding Standards	2012-03-15 14:13:38 +01:00
Romain Neutron	d856b7b380	Cleanup	2012-03-15 14:13:11 +01:00
Romain Neutron	d0ff7cd102	Enhanced user queries	2012-03-15 14:02:19 +01:00
Nicolas Le Goff	aace1a0847	add check for binary	2012-03-13 14:58:08 +01:00
Nicolas Le Goff	d2e2b6d35c	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-13 14:48:49 +01:00
Nicolas Le Goff	85292715de	fix appbox::get_instance issue	2012-03-13 14:47:43 +01:00
Romain Neutron	871a3511ec	Add multiple word queries for users	2012-03-13 12:39:54 +01:00
Romain Neutron	8e64da10e4	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-13 12:01:53 +01:00
Romain Neutron	037b7985fe	Merge with master	2012-03-13 12:01:21 +01:00
Romain Neutron	fc4e1b3d91	Fix add in basket	2012-03-13 11:44:25 +01:00
Romain Neutron	90633ee61f	Fix add in basket	2012-03-13 11:41:57 +01:00
Nicolas Le Goff	95d25f8aec	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-12 18:43:02 +01:00
Nicolas Le Goff	f4249bda0b	fix css issue	2012-03-12 18:42:50 +01:00
Romain Neutron	b84ad68a20	Coding standards	2012-03-12 18:24:49 +01:00
Romain Neutron	b83f83dd92	Add reminder	2012-03-12 18:23:44 +01:00
Nicolas Le Goff	bea7e4a371	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-12 18:15:21 +01:00
Romain Neutron	ea3ff89416	Fix mobile app	2012-03-12 18:14:12 +01:00