11318 Commits

Author SHA1 Message Date
216d0c55be remove delete actions & form in controller 2015-10-02 23:47:39 +02:00
bebee4fbeb layout and clean activity reason crud 2015-10-02 23:47:39 +02:00
Marc Ducobu
0bee5e46db Only active reason are displayed in the activity encoding form 2015-10-02 15:16:37 +02:00
Marc Ducobu
4ef4a64ea6 Template for ActivityReasonCategory with translation + better looking - refs #622 2015-10-02 14:55:58 +02:00
Marc Ducobu
e8f8c8e52d Admin form : only display active ActivityReasonCategory in the ActivityReason form 2015-10-02 14:41:52 +02:00
799cd6132b fix postgres version 2015-10-01 21:28:45 +02:00
083cf35de2 Fix gitlab-ci 2015-10-01 21:13:40 +02:00
Marc Ducobu
e32dad5617 Setting an inactive category unactivate the reason - refs #622 2015-10-01 16:44:30 +02:00
Marc Ducobu
744a68f195 Category unactive implies all the reasons with this category as unactive - refs #622 2015-10-01 16:35:10 +02:00
Marc Ducobu
3934d18df3 Revisin and adding the ftwig function 'chill_custom_fields_group_widget' 2015-10-01 11:35:44 +02:00
Marc Ducobu
2604c61866 Initialization of is not necessary 2015-10-01 10:36:17 +02:00
Marc Ducobu
3e3ac1c841 Spelling correction 2015-10-01 10:35:36 +02:00
Marc Ducobu
dda6f65fc2 Merge branch 'master' of git://github.com/Chill-project/Person 2015-09-30 15:28:47 +02:00
Marc Ducobu
426849f169 Only display custom fields that are active 2015-09-30 14:56:06 +02:00
Marc Ducobu
e73cd3987a Debug : removing old code (that is now in chill_custom_fields_group_widget) 2015-09-30 14:35:39 +02:00
Marc Ducobu
5a30328c63 use the widget chill_custom_fields_group_widget for only display active custom fields 2015-09-30 14:34:04 +02:00
Marc Ducobu
4abb994725 Resources/views/CustomFieldsGroup/render_for_test.html.twig : refactoring : good indentation 2015-09-30 14:32:57 +02:00
Marc Ducobu
2d60c62d91 Reparing tests 2015-09-30 14:32:20 +02:00
Marc Ducobu
eb4da0a71d Tests/CustomFieldTestHelper.php : refactoring : code indentation 2015-09-30 14:03:28 +02:00
Marc Ducobu
b11a356fd3 Tests/CustomFields/CustomFieldsTextTest.php : refactoring 2015-09-30 14:01:04 +02:00
Marc Ducobu
0e5e87eb41 Command/CreateFieldsOnGroupCommand.php : re-indent + adding function to be more readable 2015-09-30 13:33:09 +02:00
Marc Ducobu
101783b9f1 Only display active custom fields in form & view 2015-09-30 13:32:24 +02:00
Marc Ducobu
9f98c4e7e6 Adding method getActiveCustomFields 2015-09-30 13:31:09 +02:00
Marc Ducobu
5583fbcc6c Entity/CustomField : renaming getActive to isActive 2015-09-30 13:28:45 +02:00
Marc Ducobu
20ba768e43 Renaming template for custom field group 2015-09-30 13:27:59 +02:00
b48959e297 adding gitlab-ci.yml 2015-09-30 10:18:15 +02:00
Marc Ducobu
653112ba57 refactoring Command/CreateFieldsOnGroupCommand.php : code indent 2015-09-29 20:20:14 +02:00
0ecfcae98b fix layout and menu for activity configuration
close #614 1h00
2015-09-29 17:18:29 +02:00
Marc Ducobu
afc51d2f31 Adding TODO message 2015-09-29 16:14:53 +02:00
5f89de46cf fix some entries in menu 2015-09-29 16:00:16 +02:00
2e650a53db fix translations and layout in user CRUD
close #615 0h45
2015-09-29 15:54:17 +02:00
cb48b020f7 adding how to declare new roles
refs #573 @0h30 adding documentation
2015-09-29 10:51:38 +02:00
Marc Ducobu
11c27edd2b Solving travis-ci problem 2015-09-28 15:56:56 +02:00
Marc Ducobu
3dcbec4b87 Merge branch 'master' of git://github.com/Chill-project/Activity 2015-09-28 14:08:17 +02:00
Marc Ducobu
4bd5d70fb2 Remove required in form #622 2015-09-28 14:08:03 +02:00
Marc Ducobu
f310b3daab close 623 2015-09-28 13:58:51 +02:00
Marc Ducobu
e7ce8934ab Refactoring CustomFields/CustomFieldChoice.php : good indentation 2015-09-28 13:55:32 +02:00
74c03078c4 Update README.md 2015-09-23 16:24:19 +02:00
ab707e9079 add issue tracker 2015-09-23 16:20:54 +02:00
Marc Ducobu
da9d8d52fc Merge branch 'master' of git://github.com/Chill-project/Person 2015-09-21 23:11:41 +02:00
Marc Ducobu
2427309f11 Removing useless class 2015-09-21 23:11:22 +02:00
4daa44ed57 implements role declaration in activity
close #610 @0h15
2015-09-21 23:08:32 +02:00
9ae152dd30 fix typo in translation 2015-09-21 23:00:15 +02:00
31f3744ad9 admin are redirected to admin section 2015-09-21 22:51:04 +02:00
fdddf77a90 fix doc about docker container demo 2015-09-21 13:31:59 +02:00
9eeb685d8f add translation of implied scopes in edit/show view
refs #573 0h07
2015-09-20 21:53:07 +02:00
6acba49f38 translation in messages
refs #573 0h05
2015-09-20 21:50:10 +02:00
6b3b176849 Merge add_ui_permission into master
+ set deps to chill-project/main dev-master

Squashed commit of the following:

commit c120c9347606358daec042b0e1e3da83cc260f12
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Sep 14 00:50:50 2015 +0200

    switch to role declaration in code

commit 7fba35356ea9266c43a6f104290103071e1c1755
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Aug 31 23:57:59 2015 +0200

    declare role in chill.available_roles parameter
2015-09-20 21:47:52 +02:00
c4915f4556 set deps to master in composer.json 2015-09-20 21:45:40 +02:00
31aa50b4ea merging add_ui_permission into master
refs #573

Squashed commit of the following:

commit 33635722c231a3a80518e0dc027911766a95cbfa
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Sun Sep 20 21:42:37 2015 +0200

    translation of roles

commit 18d96fe59f836564ace5e6045fa87ac81da6b27b
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Sun Sep 20 11:54:46 2015 +0200

    remove admin menu for person bundle

commit 2acd79930e28fda315d97df2c0ff8aae33ab489a
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Sep 18 21:05:00 2015 +0200

    add logger to project

commit 724d2fc8685fced0cf9da77e9e9730c5c57337ed
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Sep 14 00:50:01 2015 +0200

    switch to role declaration in code

commit 10f6219b277445b0dfeb51fa0b7566a28fdd41bf
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Aug 31 23:51:47 2015 +0200

    declare role in parameter chill.available_roles
2015-09-20 21:44:08 +02:00