Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-20 09:14:23 +00:00
Code Issues Actions Projects Releases Wiki Activity
473 Commits 148 Branches 99 Tags
Commit Graph

473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Fastré
d21595d306 add gitlab-ci to project 
Squashed commit of the following:

commit 7baa7bddc3a1613816c691e454841baa885a5095
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 26 21:13:47 2015 +0100

    fix auth and database url

commit c47ad68586749e19fce125da9820d0fd0b2bf575
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 26 20:59:33 2015 +0100

    add gitlab-ci
 2015-10-26 22:01:57 +01:00
Julien Fastré
7baa7bddc3 fix auth and database url 2015-10-26 21:13:47 +01:00
Julien Fastré
c47ad68586 add gitlab-ci 2015-10-26 20:59:33 +01:00
Julien Fastré
8e75f0b4ac adding gitlab-ci to project 
Squashed commit of the following:

commit 7de95e8e1e829f2ebeeb0bcea750e9fd2cdfa4b4
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 19 23:40:01 2015 +0200

    adapting config for build

commit c554816956ee1d0f0144824392a5f5984b389d1a
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 19 22:42:39 2015 +0200

    add gitlab-ci to project
 2015-10-26 20:46:59 +01:00
Marc Ducobu
f068ac288f Debug JS - close refs #626 2015-10-22 15:09:43 +02:00
Marc Ducobu
6af61f71dc Refactoring Resources/views/CustomFieldsRendering/choice.html.twig : indentation 2015-10-22 15:07:38 +02:00
Marc Ducobu
bfca9baaeb Refactoring Form/Type/ChoicesType.php : removing useless spaces 2015-10-22 15:06:57 +02:00
Marc Ducobu
46bba56776 Refacotring Form/Type/ChoicesListType.php : indenation 2015-10-22 15:06:14 +02:00
Marc Ducobu
98088e5f7a Refactoring Form/CustomFieldType.php : indentation 2015-10-22 15:05:02 +02:00
Marc Ducobu
23438926b1 Refactoring CustomFields/CustomFieldChoice.php : indentation 2015-10-22 15:02:49 +02:00
Julien Fastré
fee5b00e35 use random activityType, activityReason, scope in test 2015-10-08 22:36:08 +02:00
Julien Fastré
e79ca23f2c add test for complete activity crud (without errors) 
+ fix some errors in controller (discovered with tests)
 2015-10-08 18:24:49 +02:00
Julien Fastré
fa5da95bf1 first impl on test on TranslatableActivityReasonType 
Currently skipped due to the amount of work required and the expectance

refs #651
 2015-10-08 17:22:57 +02:00
Julien Fastré
2e1153d42b add parameters for gitlab-ci 2015-10-08 15:43:26 +02:00
Julien Fastré
8eccbea522 fix address for storing doctrineMigrationsFile into correct directory for tests 2015-10-08 15:42:11 +02:00
Julien Fastré
22afd3b3fa fix bug in redirection to admin index 2015-10-02 23:47:39 +02:00
Julien Fastré
795c1a74ed layout and clean activity type CRUD 2015-10-02 23:47:39 +02:00
Julien Fastré
216d0c55be remove delete actions & form in controller 2015-10-02 23:47:39 +02:00
Julien Fastré
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
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
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
Marc Ducobu
653112ba57 refactoring Command/CreateFieldsOnGroupCommand.php : code indent 2015-09-29 20:20:14 +02:00
Julien Fastré
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
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
Champs-Libres-Bot
74c03078c4 Update README.md 2015-09-23 16:24:19 +02:00
Champs-Libres-Bot
ab707e9079 add issue tracker 2015-09-23 16:20:54 +02:00
Julien Fastré
4daa44ed57 implements role declaration in activity 
close #610 @0h15
 2015-09-21 23:08:32 +02:00
Marc Ducobu
7008284479 Adding colors for table header of Activity/list 2015-08-26 13:34:17 +02:00
Marc Ducobu
c7962c8afd Display only the activities of a person 2015-07-06 09:10:58 +02:00
Julien Fastré
7675f0e250 add grouping and fix localization of trans. string in ActivityReason 
the label of activity type is now handled by translatableStringHelper.

Reasons are also grouped by categories.

This is thanks to PR https://github.com/symfony/symfony/pull/14050
 2015-07-06 00:57:53 +02:00
Marc Ducobu
7e688d8573 Merge branch 'master' of git://github.com/Chill-project/Activity 2015-07-06 00:27:44 +02:00
Marc Ducobu
e1eeb1bdab Adding activity fixtures 2015-07-06 00:27:16 +02:00
Julien Fastré
e36c195ecf add flashbag message for activity 2015-07-06 00:10:13 +02:00