9528 Commits

Author SHA1 Message Date
6eb6117c14 Merge branch 'fix_#12' into 'master'
remove 'empty_data' which cause conflict with transformer

this blocked the possibility to uncheck the 'active' field on the
choice.

Should fix chill-project/Chill-CustomFields#12

See merge request !3
2015-12-01 10:30:57 +01:00
c4d2c5e691 fix composer.json 2015-11-30 22:39:30 +01:00
f18b384a06 remove 'empty_data' which cause conflict with transformer
this blocked the possibility to uncheck the 'active' field on the
choice.
2015-11-30 22:33:15 +01:00
9a41052cf1 Merge branch 'fix_admin_interface' into 'master'
Layout of index page for customfieldsgroup

Fix chill-project/custom-fields#2 and chill-project/custom-fields#3

This is a test to see how works merge request in gitlab.

See merge request !1
2015-11-30 22:18:41 +01:00
97475ca3b6 fix test for config according to new dev deps 2015-11-30 22:13:59 +01:00
4c328d0aae remove dump informations 2015-11-30 22:12:59 +01:00
9b5544beaf create test for custom fields group complete scenario
a deps is added on the bundle "person" in order to make test working.
2015-11-30 22:10:04 +01:00
c9ca7c1e1b fix creation of custom field without cfgroup id 2015-11-30 21:31:58 +01:00
2401270754 add flash message for custom fields group 2015-11-27 14:29:38 +01:00
46173231d2 adding flash messages for customfield 2015-11-27 14:18:19 +01:00
cbf9cee65c clean code of usnused methods 2015-11-27 13:51:36 +01:00
fa3245b99b add a btn on edit link 2015-11-27 13:42:06 +01:00
bf99b68a2a Improve rendering of options and fields 2015-11-27 13:37:07 +01:00
f24a088a0d [wip] re-introduce 'add element' functionality 2015-11-25 21:26:30 +01:00
Jean Pierre Huart
9fa208b93a gitignore modified 2015-11-25 18:48:19 +01:00
Jean Pierre Huart
d667c10d04 Installation of Postgressql server and Chill database 2015-11-25 18:39:27 +01:00
Marc Ducobu
113fa1facc Starting solving - #4 2015-11-25 15:57:05 +01:00
Marc Ducobu
fcbd985e4e Chill more responsible (Ok >= 500 px) 2015-11-25 15:36:26 +01:00
Marc Ducobu
5b78cad8d6 More responsibe design 2015-11-25 15:17:05 +01:00
Marc Ducobu
3cda5cd14a Updating the dependencies 2015-11-25 15:16:12 +01:00
Marc Ducobu
24f79d1acb chill_menu("admin") config from Admin/layoutWithVerticalMenu.html.twig 2015-11-25 11:56:29 +01:00
Marc Ducobu
e76f553a6d Removing useless images 2015-11-25 11:44:53 +01:00
Marc Ducobu
bd61bbfdae Slongan : accompagnement -> l'accompagnement 2015-11-25 11:40:19 +01:00
b96076022f [wip] layout of custom field edition
[ci skip]
2015-11-25 08:45:17 +01:00
6886f5f943 remove dev from migration deps 2015-11-11 21:36:37 +01:00
cbcc722c0d remove the field "customFieldsGroup" on custom field creation
The customFieldsGroup field is hidden when creating a new customFields.

The customFieldsGroup is retrieved from the url (`customFieldsGroup` value in the URL).

This should ease the task for administrator and be consistent with the UI which group customFields into customFieldsGroup.
2015-11-08 21:18:03 +01:00
421f54e194 remove code for custom fields default group CRUD
The CRUD of default groups is handled now by the custom fields index page. The CRUD is not necessary.
2015-11-08 18:52:28 +01:00
3e23c1f156 show options in show view 2015-11-08 18:47:16 +01:00
0dcf2c33f0 create custom fields default group from new layout 2015-11-08 17:59:43 +01:00
41c47df0c3 remove delete action and form 2015-11-07 09:56:28 +01:00
45d34dc312 fix customfieldsgroup edit view 2015-11-07 09:51:36 +01:00
e1435d0883 fix form to jump to create a custom field 2015-11-07 09:38:12 +01:00
59ce457131 add a title 2015-11-07 08:59:57 +01:00
043f5a1eaf fix show page 2015-11-05 23:49:22 +01:00
bb1e690bec fix "create" page with translation and layout 2015-11-05 22:41:54 +01:00
9d65ca5088 layout of index page for customfieldsgroup
- add a "default" column (according to chill-project/custom-fields#3 )
- translation
2015-10-31 17:55:10 +01:00
Marc Ducobu
c6bfbd84ae Merge branch 'master' of github.com:Chill-project/Documentation 2015-10-30 18:29:08 +01:00
Marc Ducobu
4b0622f54c Adding information about getting the last version of the docker images 2015-10-30 18:28:10 +01:00
Marc Ducobu
74a18166ef Adding a page about the usage of the layouts / templates 2015-10-30 18:27:31 +01:00
Marc Ducobu
7a603f19bd Changing issue tracker in README : git.framasoft.org 2015-10-30 18:26:47 +01:00
Marc Ducobu
58cd4be383 debug flash danger -> error 2015-10-30 17:12:19 +01:00
Marc Ducobu
301f35893c Removing travis config files 2015-10-30 16:05:00 +01:00
Marc Ducobu
ff16ed9b2c Adding refs to the doc & removeing refs to travis in README 2015-10-30 16:04:29 +01:00
Marc Ducobu
577bd8f485 Adding ref to the doc in README 2015-10-30 16:02:53 +01:00
Marc Ducobu
c0d5bd90e8 Removing travis config files 2015-10-30 16:01:22 +01:00
Marc Ducobu
7cf270cee4 Removing travis config file 2015-10-30 15:57:27 +01:00
Marc Ducobu
5e211b3f06 Adding ref to the dov 2015-10-30 15:56:43 +01:00
Marc Ducobu
8c979c3080 Removing old issue tracker information 2015-10-30 15:54:44 +01:00
Marc Ducobu
d1a313078b Removing travis files 2015-10-30 15:23:39 +01:00
Marc Ducobu
d072d568bf Removing travis image build status 2015-10-30 15:21:24 +01:00