920 Commits

Author	SHA1	Message	Date
Romain Neutron	adc74dc1d8	Add curly braces	2012-04-26 02:00:18 +02:00
Romain Neutron	33b10d6746	Add curly braces	2012-04-26 01:55:12 +02:00
Romain Neutron	ade22295ad	Fix CS	2012-04-26 00:55:53 +02:00
Romain Neutron	dd994a9bd6	Fix CS	2012-04-25 17:38:49 +02:00
Nicolas Le Goff	c201ad301a	add api/ route which provide informations on supported api versions	2012-04-24 17:47:04 +02:00
Nicolas Le Goff	04c6b93775	add rewrite rules	2012-04-24 17:43:15 +02:00
Nicolas Le Goff	66ca3c96c4	add missing bootstrap for API application	2012-04-24 14:25:49 +02:00
Romain Neutron	6a4708bee5	Add debug line	2012-04-20 11:13:13 +02:00
Romain Neutron	c5859e25eb	Merge branch 'Fix' into Dev	2012-04-20 10:58:35 +02:00
Romain Neutron	01af439f3a	Fix webkit selection	2012-04-20 10:57:21 +02:00
Romain Neutron	332d67069d	3.7 routes	2012-04-17 13:41:14 +02:00
Romain Neutron	8b03568108	Fix installer	2012-04-13 17:45:09 +02:00
Nicolas Le Goff	527b3639b5	implements oauth2.0 v9.0 Resource Owner Basic Credentials	2012-04-13 15:44:39 +02:00
Nicolas Le Goff	e513a75d86	delete chgthumb, newimg, rotate, img function, chgdocument files	2012-04-12 17:50:13 +02:00
Nicolas Le Goff	f49f816e48	Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into tools_refactor	2012-04-12 17:39:27 +02:00
Nicolas Le Goff	1783e46f8e	add thumb extractor css	2012-04-12 17:31:38 +02:00
Nicolas Le Goff	4365f1ef27	add thumb extractor icons	2012-04-12 17:31:15 +02:00
Nicolas Le Goff	de6c492c4f	add thumb extractor library	2012-04-12 17:30:46 +02:00
Nicolas Le Goff	d6558b33ba	add pixastic and thumbExtractor to prod application	2012-04-12 17:30:33 +02:00
Nicolas Le Goff	09a6a2ee3c	add pixastic js library	2012-04-12 17:29:39 +02:00
Romain Neutron	45a4af8f1b	Merge branch 'FixServerName' into Dev	2012-04-11 14:58:17 +02:00
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