ffe15f2037
Merge branch 'master' into export
2016-04-15 23:21:34 +02:00
1ab0b95e74
order the type alphabetically
...
Improve also the form "TranslatableActivityType" to use the
TranslatableStringHelper.
2016-03-09 20:54:38 +01:00
97df048dfb
add a placeholder in form. Force to choose a type
...
fix #5
2016-03-09 15:17:54 +01:00
3acea7967c
fix the layout of the forms
...
The layout is now consistent with the view page
2016-03-09 14:42:42 +01:00
77b7333fea
Allow encoding of an activity with configuration preset durations
...
fix #11
The activity form allow to receive pre-configured activity durations.
Those duration can be configured through the option
chill_activity.form.time_duration :
```yaml
chill_activity:
form:
time_duration:
- { label: '12 minutes', seconds: 720 }
# - ...
```
If a pre-existing activity receives a different time, the time is added
to the list of pre-configured duration time.
2016-03-09 14:31:42 +01:00
f28a6e9fa0
Merge remote-tracking branch 'framagit/master'
2016-02-25 20:03:30 +01:00
1b851e8f09
upgrade dependency on doctrine-migration-bundle to ~1.1
2016-02-23 15:37:54 +01:00
737d0f4c52
Add license
2016-02-23 14:49:42 +01:00
d8bf3a6431
add mapping_types information to allow jsonb from postgresql
2016-02-22 14:51:48 +01:00
c60d6acf97
An activity may have multiple reasons
...
The relationship between Activity and Reasons is now many-to-many.
Some improvement in show activity layout.
refs #4 #7
2016-02-22 14:48:35 +01:00
42f7bdb742
adapt to new ExportInterface
2016-02-05 15:05:27 +01:00
7619b41cd4
adapting classes to new interfaces
2016-02-01 00:01:21 +01:00
9f7fe05991
implements required role in export
2016-01-26 12:21:16 +01:00
1671be107f
implements dummy role
2016-01-26 11:47:34 +01:00
af359c9a2b
add dummy acl for export [WIP][ci-skip]
2016-01-24 22:26:38 +01:00
3c65e2d585
[export] add an export 'count activity' and first filters
...
- reason aggregator
- reason filter
- count activity export
2016-01-02 16:47:55 +01:00
65e7a130c5
adapt config for test to symfony 2.8
...
replace intention by 'csrf_token_id' in security part
2015-12-14 21:55:19 +01:00
Marc Ducobu
508b933ab9
Improving UI
2015-12-04 19:30:35 +01:00
Marc Ducobu
8c979c3080
Removing old issue tracker information
2015-10-30 15:54:44 +01:00
Marc Ducobu
abbcf50fcc
Admin activity on Admin Section menu
2015-10-30 10:21:12 +01:00
fc8c018159
add tests for authentication/authorization
...
Check the user which access to creation, modification, list, is
authorized to see the user and have the permissions on activity.
2015-10-27 21:14:03 +01:00
7ce86ab15f
use github token for auth
2015-10-26 22:26:41 +01:00
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
fee5b00e35
use random activityType, activityReason, scope in test
2015-10-08 22:36:08 +02:00
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
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
2e1153d42b
add parameters for gitlab-ci
2015-10-08 15:43:26 +02:00
8eccbea522
fix address for storing doctrineMigrationsFile into correct directory for tests
2015-10-08 15:42:11 +02:00
22afd3b3fa
fix bug in redirection to admin index
2015-10-02 23:47:39 +02:00
795c1a74ed
layout and clean activity type CRUD
2015-10-02 23:47:39 +02:00
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
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
0ecfcae98b
fix layout and menu for activity configuration
...
close #614 1h00
2015-09-29 17:18:29 +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
74c03078c4
Update README.md
2015-09-23 16:24:19 +02:00
ab707e9079
add issue tracker
2015-09-23 16:20:54 +02:00
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
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
e36c195ecf
add flashbag message for activity
2015-07-06 00:10:13 +02:00
e0561340a5
add layout for form, consistency with reports
...
- add buttons at the bottom
2015-07-05 23:58:15 +02:00
