2716 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ysolyne Gresille	160f9ff986	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 18:50:33 +01:00
Romain Neutron	54515c0c94	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 18:13:00 +01:00
Romain Neutron	cf7eade5b1	Cleanup	2012-02-23 17:55:41 +01:00
Romain Neutron	8344077fd4	Upgrade Baskets patches	2012-02-23 17:55:25 +01:00
Romain Neutron	f0f0a52d28	Fix patches	2012-02-23 17:54:54 +01:00
Romain Neutron	5d908f7ac4	Fix Upgrade script	2012-02-23 17:54:27 +01:00
Romain Neutron	01f2ef028a	Add Binary MySQL type to doctrine for parsing old Phrasea Tables	2012-02-23 17:54:10 +01:00
Nicolas Le Goff	1ea745e297	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 15:36:05 +01:00
Nicolas Le Goff	634de85b37	fix report title	2012-02-23 15:34:25 +01:00
Romain Neutron	a5d0e3ec42	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 15:16:44 +01:00
Romain Neutron	6a1ff85c29	Refactor Upgrade	2012-02-23 15:15:03 +01:00
Nicolas Le Goff	14f8762fcf	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 15:10:32 +01:00
Nicolas Le Goff	6ca77f84ee	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-02-23 15:08:50 +01:00
Romain Neutron	debfd6f7cc	Fix lightbox report	2012-02-23 15:08:10 +01:00
Nicolas Le Goff	079dd80e14	fix image scroll & image display	2012-02-23 15:08:09 +01:00
Romain Neutron	c29dcd94e7	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 14:54:26 +01:00
Romain Neutron	906a26d11d	Fix Basket/Story sorting	2012-02-23 14:47:56 +01:00
Nicolas Le Goff	db1a77e877	replace player-scroll	2012-02-23 14:35:57 +01:00
Nicolas Le Goff	fbaefaf43c	project properties	2012-02-23 14:25:55 +01:00
Nicolas Le Goff	36ccf5dbd2	add ImageScroll flash src	2012-02-23 14:06:35 +01:00
Nicolas Le Goff	5b3eba0d97	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 12:47:17 +01:00
Nicolas Le Goff	bfbc51c5d2	replace player_homelink	2012-02-23 12:45:24 +01:00
Nicolas Le Goff	c6b1bea610	add scrollx1 flash src & add flash file to builder	2012-02-23 12:43:42 +01:00
Romain Neutron	1f578810f8	Fix basket download	2012-02-23 11:33:55 +01:00
Romain Neutron	242af334bd	Fix feedback initiator can not agree	2012-02-23 10:37:59 +01:00
Romain Neutron	9bd67a5361	Refactor Phrasea::start	2012-02-23 10:29:19 +01:00
Romain Neutron	157a6b51ff	Upgrade console commands	2012-02-23 10:28:10 +01:00
Romain Neutron	d1412de7ea	Refactor Configuration	2012-02-22 18:38:59 +01:00
Romain Neutron	0dcfec55c8	Refactor Configuration	2012-02-22 18:06:58 +01:00
Romain Neutron	25c78669f8	Refactor Configuration	2012-02-22 18:06:09 +01:00
Romain Neutron	aa9d5171b0	Refactor Configuration	2012-02-22 18:05:35 +01:00
Romain Neutron	ecc8feb143	Fix Bug services sample	2012-02-22 18:04:44 +01:00
Romain Neutron	e3df263373	Upgrade Configuration	2012-02-22 18:04:28 +01:00
Romain Neutron	6c16b90e30	Fix build	2012-02-22 17:15:13 +01:00
Nicolas Le Goff	e1bfdb0bb3	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-22 16:58:00 +01:00
Nicolas Le Goff	33b225a290	fix oauth app creation bug	2012-02-22 16:55:50 +01:00
Romain Neutron	98b944cdf2	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-22 12:39:37 +01:00
Romain Neutron	8c840091d7	Merge branch 'HotFixCache' into 3.6	2012-02-22 12:39:17 +01:00
Romain Neutron	2cb18c5d78	Download elements without watermark when pushed	2012-02-22 12:22:50 +01:00
Romain Neutron	dc1ec6df7d	Fix cache asynchro	2012-02-22 12:18:30 +01:00
Ysolyne Gresille	c42e92d7f3	Graphic integration oauth correction	2012-02-22 11:58:24 +01:00
Ysolyne Gresille	775420def8	graphic integration oauth correction	2012-02-22 11:53:31 +01:00
Romain Neutron	991a43fcd5	Enhanced EnsureProductionSettings	2012-02-22 11:43:20 +01:00
Romain Neutron	1fce095244	Cleanup	2012-02-22 11:42:52 +01:00
Ysolyne Gresille	a08f072315	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-22 11:24:24 +01:00
Ysolyne Gresille	df4879bdb5	Move exception in / Scope	2012-02-22 11:24:07 +01:00
Ysolyne Gresille	21c18422f7	Add DS_Store to gitignore	2012-02-22 11:23:10 +01:00
Ysolyne Gresille	0d2c65b7de	graphic integration oauth	2012-02-22 11:22:04 +01:00
Ysolyne Gresille	59ff33c6e3	add html5 tools	2012-02-22 11:21:23 +01:00
Nicolas Le Goff	35d6d86756	fix namespace bug	2012-02-22 11:18:54 +01:00