749 Commits

Author	SHA1	Message	Date
Romain Neutron	6d57972c1e	Fix order master selection	2012-04-11 14:44:58 +02:00
Romain Neutron	c3d66f574d	Merge branch 'FixBasketSort' into Dev	2012-04-10 14:09:23 +02:00
Romain Neutron	96080dfd1a	Fix reorder box selection	2012-04-10 14:08:01 +02:00
Romain Neutron	e9a54f6b1f	Merge branch 'FixCSS' into Dev	2012-04-10 11:17:42 +02:00
Romain Neutron	1e71e04214	Fix Css thesaurus links color in lightbox	2012-04-10 11:17:14 +02:00
Nicolas Le Goff	5ac707d708	add tools functionnality	2012-04-05 19:25:16 +02:00
Nicolas Le Goff	3051fb90ad	add tools rewrite rule	2012-04-05 19:22:31 +02:00
Romain Neutron	bda41ccc5d	Remove display errors	2012-04-05 10:01:15 +02:00
Romain Neutron	23ba44e999	Merge branch 'Fix' into Dev	2012-04-04 15:03:13 +02:00
Romain Neutron	1719adadc5	Fix model application	2012-04-04 14:15:18 +02:00
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	c953190ed6	Fix error page	2012-03-30 14:59:38 +02:00
Romain Neutron	9acaf0b211	Use Composer for dependencies instead of git submodules	2012-03-30 13:39:44 +02:00
Romain Neutron	fe75dac089	Cleanup	2012-03-27 15:10:13 +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	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	84c0d2cdf0	Fix unit tests	2012-03-23 17:39:39 +01:00
Romain Neutron	5bd6c9d629	Implements search engine queries	2012-03-23 13:56:10 +01:00
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