978 Commits

Author	SHA1	Message	Date
jygaulier	39c3f97460	Merge branch 'BusinessFields' of github.com:alchemy-fr/Phraseanet into BusinessFields	2012-03-22 19:54:06 +01:00
Romain Neutron	815a15fe5e	Add businessfields option to FTP	2012-03-22 18:26:20 +01:00
Romain Neutron	62caa5e10a	Implements BusinessFields in export	2012-03-22 16:38:35 +01:00
Romain Neutron	e378d1f541	Fix image alignment	2012-03-22 15:50:21 +01:00
Romain Neutron	b7bd0c4650	Fix image alignment	2012-03-22 15:49:35 +01:00
jygaulier	3d53ef9f23	allow search on business fields (last parm of phrasea_query2 = TRUE)	2012-03-21 20:31:33 +01:00
Romain Neutron	8ecdff40e5	Remove debug	2012-03-21 17:17:10 +01:00
Romain Neutron	7a82a72e30	Cleanup after merge	2012-03-20 21:29:52 +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
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
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	00ca39126a	add reset user rights from admin panel	2012-03-16 20:08:41 +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	128fcabeae	Merge branch 'FixGray' into 3.6	2012-03-15 15:14:58 +01:00
Romain Neutron	b693ea1331	Fix Gray Theme	2012-03-15 15:14:11 +01:00
Romain Neutron	08ac6d881b	Remove unused autoload	2012-03-15 14:35:16 +01:00
Romain Neutron	037b7985fe	Merge with master	2012-03-13 12:01:21 +01:00
Romain Neutron	90633ee61f	Fix add in basket	2012-03-13 11:41:57 +01:00
Romain Neutron	7a0495caf3	Merge with 3.6	2012-03-12 18:40:21 +01:00
Romain Neutron	f7cc2702e2	Add notifications to feed entries	2012-03-09 15:59:04 +01:00
Romain Neutron	d79c13f8c2	Refactor random::TYPE_* Constants	2012-03-09 15:12:23 +01:00
Romain Neutron	8761e04eda	Add notifications to feed publications	2012-03-09 15:07:18 +01:00
Romain Neutron	82d9eeef7b	Coding standards	2012-03-09 12:49:13 +01:00
Romain Neutron	e3429ec5f6	Update proposition	2012-03-09 11:50:23 +01:00
Romain Neutron	394a40f01e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-09 00:33:43 +01:00
Romain Neutron	2c5fab4da7	Fix presentation	2012-03-09 00:32:53 +01:00
Ysolyne Gresille	92b7798ea6	graphic integration Oauth Pages (correction for devices)	2012-03-08 17:35:48 +01:00
Ysolyne Gresille	429a1bef9b	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 17:27:47 +01:00
Romain Neutron	f8d71a9bca	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 14:35:22 +01:00
Romain Neutron	9a0422d6bb	Fix locales	2012-03-08 14:34:28 +01:00
Ysolyne Gresille	08c48e633d	CSS Oauth pages corrected	2012-03-08 13:23:22 +01:00
Nicolas Le Goff	e8237e2e7d	fix thumb title overflow in browser	2012-03-08 13:01:05 +01:00
Nicolas Le Goff	ba0df0d633	fix ie7 toolbar css issue	2012-03-07 18:34:18 +01:00
Nicolas Le Goff	41df16f924	fix FrameC icon menu ie css issue	2012-03-07 17:07:50 +01:00
Nicolas Le Goff	77bd5fd263	fix IE css alignment issue on prod toolbar button	2012-03-07 15:58:52 +01:00
jygaulier	8bd291f569	Merge with master	2012-03-07 11:22:08 +01:00
jygaulier	8c767d28c7	New scheduler	2012-03-07 11:08:54 +01:00
Romain Neutron	700eec5c28	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-06 18:55:55 +01:00
Romain Neutron	81ae791671	Add default zoning	2012-03-06 18:37:14 +01:00
Nicolas Le Goff	cac45f65d3	enhance push front	2012-03-06 18:34:30 +01:00
Nicolas Le Goff	1445d624aa	fix unshare list	2012-03-06 17:45:28 +01:00
Nicolas Le Goff	d78fd6272e	add title to adduser dialogbox	2012-03-06 17:09:32 +01:00
Nicolas Le Goff	c85e27f9b6	fix css push issue enhance css UserAdd template	2012-03-06 16:58:20 +01:00
Nicolas Le Goff	d9893e00c3	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-06 16:31:23 +01:00
Nicolas Le Goff	a394206bd1	fix #469 Amélioration sur l'ecran principale de la fenetre de liste	2012-03-06 16:30:25 +01:00
Romain Neutron	c487a6ad62	Fix resize	2012-03-06 16:13:12 +01:00