1184 Commits

Author	SHA1	Message	Date
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
Nicolas Le Goff	9c334f2ed1	delete supertwig	2012-01-06 16:56:01 +01:00
Nicolas Le Goff	47f3ba2520	merge	2012-01-06 16:55:10 +01:00
Nicolas Le Goff	f42d856a87	add default options	2012-01-06 16:45:40 +01:00
Nicolas Le Goff	476ab9b807	set twig service for rendering templates	2012-01-06 16:41:08 +01:00
Nicolas Le Goff	5926916850	bootstrap core	2012-01-06 16:40:50 +01:00
Nicolas Le Goff	a6edc04f05	set twig service for rendering templates	2012-01-06 16:39:02 +01:00
Nicolas Le Goff	6c13bbb0d5	Create a new twig service	2012-01-06 16:37:52 +01:00
Nicolas Le Goff	dff7b5eff8	add Configuration::getServices method	2012-01-06 16:37:35 +01:00
Nicolas Le Goff	80bc7e7217	add Configuration\Application::getServiceFile method	2012-01-06 16:36:39 +01:00
Nicolas Le Goff	64a99dbffb	add twig service	2012-01-06 16:35:37 +01:00
Nicolas Le Goff	90efca427b	add twig service in core	2012-01-06 16:34:56 +01:00
Nicolas Le Goff	87eee16cde	add twig service	2012-01-06 16:34:00 +01:00
Nicolas Le Goff	85a78052ea	fix error with gd resizer processor	2012-01-06 16:33:33 +01:00
Nicolas Le Goff	554e657d68	add twig service	2012-01-06 16:32:45 +01:00
Nicolas Le Goff	7963d0aec8	add todo	2012-01-06 16:32:19 +01:00
Nicolas Le Goff	bc22fa35d2	cleanup	2012-01-06 16:22:15 +01:00
Romain Neutron	e3e8e49cf0	Fix searchEngine set date	2012-01-06 16:05:14 +01:00
Romain Neutron	5b7e000013	Fix #172 : Fix CGU to confirm without access	2012-01-06 15:59:15 +01:00
Romain Neutron	b4f8fa1e96	Fix : time limited users appears phantom	2012-01-06 15:43:24 +01:00
Romain Neutron	75f0e416dc	User Query on sbas or bas should not return phantom users	2012-01-06 15:43:01 +01:00
Romain Neutron	2a16efd4bc	User Query on sbas or bas should not return phantom users	2012-01-06 15:00:14 +01:00
Romain Neutron	1977eedfac	User Query on sbas or bas should not return phantom users	2012-01-06 14:50:23 +01:00
Romain Neutron	d933c64b2f	Use of secured scheme for external apis in case of https	2012-01-06 14:42:41 +01:00
Romain Neutron	8f16962873	Merge branch 'hotfix' into 3.6	2012-01-06 13:35:52 +01:00
Romain Neutron	e7bab79c85	Cleanup (oups)	2012-01-06 13:34:31 +01:00
Romain Neutron	64ce815e81	Merge with master	2012-01-06 13:30:56 +01:00
Romain Neutron	a1624c4a6b	Adding todo	2012-01-06 13:17:35 +01:00
Romain Neutron	d9b611cceb	Fix download IE6	2012-01-06 13:14:53 +01:00
Romain Neutron	5d0965f48f	Fix Query on user name	2012-01-05 17:29:15 +01:00
Romain Neutron	f7e301abf7	Vendor pathes	2012-01-05 16:45:29 +01:00
Romain Neutron	6121485f78	Vendor pathes	2012-01-05 16:43:11 +01:00
Romain Neutron	a709129824	Merge with master	2012-01-05 14:56:13 +01:00
Romain Neutron	50df11cf3c	Fix #158 : wrong mail title for validation report	2012-01-05 13:57:49 +01:00