178 Commits

Author SHA1 Message Date
7943c22ae7 comments truncated and link added to comment page 2022-01-26 12:55:48 +01:00
8e2d3616b5 Merge remote-tracking branch 'origin/master' into issue383_referent_in_acc_course 2022-01-24 15:04:55 +01:00
c7dbaae8d6 105 worflow 2022-01-24 13:17:46 +00:00
53b3f98bba Household/composition add + fixes household composition editor 2022-01-24 10:59:00 +00:00
cdbae1eade bugfix in parcours display if deathdate of associated person is not defined (ex. for thirdparty) 2022-01-21 17:00:04 +01:00
nobohan
343b2a6f2f accompanying course: re-open: translations + fine-tuning 2022-01-20 08:21:09 +01:00
nobohan
d4efe81dbb person: can reopen an accompanying course 2022-01-19 21:46:40 +01:00
nobohan
040c5f8847 accompanying course: change wording for scopes 2022-01-19 16:18:04 +01:00
juminet
256dab3739 person: add obele sign for dead persons 2022-01-19 11:23:51 +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
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
782e098e31 Course resume page: hide a masonry bloc if no content (fix) 2022-01-12 17:37:49 +01:00
15342f85d3 only show current participations in parcours resumé 2022-01-12 13:39:53 +01:00
a8978a52b9 blur effect added on requestor if marked as anonymous 2022-01-12 12:05:45 +01:00
f79225fc2b Merge branch 'master' into notification/completion 2022-01-11 10:18:02 +01:00
b153fc19f6 327 pinned comment 2022-01-10 20:55:37 +00:00
46ca74fc70 Merge branch 'master' into notification/completion 2022-01-10 16:11:06 +01:00
juminet
921dd639bf accompanying period: add location to accompanying period + add delete button 2022-01-10 11:03:14 +00:00
b1cd85971a notification show page: use macro to display thread comments 2022-01-07 15:50:47 +01:00
0a3b50568d Merge branch '327_pinned_comment' into notification/completion 2022-01-07 15:25:54 +01:00
69b5c98d2e inject record_actions buttons inside macro 2022-01-07 15:24:06 +01:00
bdf4b71080 Merge branch '327_pinned_comment' into notification/completion 2022-01-07 13:02:59 +01:00
c60d46c68b put macro show_comment in a separate template 2022-01-07 12:51:03 +01:00
be4b8a94f0 AccompanyingCourse comments: move and rename files 2022-01-07 12:37:19 +01:00
a54cc70fd6 temporary disable previous commit 2022-01-07 12:34:14 +01:00
b9e5734039 bouton bleu 2022-01-05 21:16:47 +01:00
f5f5d66f3d design notification box in post menu area 2022-01-05 20:58:51 +01:00
1e0c62b09d Merge branch 'master' into notification/completion 2022-01-05 11:15:49 +01:00
f76f7a1641 notification: handle activities 2022-01-04 17:40:47 +01:00
68ea0a1086 wip delete comment 2022-01-04 12:07:37 +01:00
5fead5b467 fix translation, disable throw exception 2022-01-04 11:18:56 +01:00
7bc4ad9779 twig extension for listing notification on a given entity 2021-12-30 01:02:16 +01:00
bd909b0061 fix details and corrections 2021-12-29 14:57:18 +01:00
9e67d9586d masonry: add origin bloc 2021-12-29 12:32:19 +01:00
982dd78828 put back warnings inside condition 2021-12-29 12:15:21 +01:00
1055fd9398 masonry: raise comment bloc width 2021-12-29 12:13:39 +01:00
5089bba4d7 improve masonry bloc style 2021-12-29 12:11:20 +01:00
433307020a add a new button to send notifications 2021-12-29 10:52:15 +01:00
11824adda4 notification: create 2021-12-25 22:41:25 +01:00
f01b87b348 comments: form controller 2021-12-15 23:34:41 +01:00
3c1c07dc64 comments: edit links with anchor and parameter 2021-12-14 10:54:44 +01:00
530267a9b0 commments: add basic form in template 2021-12-14 10:31:51 +01:00
be5f54c142 comments: build list 2021-12-13 21:49:03 +01:00
d5290e4bdd create comments page, with menu entry, route and template 2021-12-13 17:25:39 +01:00
f8071d32c0 batch replace/rename initialComment by pinnedComment 2021-12-13 16:31:16 +01:00
5526790d42 diaplay initialComment on course resume page 2021-12-13 14:49:16 +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
ccff346dbb resume page: change order for masonry blocks, don't render empty blocks 2021-11-29 10:51:26 +01:00
406ec14c3d add JS masonry placement on resume page 2021-11-27 16:34:55 +01:00
d616c20534 accourse resume page: add all informations needed for activities 2021-11-27 12:24:54 +01:00