2444 Commits

Author	SHA1	Message	Date
Romain Neutron	2a04b951e1	Fix Bad link	2012-01-04 22:44:24 +01:00
Romain Neutron	096d6e4002	Fix unserialization	2012-01-04 22:43:44 +01:00
Romain Neutron	a38f256c2b	Fix guest allowed	2012-01-04 19:30:31 +01:00
Romain Neutron	f5be57c202	Fix guest allowed	2012-01-04 19:28:01 +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	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
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	0ebb8b0908	merge	2012-01-04 17:04:15 +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	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
Romain Neutron	1f4562cb44	Fix Bug cache #147 & #151	2012-01-04 12:58:12 +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	8365b32206	Removed some excessive verbose	2012-01-04 10:32:54 +01:00
Nicolas Le Goff	a1956459ac	add servername	2012-01-03 19:37:22 +01:00
Nicolas Le Goff	3f2a527e92	write servername in conf file when creating one appbox	2012-01-03 19:36:18 +01:00
jygaulier	a14b626bfe	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 18:57:07 +01:00
jygaulier	d3c9d90bea	fix for 3.5, show sql	2012-01-03 18:56:38 +01:00
Romain Neutron	09c9e455f4	Fix #144 : Phraseanet:tf-filename metadata is wrong	2012-01-03 18:21:57 +01:00
Nicolas Le Goff	43a396eb8e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-03 16:35:02 +01:00
Nicolas Le Goff	43fbee03c2	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 16:17:49 +01:00
Nicolas Le Goff	e540bd39d3	Merge branch 'fix_report' into 3.6	2012-01-03 16:15:10 +01:00
Nicolas Le Goff	6872ceb3db	fix #138 report / user downloads	2012-01-03 16:12:41 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Nicolas Le Goff	0812cb0a9b	copy the new config .yml file with user settings	2012-01-03 14:58:44 +01:00
Romain Neutron	e288fb0189	Fix #141 : wrong report datas	2012-01-03 14:56:50 +01:00
Nicolas Le Goff	9790928780	replace connexion.inc & remove unusued functions	2012-01-03 14:49:01 +01:00
Nicolas Le Goff	cc05ba9ac6	replace connexion.inc & replace servername	2012-01-03 14:47:56 +01:00
Nicolas Le Goff	8a73c310eb	replace connexion.inc	2012-01-03 14:46:52 +01:00
Nicolas Le Goff	4db2590ea4	replace connexion.inc	2012-01-03 14:46:32 +01:00
Nicolas Le Goff	03ece66cd5	remove bas_manage	2012-01-03 14:45:53 +01:00
Nicolas Le Goff	45f0137a20	add environnement to bootstrap::execute	2012-01-03 14:45:12 +01:00
Nicolas Le Goff	d95b6a48e1	refactor appbox::upgradeAvailable	2012-01-03 14:38:58 +01:00
Nicolas Le Goff	9d9f1261c7	replace config.inc & refactor appbox::create	2012-01-03 14:38:09 +01:00
Nicolas Le Goff	a9039ba876	replace config.inc	2012-01-03 14:36:17 +01:00
Romain Neutron	732301fba2	Add User_Adapter::is_special method	2012-01-03 14:22:44 +01:00
Romain Neutron	745d27b821	Fix #142 : add ability to apply template from user rights view	2012-01-03 13:49:13 +01:00
Romain Neutron	9c15b5d900	Add check before opening phrasea session	2012-01-03 13:48:06 +01:00