1278 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolas Le Goff	4aee5923e2	fix schema	2012-01-04 18:13:11 +01:00
Romain Neutron	3e2ec0d385	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 18:08:44 +01:00
Romain Neutron	b1710cabb6	Merge branch 'regs' into 3.6	2012-01-04 18:08:33 +01:00
Romain Neutron	ec78866557	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 18:07:53 +01:00
Romain Neutron	d04ba1e76c	Add exception verbosity	2012-01-04 18:05:40 +01:00
Romain Neutron	9835fa1ff7	Fix #155 : wrong stories caption	2012-01-04 18:03:38 +01:00
Romain Neutron	7abb602f9a	Fix #156 : editing presets does not contain meta_struct_ids	2012-01-04 18:02:29 +01:00
Nicolas Le Goff	0688a9f58a	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 17:55:16 +01:00
Nicolas Le Goff	c7d0d78658	fix creation schema error on install	2012-01-04 17:54:50 +01:00
Nicolas Le Goff	0ebb8b0908	merge	2012-01-04 17:04:15 +01:00
Nicolas Le Goff	544e55bd32	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 16:57:48 +01:00
Nicolas Le Goff	06f539e7d5	fix install with no databox & trans string	2012-01-04 16:54:23 +01:00
Romain Neutron	30e4b37888	Merge with master	2012-01-04 16:24:47 +01:00
Romain Neutron	4159aeb720	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 16:19:45 +01:00
Romain Neutron	4535c35e9a	Fix Bug : some rights applied to templates are wrong	2012-01-04 15:40:28 +01:00
Nicolas Le Goff	bf840a8c04	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 15:20:05 +01:00
Nicolas Le Goff	6720192ba0	Merge branch 'fix_report' into 3.6	2012-01-04 15:18:47 +01:00
Nicolas Le Goff	b321d1540e	fix #153 No display of thumbs in report	2012-01-04 15:15:47 +01:00
Romain Neutron	d4250bcae8	Fix #150 : missing notifications when receiving a validation	2012-01-04 15:15:38 +01:00
Romain Neutron	0d49d731d4	Fix #149 : wrong string about the validation process	2012-01-04 14:56:14 +01:00
Romain Neutron	a4af0988ab	Fix #152 : link in emails should be crypted	2012-01-04 14:50:59 +01:00
Nicolas Le Goff	52b3f8a2a8	replace bas_manage to manage for user's rights	2012-01-04 14:40:10 +01:00
Nicolas Le Goff	e902fa9728	add setup::needUpgradeConfigurationFile methode	2012-01-04 14:38:58 +01:00
Romain Neutron	dd40dcdf97	Fix #154 : short history of record are missing authors of actions	2012-01-04 14:38:54 +01:00
Nicolas Le Goff	403fa93fd7	add doctrine schema creation on install process	2012-01-04 14:38:14 +01:00
Nicolas Le Goff	caff1bce62	add config file upgrade process	2012-01-04 14:36:15 +01:00
Romain Neutron	1f4562cb44	Fix Bug cache #147 & #151	2012-01-04 12:58:12 +01:00
Romain Neutron	7c8c25e325	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 12:36:57 +01:00
Romain Neutron	793b282c7b	Some doc	2012-01-04 12:32:32 +01:00
Romain Neutron	40325cdf19	Implementation finished	2012-01-04 12:32:15 +01:00
Romain Neutron	c667799805	Doctrine UsrLists Entities	2012-01-04 12:31:51 +01:00
Romain Neutron	394eff2c7d	Doctrine UsrLists Entities	2012-01-04 12:31:35 +01:00
Nicolas Le Goff	f75e361df2	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 12:14:14 +01:00
Romain Neutron	a81b6aade9	Fix JS Build	2012-01-04 11:41:58 +01:00
Nicolas Le Goff	5fbdde14b7	modfy sample	2012-01-04 11:19:04 +01:00
Romain Neutron	6cf3276af5	Fix JS Build	2012-01-04 11:15:05 +01:00
Romain Neutron	1c7c5ce701	Fix JS Build	2012-01-04 11:00:44 +01:00
Romain Neutron	39ef843a5d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 10:47:16 +01:00
Romain Neutron	c2f0d5dc47	Merge with master	2012-01-04 10:47:01 +01:00
Romain Neutron	6a78fefea1	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 10:45:35 +01:00
Romain Neutron	8dcd5af3cc	Fix #146 : Choice button does not work in lightbox	2012-01-04 10:43:10 +01:00
Romain Neutron	8365b32206	Removed some excessive verbose	2012-01-04 10:32:54 +01:00
Romain Neutron	a7078c2e17	Fix Typo	2012-01-04 10:32:40 +01:00
Nicolas Le Goff	01c9447526	delete connexion sample	2012-01-03 19:59:52 +01:00
Nicolas Le Goff	8fd404dfd7	delete config sample	2012-01-03 19:59:27 +01:00
Nicolas Le Goff	1192a795ce	add config sample file	2012-01-03 19:56:58 +01:00
Nicolas Le Goff	b41959a5ae	add app configuration to doctrine service	2012-01-03 19:45:51 +01:00
Nicolas Le Goff	3339a304ff	add servername to setup registry	2012-01-03 19:43:44 +01:00
Nicolas Le Goff	866b47ed03	add setServername method	2012-01-03 19:43:05 +01:00
Nicolas Le Goff	ee5eaf3510	check if constant are already defined	2012-01-03 19:39:10 +01:00