6369 Commits

Author SHA1 Message Date
3f5a6c6b15 Display of activity types 2022-01-16 22:18:16 +00:00
46c6d0e293 minor fix: } missing in template causing an error 2022-01-14 15:25:17 +01:00
bb0a04b19a Using translations instead of hardcoded 2022-01-14 14:37:50 +01:00
8d3ba314e0 adjustment badges into rounded-pill + red color for urgent 2022-01-14 14:18:37 +01:00
9e48a1db0a badges added in list view for parcours that are urgent and/or confidential 2022-01-14 13:58:56 +01: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
11d4450244 fix condition to show comment in on-the-fly 2022-01-13 11:27:36 +01:00
5a79df0e0a fix test 2022-01-12 22:34:32 +01:00
c0c2131be0 fix notification test 2022-01-12 22:22:18 +01:00
e6ea2674c2 comment console.log, remove v-bind before ':' 2022-01-12 22:13:14 +01:00
39b5ce0320 fix access to database in ci 2022-01-12 22:06:47 +01:00
e0ee817421 batch rename twig attribut 2022-01-12 21:36:12 +01:00
8159144f26 fix accesss to database on ci 2022-01-12 20:20:20 +00:00
630115fd3a update changelog 2022-01-12 20:43:17 +01:00
87cf8d737e remove dump 2022-01-12 20:38:09 +01:00
ecda740d81 on-the-fly: add a 'parent' option to pass parent context. So we could now display resource.comment below the renderbox. 2022-01-12 20:26:54 +01:00
c9e3960238 clean commented unused code 2022-01-12 17:55:00 +01:00
782e098e31 Course resume page: hide a masonry bloc if no content (fix) 2022-01-12 17:37:49 +01:00
34ff91979b emit response and commit change in store 2022-01-12 17:06:21 +01:00
abcc8557ce resources: add a WriteComment new subcomponent 2022-01-12 15:25:06 +01:00
15342f85d3 only show current participations in parcours resumé 2022-01-12 13:39:53 +01:00
b679d833da display location type between parentheses for actions 2022-01-12 13:37:04 +01:00
f8ca349d9e use renderbox to display referrer in action list item 2022-01-12 12:10:41 +01:00
a8978a52b9 blur effect added on requestor if marked as anonymous 2022-01-12 12:05:45 +01:00
b1bffd875c Undo 'add thirdparty comment in acccourse resources' (commit 62b8b3e6)
-> it was displaying wrong comment !
2022-01-12 11:19:57 +01:00
b23161fa1d Merge branch 'master' into 232_resources_comment 2022-01-12 10:11:39 +01:00
e540baaa4f fix condition when confirming delete action 2022-01-12 10:09:42 +01:00
9fe744f09f thirdparty docgen normalizer: fix return type for telephone 2022-01-12 09:39:15 +01:00
6b1310148f notification: fix test 2022-01-11 11:24:11 +01:00
1650f30a59 upgrade app 2022-01-11 11:22:46 +01:00
f6386a13ac fix cs 2022-01-11 11:05:42 +01:00
e437705714 composer deps symfony/mime, change version 2022-01-11 10:29:00 +01:00
f79225fc2b Merge branch 'master' into notification/completion 2022-01-11 10:18:02 +01:00
7564c2fde1 AccompanyingPeriodResource: add ACL 2022-01-10 23:12:52 +01:00
2c4d06371c AccompanyingPeriodResource: fix deserialization + code style 2022-01-10 23:08:23 +01:00
8e012982f5 Merge remote-tracking branch 'origin/master' into 232_resources_comment 2022-01-10 21:56:36 +01:00
ba893e8429 Merge branch '327_pinned_comment' into 'master'
327 pinned comment

See merge request Chill-Projet/chill-bundles!279
2022-01-10 20:55:37 +00:00
b153fc19f6 327 pinned comment 2022-01-10 20:55:37 +00:00
098c2fbaa0 Merge remote-tracking branch 'origin/master' into 232_resources_comment 2022-01-10 21:50:00 +01:00
479e4ffe64 add notification box in context person, page show activity 2022-01-10 17:08:56 +01:00
42a14fbd6b AccompanyingPeriod list: manage context entity variable in record_actions buttons (TO BE CHECKED)
Need to pass context entity in record_actions buttons to use variables like 'person' !
2022-01-10 16:55:01 +01:00
46ca74fc70 Merge branch 'master' into notification/completion 2022-01-10 16:11:06 +01:00
ae931b5869 update changelog 2022-01-10 16:04:04 +01:00
fded08aaaa include Activity in notification (ShowInNotification) 2022-01-10 16:01:22 +01:00
d60938352b notification: add selector on title, move styles 2022-01-10 15:59:36 +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
5a739380cd force ShowInNotification background (for odd gray container) 2022-01-10 14:36:58 +01:00
a1ec2b637d ShownInNotification: put border on alert block 2022-01-10 14:36:27 +01:00
584b77bbf4 accourse resume page: fix masonry block border 2022-01-10 14:36:27 +01:00