1791 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marc Ducobu	c71ba7612a	Merge commit '8830b669ff1be5692d43300b4ff17966512500ed' as 'Resources/public/scratch-css'	2014-11-10 20:42:02 +01:00
Marc Ducobu	8830b669ff	Squashed 'Resources/public/scratch-css/' content from commit 289f23f ... git-subtree-dir: Resources/public/scratch-css git-subtree-split: 289f23f24b31be9fee24f09f44936dbf8eab8614	2014-11-10 20:42:02 +01:00
Marc Ducobu	d06daf9a01	Merge branch 'master' of git://github.com/Chill-project/Main	2014-11-10 20:41:24 +01:00
Marc Ducobu	7196c7c641	Remove subtree scratch-css	2014-11-10 20:08:37 +01:00
Marc Ducobu	ab51e3c7f4	Title for custom Field : class title or subtile	2014-11-10 16:05:26 +01:00
Marc Ducobu	f719f79474	Debug : closing form	2014-11-10 15:17:23 +01:00
Marc Ducobu	e997fbf6a6	Debug : closing form	2014-11-10 15:17:23 +01:00
Marc Ducobu	bcf4a57d27	Background color for div#general	2014-11-10 14:58:38 +01:00
Marc Ducobu	62746ba3f9	Background color for div#general	2014-11-10 14:58:38 +01:00
Marc Ducobu	8794597361	Debug path to search	2014-11-10 14:58:01 +01:00
Marc Ducobu	466a5ccba7	Debug path to search	2014-11-10 14:58:01 +01:00
Marc Ducobu	d1159fc45c	Enabling person search	2014-11-10 14:32:26 +01:00
Marc Ducobu	f68fba7178	Enabling person search	2014-11-10 14:32:26 +01:00
Julien Fastré	ac0e7a59b4	documentation of chill_custom_field_* signature ... [ci skip]	2014-11-10 12:38:52 +01:00
Marc Ducobu	539a80798e	Better title name	2014-11-10 12:37:18 +01:00
Marc Ducobu	91773c1512	Better title name	2014-11-10 12:37:18 +01:00
Julien Fastré	28862bbdb9	create visualisation service rers #268	2014-11-10 12:15:32 +01:00
Marc Ducobu	5d536cdcd0	Updating style	2014-11-10 12:12:31 +01:00
Marc Ducobu	111dbfff9f	Updating style	2014-11-10 12:12:31 +01:00
Marc Ducobu	16308d0139	ChillCustomFieldsBundle:Form:form_div_layout.html.twig -> ChillCustomFieldsBundle:Form:fields.html.twig	2014-11-10 11:55:45 +01:00
Marc Ducobu	33be9bedfb	Merge branch 'master' of git://github.com/Chill-project/CustomFields	2014-11-10 11:45:59 +01:00
Marc Ducobu	19318d3fb4	Refactoring	2014-11-10 11:45:34 +01:00
Marc Ducobu	cf07ad5b75	changing template name	2014-11-10 11:45:21 +01:00
Julien Fastré	952d70f049	choice with other + some development tips	2014-11-10 11:25:54 +01:00
Julien Fastré	f9be8e3412	add form layout to config.yml automatically	2014-11-10 11:25:53 +01:00
Julien Fastré	568bf4f3c2	add doctrine fixtures bundle	2014-11-10 11:25:53 +01:00
Marc Ducobu	3f214da596	config cl_chill_main -> chill_main	2014-11-10 11:18:10 +01:00
Marc Ducobu	809d95d288	config cl_chill_main -> chill_main	2014-11-10 11:18:10 +01:00
Marc Ducobu	c77bfe989c	Debug : getLabel -> getName	2014-11-10 11:09:19 +01:00
Julien Fastré	65c814ee27	test form customFieldText creation	2014-11-09 01:53:21 +01:00
Julien Fastré	8b370bf544	translate name to locale	2014-11-09 01:53:21 +01:00
Marc Ducobu	43384a564c	Adding CustomFieldsGroupToIdTransformer.php	2014-11-08 18:16:35 +01:00
Marc Ducobu	03ff4511de	Refactoring : indentation	2014-11-08 16:58:01 +01:00
Marc Ducobu	52b7045cc3	Merge branch 'master' of git://github.com/Chill-project/CustomFields ... Conflicts: Resources/config/services.yml	2014-11-08 15:21:01 +01:00
Marc Ducobu	1747ba5f0d	Adding Title for Custom Field	2014-11-08 15:19:30 +01:00
Marc Ducobu	a6ae6ca5a9	Refactoring : indentation	2014-11-08 15:16:23 +01:00
Marc Ducobu	a748fd6693	CFGroup - Lanuguage	2014-11-08 15:15:31 +01:00
Julien Fastré	7daa1a240e	add testing for customfield, correcting request injection	2014-11-08 15:07:15 +01:00
Julien Fastré	8b71a9e7cf	rename service name chill.custom_field_compiler to chill.custom_field.provider	2014-11-08 12:02:12 +01:00
Julien Fastré	99a88e8705	add customfield text + fix options in custom fields	2014-11-08 11:55:59 +01:00
Marc Ducobu	b0ac03acd7	Adding TranslatableStringFormType.php	2014-11-08 11:04:35 +01:00
Marc Ducobu	db7dc8a99b	Adding TranslatableStringFormType.php	2014-11-08 11:04:35 +01:00
Julien Fastré	394decb579	add date_format to globals in twig	2014-11-07 16:44:26 +01:00
Julien Fastré	fb006470df	add date_format to globals in twig	2014-11-07 16:44:26 +01:00
Marc Ducobu	1c47d597d3	AcmeHelloBundle -> ChillMainBundle	2014-11-07 12:35:07 +01:00
Marc Ducobu	fcad59c795	AcmeHelloBundle -> ChillMainBundle	2014-11-07 12:35:07 +01:00
Julien Fastré	19222f7890	require php 5.5 in composer.json	2014-11-07 00:21:50 +01:00
Julien Fastré	cbc37fb603	require php 5.5 in composer.json	2014-11-07 00:21:50 +01:00
Julien Fastré	da56345fe4	remove php 5.4, which will be end of life in 2015	2014-11-07 00:17:15 +01:00
Julien Fastré	b3727b4ce7	remove php 5.4, which will be end of life in 2015	2014-11-07 00:17:15 +01:00