154 Commits

Author SHA1 Message Date
416a88b93d fix form and take null cases into account 2022-05-04 12:30:44 +02:00
784a725ce3 fix translation 2022-05-04 09:34:16 +02:00
2ef3a3362a merge master into branch 2022-05-04 09:31:22 +02:00
02a8f5a863 Fix display privateComment in activity 2022-05-02 16:50:24 +02:00
4dc56db018 show of activity adjusted for private comment 2022-04-27 11:51:32 +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
7f97215fe9 activity form: keep the same order for attendee field between edit and new form 2022-04-20 10:03:58 +02: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
e838a82556 Merge remote-tracking branch 'origin/master' into issues546_553_554_documents_acc_period_activity 2022-03-21 17:35:10 +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
fcc5d3d349 Activity: small fixes on displaying social Issues and social Actions hidden fields 2022-03-08 15:41:03 +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
9553e18d83 do not uppercase/lowercase ref in activity list 2022-02-02 22:17:24 +01:00
5fef4048a4 use renderbox in activity list recent 2022-02-01 22:36:26 +01:00
79b82e09e1 add document from activity 2022-02-01 17:58:20 +01:00
c6373a075d refactor pickTemplate and adapt existing usage 2022-02-01 15:49:23 +01:00
971789d5cf Merge remote-tracking branch 'origin/master' into foldlist_in_entity 2022-01-31 15:51:21 +01:00
08c13b8c98 Merge remote-tracking branch 'origin/master' into issue412_413_activity 2022-01-31 14:22:34 +01:00
73c4a5d39d better color coherency with buttons 2022-01-30 19:45:09 +01:00
72e306b583 change add notification button color 2022-01-28 12:46:58 +01:00
nobohan
4d1a553474 show activity attendee (présence) in the activity list 2022-01-28 11:40:08 +01:00
ab23290599 refund extension_list_notification template: change place and content 2022-01-28 10:22:48 +01:00
feaee8a0b1 a few more implementations in twig templates 2022-01-28 10:07:34 +01:00
juminet
21d4e49fce activity: doc gen 2022-01-24 13:51:14 +00:00
c7dbaae8d6 105 worflow 2022-01-24 13:17:46 +00:00
54c2b92962 Improve notifications 2022-01-24 10:09:57 +00:00
juminet
256dab3739 person: add obele sign for dead persons 2022-01-19 11:23:51 +00:00
juminet
ad983d80d2 Issue374 documents in activity bug 2022-01-19 10:59:44 +00:00
3f5a6c6b15 Display of activity types 2022-01-16 22:18:16 +00:00
6c71cb0e80 Merge branch '232_resources_comment' into 'master'
232 resources comment

See merge request Chill-Projet/chill-bundles!276
2022-01-13 11:05:15 +00:00
e0ee817421 batch rename twig attribut 2022-01-12 21:36:12 +01:00
b679d833da display location type between parentheses for actions 2022-01-12 13:37:04 +01:00
479e4ffe64 add notification box in context person, page show activity 2022-01-10 17:08:56 +01:00
fded08aaaa include Activity in notification (ShowInNotification) 2022-01-10 16:01:22 +01:00
af6f3043ae activity list page: put item bloc in a separate include 2022-01-10 15:58:11 +01:00
8afd1ee275 Activity show page: move notify button and notification-box in post menu area 2022-01-10 15:14:50 +01:00
f76f7a1641 notification: handle activities 2022-01-04 17:40:47 +01:00
a8fe049ecd notification: add more variable in twig template 2022-01-04 17:00:31 +01:00
45b71b207e activity fix: display comment in list 2021-12-16 13:58:43 +01:00
f2117ea1cd improve activity new/edit twig template 2021-12-10 12:51:18 +01:00
57c4f2ee61 improve activity show twig template 2021-12-10 12:12:17 +01:00
95caa998e3 concernedGroups display badges as clickable onthefly modal 2021-12-10 12:09:50 +01:00
97165c8389 activity: set ACL (issue 292)
https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/292
2021-12-10 10:35:37 +01:00
2d1e8b2acd Cohérence graphique des listes d'activités et d'actions dans le contexte d'un parcours 2021-12-06 14:45:44 +00:00
55b9242690 [bugfix][activity form] check the presence of location / social issues /
persons fields
2021-11-29 21:57:29 +01:00