2632 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	c50118007d	Fix config check	2012-02-27 15:33:12 +01:00
Romain Neutron	59a04e363f	Reformat basket cache key	2012-02-27 15:32:46 +01:00
Romain Neutron	f617cd5377	Fix cache insta nciation	2012-02-27 15:31:42 +01:00
Nicolas Le Goff	930c582501	fix cache issue	2012-02-24 20:16:50 +01:00
Nicolas Le Goff	f22219f83c	fix some testes	2012-02-24 20:16:31 +01:00
Romain Neutron	ba61356541	Event initialization is done after core initialization	2012-02-24 12:08:30 +01:00
Romain Neutron	d8a5df1c49	Fix usr_id	2012-02-24 12:07:56 +01:00
Romain Neutron	a9562e3d58	Add tooltip in basket browser	2012-02-24 10:59:49 +01:00
Romain Neutron	0c30545fb8	Fix reg image definition	2012-02-24 10:51:20 +01:00
Romain Neutron	42fe4894ab	Fix typo	2012-02-24 10:47:17 +01:00
Romain Neutron	2f3ea21b99	Close edit window after editing	2012-02-24 10:42:40 +01:00
Romain Neutron	4d01c23b63	Merge branch 'HotFix' into 3.6	2012-02-23 19:01:51 +01:00
Romain Neutron	584b3cc4b2	Fix meta writing	2012-02-23 19:01:22 +01:00
Romain Neutron	ce050ca16f	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 19:00:01 +01:00
Romain Neutron	1adc885155	Fix installer	2012-02-23 18:59:45 +01:00
Ysolyne Gresille	ec52bf511e	Graphic integration oauth (corrections)	2012-02-23 18:52:22 +01:00
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