5312 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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 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	354231b60b	Add icon to templates user	2012-01-06 18:13:36 +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	f6c3ff82ce	add a service configuration file	2012-01-06 16:48:28 +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	a8ddaf1f98	add twig service	2012-01-06 16:31:34 +01:00
Nicolas Le Goff	590fe1cdcd	add twig service	2012-01-06 16:30:58 +01:00
Nicolas Le Goff	8a9e965a3d	add twig service	2012-01-06 16:30:12 +01:00
Nicolas Le Goff	e1535924f4	add twig service	2012-01-06 16:28:02 +01:00
Nicolas Le Goff	be09baf9f4	add twig service	2012-01-06 16:27:32 +01:00
Nicolas Le Goff	fcfa9db2c3	add twig service	2012-01-06 16:27:00 +01:00
Nicolas Le Goff	9831cc45c3	add twig service	2012-01-06 16:25:33 +01:00
Nicolas Le Goff	df18606e11	remove html escape for display links	2012-01-06 16:24:14 +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	2f752d2bd9	Fix #171 : base_id / sbas_id params not filtered on page 2 in admin user search	2012-01-06 15:58:04 +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	66f7efa392	Fix #167 : HTML tag error	2012-01-06 13:21:33 +01:00
Romain Neutron	a1624c4a6b	Adding todo	2012-01-06 13:17:35 +01:00