609 Commits

Author SHA1 Message Date
669d823f72 use the apigen phar packaged with the current image 2017-06-20 21:06:43 +02:00
ca4ffb4d53 upgrade deps and CI 2017-06-20 20:58:28 +02:00
3ce6427166 remove bootstrap.php.cache and force re-generation on each install 2017-06-20 16:47:24 +02:00
8a00fbf4f9 set stricter image, remove php5.6 tests 2017-06-20 16:30:01 +02:00
50e5242176 update phpunit to last version and internal packages 2017-06-20 15:21:29 +02:00
239ea38e92 add ACTIVITY_SEE_DETAILS role
This new role allow to see the details (remark + reasons) in the timeline.
2017-06-20 15:19:58 +02:00
f7c9e6f3b8 fix composer to add dev deps if required 2017-04-19 21:36:25 +02:00
38d69f097c fix translation and make hierarchy in roles 2017-04-19 21:26:22 +02:00
13f3a1f55f add validation and translations 2017-02-26 01:04:02 +01:00
7a76868f6a add validation to activityreasonaggregator 2017-02-26 00:12:52 +01:00
9bcd7a2c10 improve exports and filters 2017-01-31 15:34:41 +01:00
67c8c19885 improve exports & add new filter, export, aggregators 2017-01-17 00:34:32 +01:00
b36ec02b65 fix required role 2017-01-16 19:53:27 +01:00
faf5b7ca94 fix role hierarchy 2017-01-16 15:24:14 +01:00
f792d02e43 fix error: add missing return statements 2017-01-16 15:20:08 +01:00
9ad651a5d8 rename ReasonAggregator => ActivityReasonAggregator for consistency 2017-01-12 17:59:06 +01:00
2997614a04 update export & aggregator & filter to new api + add tests 2017-01-12 17:42:37 +01:00
a7dfc5e1bd moving export services definition to new file 2017-01-12 17:42:37 +01:00
86c0622ef3 adding apigen definition file 2016-12-19 11:43:00 +01:00
83b45fd88b re-introduce platform-reqs in installation phase 2016-12-19 11:33:33 +01:00
74c6c645f1 removing memory_limit and adding deploy - doc 2016-12-19 10:13:12 +01:00
8cda910918 fix test
The button seems to be translated
2016-12-19 10:02:28 +01:00
c58d101ade fixing error in creating mock
A public method became protected in phpunit
2016-12-19 09:54:32 +01:00
96bb765b03 remove memory_limit on composer install 2016-12-18 21:57:08 +01:00
d5d88ca954 adding apigen & publicaiton of api 2016-12-12 22:18:03 +01:00
0899a931e4 adding deploy to packagist into pipeline 2016-11-20 22:32:16 +01:00
f4ec64c483 fix error in gitlab-ci 2016-11-20 22:24:20 +01:00
f37f78f3a8 adding deploy to packagist into pipeline 2016-11-20 22:21:44 +01:00
9f3cdfdff8 improve layout of activity type form 2016-11-15 14:32:11 +01:00
5dda66342a add an "active" field on activity type 2016-11-14 23:00:13 +01:00
f8dd08d194 adding div around title
Those div are required to solve ref Chill-project/Chill-Person#12
2016-11-13 21:04:20 +01:00
79dd4bfac8 Removing the --testdox argument on phpunit
This should improve the readability on tests result (which test fails).
2016-09-02 14:38:34 +02:00
9100bb14b3 fixing the call on js function 2016-09-02 08:26:18 +02:00
09f46d804a adding translation for export 2016-09-02 08:23:43 +02:00
affeae238c adding empty data on CFChoice
And fixing a bug occuring because type of empty data are wrong.

fix #23
2016-08-11 23:26:32 +02:00
2e59c0666b adding rendering of choice_long and number on CSV 2016-07-08 13:56:17 +02:00
ef76453fbc add a title on page "list activities" and statement if empty
fix #16
2016-06-08 21:35:31 +02:00
1e476b39da adding the possibility to remove activities
fix #28
2016-06-08 21:26:30 +02:00
dfaa4b0968 ordering activities by date
fix #15
2016-06-07 13:58:53 +02:00
Marc Ducobu
3e3cf707de Merge branch 'master' of framagit.org:Chill-project/Chill-Activity 2016-05-06 16:32:34 +02:00
Marc Ducobu
79fa06640a Improving the timeline UI 2016-05-06 16:31:04 +02:00
f863b9db24 adapt to new exportInterface
see Chill-project/Chill-Main#9
2016-04-25 21:58:04 +02:00
ffe15f2037 Merge branch 'master' into export 2016-04-15 23:21:34 +02:00
b97a550e2b remove unused locale and request stack
The locale resolving is delegated to TranslatableStringHelper
2016-03-21 00:00:58 +01: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