|
19741530bf
|
Corrections after merge (double declares)
|
2021-12-13 19:24:21 +01:00 |
|
|
8c14232a91
|
Conflict resolved after rebase
|
2021-12-13 19:16:53 +01:00 |
|
|
a983b34f0d
|
styling adjusted
|
2021-12-13 19:06:27 +01:00 |
|
|
4970cf000e
|
behavior and style changed for adding motifs,obectifs, dispositifs
|
2021-12-13 19:06:27 +01:00 |
|
|
1422ddeb2a
|
restyling and deleting of console.logs
|
2021-12-13 19:06:27 +01:00 |
|
|
9afc8c64ad
|
stylefix
|
2021-12-13 19:06:27 +01:00 |
|
|
200f1749f1
|
patchOnTheFly action added to store, bug in posting thirdparty though
|
2021-12-13 19:06:27 +01:00 |
|
|
4645ede7d1
|
social issue added to title
|
2021-12-13 19:06:27 +01:00 |
|
|
6016038813
|
add modal to confirm delete action + delete button changed
|
2021-12-13 19:06:06 +01:00 |
|
|
d40b0e88ed
|
change of masquer message, removal double import
|
2021-12-13 19:06:06 +01:00 |
|
|
f26863487b
|
fix badge mixin
|
2021-12-13 19:06:06 +01:00 |
|
|
a25123ee38
|
add docgen:normalization for relation
|
2021-12-13 19:03:42 +01:00 |
|
|
2524229941
|
docgen normalization for relation
|
2021-12-13 19:03:22 +01:00 |
|
|
119a9981af
|
Using thirdparty renderbox to display intervening thirdparties
|
2021-12-13 19:02:26 +01:00 |
|
|
decc18596b
|
minor adjustment to allow for action title banner with correct colors
|
2021-12-13 19:01:36 +01:00 |
|
|
eea72c9bcd
|
fix after rebase
|
2021-12-13 19:01:36 +01:00 |
|
|
717b71ff54
|
first commit
|
2021-12-13 19:01:36 +01:00 |
|
|
18fa4eb586
|
fix tests (wip)
|
2021-12-13 19:00:13 +01:00 |
|
|
47574f82aa
|
fix code style
|
2021-12-13 19:00:13 +01:00 |
|
|
12309ca1b5
|
fix tests (wip)
|
2021-12-13 18:59:43 +01:00 |
|
|
20c95a179d
|
first commit
|
2021-12-13 18:58:17 +01:00 |
|
|
d5290e4bdd
|
create comments page, with menu entry, route and template
|
2021-12-13 17:25:39 +01:00 |
|
|
f4396459a0
|
comments: add isPinned() method
|
2021-12-13 16:42:41 +01:00 |
|
|
f8071d32c0
|
batch replace/rename initialComment by pinnedComment
|
2021-12-13 16:31:16 +01:00 |
|
|
4dc490beb7
|
change public function to protected function
|
2021-12-13 14:57:36 +00:00 |
|
|
13a1ab380e
|
fix import social work metadata: use child social issue if any
|
2021-12-13 15:03:30 +01:00 |
|
|
6e412117d3
|
Merge branch 'issue324_civility_order' into 'master'
main: add order field to civility
See merge request Chill-Projet/chill-bundles!265
|
2021-12-13 14:00:55 +00:00 |
|
nobohan
|
bbebaa9fae
|
household member editor: comment markNoAddress button
|
2021-12-13 14:58:01 +01:00 |
|
|
5526790d42
|
diaplay initialComment on course resume page
|
2021-12-13 14:49:16 +01:00 |
|
nobohan
|
159dba0dc3
|
household member editor: do not add in new members if the member is included in the members of household
|
2021-12-13 14:36:08 +01:00 |
|
|
550b4775bf
|
behavior and style changed for adding motifs,obectifs, dispositifs
|
2021-12-13 14:32:59 +01:00 |
|
nobohan
|
f2c724726a
|
household member editor: fix show other household warning + wording
|
2021-12-13 14:16:01 +01:00 |
|
|
133e4858dc
|
household_member_editor: fix translation for onthefly and address modal, fix button appearance
|
2021-12-13 13:54:29 +01:00 |
|
|
d01eaa8065
|
various fixes
|
2021-12-13 13:48:20 +01:00 |
|
|
b3ee745479
|
fix vue translation
|
2021-12-13 12:44:47 +01:00 |
|
nobohan
|
b5178c3be3
|
main: add order field to civility
|
2021-12-13 12:35:17 +01:00 |
|
nobohan
|
13faf6fe5a
|
household member editor: display when a concerned person already belongs to a household
|
2021-12-13 12:19:23 +01:00 |
|
nobohan
|
da12aedb53
|
household: redirect to the household page when a household is created from a person
|
2021-12-13 11:19:29 +01:00 |
|
nobohan
|
af87b3f6da
|
household: add onthefly translations
|
2021-12-13 11:19:29 +01:00 |
|
nobohan
|
872090e02a
|
household: change translations + add address i18n in household component
|
2021-12-13 11:19:29 +01:00 |
|
|
fdae6c106a
|
Merge remote-tracking branch 'origin/master' into fix/236-update-social-work-metadata-importer
|
2021-12-13 11:01:19 +01:00 |
|
|
1fff9ef535
|
stylefix
|
2021-12-13 10:10:05 +01:00 |
|
|
7f2e3ee8e2
|
fix filiation error with gender undefined (#331)
|
2021-12-13 09:45:46 +01:00 |
|
|
d7db8400d2
|
accompanyingCourse list: display badges as clickable onthefly modal
|
2021-12-13 09:30:34 +01:00 |
|
|
16b3be322a
|
actions list: display badges as clickable onthefly modal
|
2021-12-13 09:30:34 +01:00 |
|
|
6e1340be27
|
Merge branch 'master' into 292_activity_acl
|
2021-12-13 09:21:32 +01:00 |
|
|
118b208f68
|
Merge branch 'master' into 292_activity_acl
|
2021-12-13 09:13:43 +01:00 |
|
|
c049a0b78b
|
Badge-thirdparty
|
2021-12-12 14:51:42 +00:00 |
|
juminet
|
7e045e964a
|
fix some person issues
|
2021-12-12 14:39:59 +00:00 |
|
|
8fb4efc16e
|
Issue320 bug redirect create period
|
2021-12-12 14:12:44 +00:00 |
|