518 Commits

Author SHA1 Message Date
64b5de2c03 migrations deleted 2022-04-26 20:19:40 +02:00
75250402c8 fix ordering of social actions 2022-04-25 22:14:36 +02:00
b7abf6b6bf Merge remote-tracking branch 'origin/master' into issue571_ordering_socialactions 2022-04-25 21:30:48 +02:00
79fa030323 add private comment input field to edit form 2022-04-25 15:47:13 +02:00
b36fd57e4f Add private comment options to activity type (visibility + label) 2022-04-25 15:46:55 +02:00
ff72b28861 Revert "private comment added to activity"
This reverts commit 1f2638626cbcc84d0fe653bc5e08bd8e993a8b3e.
2022-04-25 14:52:28 +02:00
1f2638626c private comment added to activity 2022-04-25 14:43:44 +02:00
nobohan
5ae6c6397c storedObject: add validation in properties where it is used 2022-04-25 13:52:49 +02:00
a4baf89a6a social actions ordered in store 2022-04-21 21:05:32 +02:00
6cad0be181 Ignore thirdparty for socialaction created via activity 2022-04-20 17:08:27 +02:00
7f97215fe9 activity form: keep the same order for attendee field between edit and new form 2022-04-20 10:03:58 +02:00
6427fc64cd invert 'incoming' and 'receiving' 2022-04-20 10:00:48 +02:00
b95ff337b6 add more time duration for aside activities 2022-04-14 00:41:15 +02:00
01c571ab06 fix path to table 2022-04-11 21:04:36 +02:00
9765bc5663 fix cs 2022-04-11 17:12:59 +02:00
bb65909bfa add docgen context for a list of activities in a course 2022-04-11 16:52:11 +02:00
03b0a8766e remove dumps 2022-04-08 19:12:11 +02:00
5eea202586 fix adding sibling action 2022-04-08 19:04:13 +02:00
a78c62789c if parent in collection replace with child, problem, sibling isn't added 2022-04-08 18:56:37 +02:00
f09870931c switch to using getDescendantsWithThis() 2022-04-07 16:11:00 +02:00
ea21f2d9c4 improvement, but still not correct 2022-04-07 16:11:00 +02:00
d81a41bb17 Test added for activity-social action and social issue 2022-04-07 16:11:00 +02:00
7851d9956e csfixes 2022-04-07 16:11:00 +02:00
f35479e4d2 fix logic in activity entity 2022-04-07 16:11:00 +02:00
988b67bd4b logic added to only keep youngest descendant. works for issue, seems not to for action 2022-04-07 16:11:00 +02:00
nobohan
bc8709f9a1 activity: add spacing between buttons + better alignment 2022-03-28 14:30:49 +02:00
ea66db07a4 fix cs 2022-03-24 22:10:07 +01:00
156398caba Merge remote-tracking branch 'origin/master' into issue494_activity_field_visibility 2022-03-24 18:25:03 +01:00
02409d4992 Merge remote-tracking branch 'origin/master' into issue469_budget 2022-03-24 16:22:52 +01:00
89e7eb85ff fix cs 2022-03-22 22:36:01 +01:00
1f6565d2ef add return path when creating an activity 2022-03-21 17:59:41 +01:00
e838a82556 Merge remote-tracking branch 'origin/master' into issues546_553_554_documents_acc_period_activity 2022-03-21 17:35:10 +01:00
nobohan
9c353669ea activity: fix delete button for documents 2022-03-18 16:11:09 +01:00
nobohan
215b859725 activity: hide delete button from asyncupload and add delete buttons from chill collection 2022-03-18 15:25:45 +01:00
da67fa4c4f fix role for creating activity in person 2022-03-18 14:33:05 +01:00
nobohan
73dd97f7d3 upd CHANGELOG 2022-03-18 13:58:20 +01:00
nobohan
ba52e95253 display error messages above form when creating new Location 2022-03-08 17:21:49 +01:00
nobohan
efcc602d53 Activity form: add required class name on required field built with vue 2022-03-08 16:09:22 +01:00
nobohan
fcc5d3d349 Activity: small fixes on displaying social Issues and social Actions hidden fields 2022-03-08 15:41:03 +01:00
b1c0e18e51 Merge remote-tracking branch 'origin/master' into issue470_location_in_activity_validation 2022-03-03 13:59:44 +01:00
6edf0bcb3b fix delete links in documents 2022-03-03 13:57:00 +01:00
nobohan
dca17c409b activity: do not override location if already exist (when validating new activity) 2022-03-03 12:03:22 +01:00
695b9d5bea merge with master 2022-03-01 14:32:03 +01:00
e10a6b4bf2 Merge branch 'issue441_enfant_confie' 2022-02-28 14:37:38 +01:00
c4e0b68ebe change block personcontent to content more consistent with other templates and less need for if-statements 2022-02-24 15:59:13 +01:00
0efd3d2af3 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-18 14:46:55 +01:00
0a289e1edd Merge remote-tracking branch 'origin/master' into issue476_activity_fix_concerned_group 2022-02-17 21:11:45 +01:00
5ff47050ff replace deprecated TranslatorInterface by new one 2022-02-17 17:20:47 +01:00
nobohan
50410d190f replace PersonRender by PersonRenderInterface 2022-02-16 10:38:58 +01:00
nobohan
aa7da2559c [activity] correct associated persons by considering only open participations 2022-02-11 16:48:15 +01:00