363 Commits

Author SHA1 Message Date
a2a0f6af44 mes parcours brouillon added to usermenu 2022-02-09 15:58:54 +01:00
6b571e87b4 fix typos 2022-02-08 19:37:11 +01:00
9d660311f0 improve translation on working about houshold members 2022-02-07 20:54:06 +01:00
53e03395f2 renaming date de fermeture en date de cloture in accompanying course 2022-02-01 22:36:51 +01:00
572aa2c14e Merge remote-tracking branch 'origin/master' into issue426_household_composition 2022-02-01 18:29:02 +01:00
0854b7fc6a delete action created in controller and template 2022-02-01 12:32:34 +01:00
2c566bb21c Merge branch 'master' into 'issue428_person_resource_ameliorations'
# Conflicts:
#   CHANGELOG.md
2022-01-31 17:50:08 +00:00
170ce2d51c minor fix and renaming 2022-01-31 16:55:19 +01:00
f358e78734 onthefly button added to view person or thirdparty + badge changed if thirdparty is a contact 2022-01-31 14:39:40 +01:00
125dd4d980 Merge remote-tracking branch 'origin/master' into issue_mes_parcours 2022-01-29 02:58:32 +01:00
646f39b9ed Merge conflicts fixed 2022-01-28 12:15:51 +01:00
b9c2d63a53 mes parcours page created 2022-01-27 11:42:14 +01:00
3fd4c6339a Merge conflicts resolved 2022-01-27 11:34:57 +01:00
c70a4dc664 fix loading of evaluations 2022-01-26 21:46:07 +01:00
b38924cc3d Revert "Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles"
This reverts commit 58c4e37116511032fc08ba1e1454cf32df5dea48.
2022-01-26 16:38:58 +01:00
6e554e74ab Merge branch 'issue382_person_resource' 2022-01-26 14:43:50 +01:00
4c125865cf fix of twig if condition for person resources 2022-01-26 14:21:39 +01:00
66ac5c7435 Merge remote-tracking branch 'origin/master' into issue406_truncate_comment 2022-01-26 14:03:49 +01:00
7a78e8a6a7 fixes for pesonnes ressources 2022-01-26 14:00:45 +01:00
88d1fe24b4 Creation of PersonResource 2022-01-26 12:52:15 +00:00
7943c22ae7 comments truncated and link added to comment page 2022-01-26 12:55:48 +01:00
ecae7dab44 add placeholders for inputs 2022-01-26 12:07:39 +01:00
126bd1a4eb fix for comment embeddable null + template adjustments 2022-01-26 12:07:39 +01:00
0a6a2c968c all views created for person resource 2022-01-26 12:07:39 +01:00
94c9505c05 js files put in place + select menus added for selecting person/thirdparty/... show-hide not working yet 2022-01-26 12:07:39 +01:00
4a5a1440ff form created + general layout of templates 2022-01-26 12:06:44 +01:00
b31cc460fa route and menu entry added in person menu + start of templates/controller 2022-01-26 12:06:44 +01:00
8e2d3616b5 Merge remote-tracking branch 'origin/master' into issue383_referent_in_acc_course 2022-01-24 15:04:55 +01:00
53b3f98bba Household/composition add + fixes household composition editor 2022-01-24 10:59:00 +00:00
nobohan
25ebeebdfb accompanying course: display closed acc. period in list 2022-01-20 08:32:48 +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
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
8afd1ee275 Activity show page: move notify button and notification-box in post menu area 2022-01-10 15:14:50 +01:00
e84182cdac translations + alert message position 2022-01-10 13:08:09 +01:00
juminet
921dd639bf accompanying period: add location to accompanying period + add delete button 2022-01-10 11:03:14 +00:00
a40077e91b include AccompanyingPeriod in notification (shownInNotification) 2022-01-10 10:52:09 +01:00
bdf4b71080 Merge branch '327_pinned_comment' into notification/completion 2022-01-07 13:02:59 +01:00
1e0c62b09d Merge branch 'master' into notification/completion 2022-01-05 11:15:49 +01:00
5fead5b467 fix translation, disable throw exception 2022-01-04 11:18:56 +01:00
5bf1b9d8bd send system notification on period confirmation 2021-12-30 02:11:21 +01:00
9e67d9586d masonry: add origin bloc 2021-12-29 12:32:19 +01:00
f01b87b348 comments: form controller 2021-12-15 23:34:41 +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
8fb4efc16e Issue320 bug redirect create period 2021-12-12 14:12:44 +00:00