2267 Commits

Author	SHA1	Message	Date
Romain Neutron	8dbedd0e87	Fix story export	2012-01-11 12:12:37 +01:00
Nicolas Le Goff	b96a3db0f7	add getConnexionFile methode	2012-01-11 12:09:50 +01:00
Romain Neutron	c3907038b3	Update submodule	2012-01-11 12:04:05 +01:00
Romain Neutron	e3c758aa5e	Update submodule	2012-01-11 12:03:06 +01:00
Romain Neutron	f583cf60f8	Merge branch 'FixFTP' into 3.6	2012-01-11 11:57:43 +01:00
Romain Neutron	6d830053d1	Fix logfile	2012-01-11 11:56:47 +01:00
Romain Neutron	77ef6504fa	Allow disable of sendmail at the end of FTP	2012-01-11 11:55:48 +01:00
Romain Neutron	8a9b93c1ff	Merge with master	2012-01-11 11:29:01 +01:00
Romain Neutron	85f44ce8c5	Do not alert when validation is finished	2012-01-11 11:24:01 +01:00
Romain Neutron	5c8d00397c	Allox usr_mail to be null	2012-01-11 11:18:13 +01:00
Romain Neutron	10cab0374c	Fix substitute	2012-01-11 11:01:22 +01:00
Romain Neutron	f7a669c07d	Syntax	2012-01-11 10:44:36 +01:00
Romain Neutron	6156bc0cbb	Renamed prod/index.html	2012-01-11 10:43:55 +01:00
Romain Neutron	c239740542	Merge branch 'HotFix' into 3.6	2012-01-10 21:24:12 +01:00
Romain Neutron	a3ebb45317	Fix refactor	2012-01-10 21:07:29 +01:00
Romain Neutron	ecc82f6222	Merge master fix	2012-01-10 20:33:17 +01:00
Romain Neutron	869a2f614c	Added WorkZone browser routes	2012-01-10 20:32:00 +01:00
Romain Neutron	1d447341d5	Enhanced Basket archive route	2012-01-10 20:31:49 +01:00
Romain Neutron	b69ef07742	Added Doctrine loader to Core	2012-01-10 20:31:08 +01:00
Romain Neutron	e762f6fa23	Enhancement WorkZone browser	2012-01-10 20:30:46 +01:00
Romain Neutron	543f805389	Fix migration from phrasea to doctrine manager	2012-01-10 20:30:22 +01:00
Romain Neutron	f8e5cc6426	Merge master fix	2012-01-10 20:30:03 +01:00
Romain Neutron	5587256ba4	Fix typo	2012-01-10 13:23:43 +01:00
Romain Neutron	319bbf2f3f	Fix FTP pull	2012-01-10 13:23:31 +01:00
Romain Neutron	9c6071e77b	Merge branch 'HotFix' into 3.6	2012-01-10 13:10:08 +01:00
Romain Neutron	f115e88021	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-10 13:09:40 +01:00
Romain Neutron	1941785070	Fix available download elements	2012-01-10 13:08:30 +01:00
Romain Neutron	162e690bcb	Add browser queries	2012-01-10 12:49:29 +01:00
Romain Neutron	eebc52cd83	Basket Browser	2012-01-10 12:49:01 +01:00
Romain Neutron	fd09196305	Autoload for extensions	2012-01-10 12:48:53 +01:00
Romain Neutron	580b32b645	Add Doctrine Extensions	2012-01-10 12:48:04 +01:00
jygaulier	d44a29ff3f	Merge with master	2012-01-10 12:16:43 +01:00
jygaulier	536876ac45	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-10 12:14:31 +01:00
jygaulier	a9346df384	fix : status mask of user where not changed when applying a user template ... nb: because a new user has all mask checked (all rights), a template will only UNCHECK boxes (remove rights): - unchecked boxes on template will be unchecked on user - checked boxes on template does nothing (left unchanged on user)	2012-01-10 11:57:23 +01:00
Romain Neutron	ccf08e05eb	Merge with master	2012-01-10 10:25:02 +01:00
Nicolas Le Goff	8794436204	move to template Engine	2012-01-09 23:34:33 +01:00
Nicolas Le Goff	bb12ae81fb	move to Orm	2012-01-09 23:33:29 +01:00
Romain Neutron	ded3cdb3cc	Substitution enhancement	2012-01-09 20:07:57 +01:00
Romain Neutron	0228edec5d	Fix export caption	2012-01-09 18:50:26 +01:00
Romain Neutron	c01efe9d37	Fix record indexation	2012-01-09 18:24:41 +01:00
Romain Neutron	217d2e4db0	Fix collection cache	2012-01-09 18:24:32 +01:00
Romain Neutron	e4016ccd2f	Fix User_Adapter in preview short history	2012-01-09 18:07:01 +01:00
Romain Neutron	465ded9c9f	Reverted composer.json	2012-01-09 14:48:28 +01:00
Romain Neutron	cd28906c6b	Bump to version 3.5.8	2012-01-06 18:15:27 +01:00
Romain Neutron	ad22cd791e	Merge branch 'templates' into 3.6	2012-01-06 18:14:22 +01:00
Romain Neutron	927eb16070	Fix template name	2012-01-06 17:59:42 +01:00
Romain Neutron	3b8d31eb64	get_applied_template returns template login	2012-01-06 17:52:45 +01:00
Romain Neutron	be2f50e903	Merge with master	2012-01-06 17:42:11 +01:00
Romain Neutron	8768f86926	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-06 17:34:10 +01:00
Romain Neutron	b0e90f0df1	Fix #166 : empty cache on subdef generation	2012-01-06 17:26:26 +01:00