692 Commits

Author SHA1 Message Date
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
nobohan
01a3af694a activity: can click through the cross icon for removing person in concerned group 2022-02-11 15:49:49 +01:00
nobohan
4185b660cc AddPersons: remove ul-li html tags from AddPersons 2022-02-03 16:17:05 +01:00
9a9ed64298 fix on test after creating an activity without generating a document 2022-02-03 12:54:44 +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
0ac9f2df8c fix loading of file template 2022-02-01 21:20:11 +01:00
fcff4bf863 fix phpcs 2022-02-01 18:01:34 +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
a612d7dd9f improve workflow decision form 2022-02-01 12:19:51 +01:00
Pol Dellaiera
0f31a49890
fix: Update namespace to prevent having issues with PSR4 autoloading. 2022-02-01 09:10:32 +01:00
971789d5cf Merge remote-tracking branch 'origin/master' into foldlist_in_entity 2022-01-31 15:51:21 +01:00
44183957b8 Merge remote-tracking branch 'origin/master' into homepage/rewrite 2022-01-31 15:36:53 +01:00
08c13b8c98 Merge remote-tracking branch 'origin/master' into issue412_413_activity 2022-01-31 14:22:34 +01:00
90d0cbc3b1 Merge remote-tracking branch 'origin/master' into issue389_add_age 2022-01-31 11:44:55 +01:00
73c4a5d39d better color coherency with buttons 2022-01-30 19:45:09 +01:00
2cd51eed2e Merge remote-tracking branch 'origin/master' into homepage/rewrite 2022-01-28 14:13:28 +01:00
72e306b583 change add notification button color 2022-01-28 12:46:58 +01:00
646f39b9ed Merge conflicts fixed 2022-01-28 12:15:51 +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
nobohan
33f393203e activity admin: change validation rule for social action visible field 2022-01-27 19:43:08 +01:00
6aa1e136b4 fix bug when suggested person is thirdparty 2022-01-27 18:14:32 +01:00
juminet
445fe0cee4 activity: order activities by date and by id 2022-01-27 16:12:07 +00:00
0378df42b6 fix cs 2022-01-27 17:08:00 +01:00