6172 Commits

Author SHA1 Message Date
1a604ecf65 Merge branch 'master' into divers 2021-12-14 18:32:12 +01:00
da7bfa8a4e thirdparty: fix denormalization of thirdparty 2021-12-14 15:46:55 +01:00
d3127bed6d thirdparty: add address on kind = contact 2021-12-14 14:57:11 +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
f9dd1c5231 fix cs 2021-12-13 22:57:50 +01:00
f2fd30b690 add ordering to social issue and social action 2021-12-13 22:48:54 +01:00
3d3cc9aeb4 fix import 2021-12-13 22:19:05 +01:00
8b2a8544b8 form type and controller, wip 2021-12-13 21:58:56 +01:00
be5f54c142 comments: build list 2021-12-13 21:49:03 +01:00
1fbe044729 update schema: an evaluation may be linked to multiple actions 2021-12-13 21:42:29 +01:00
60032c96f7 update changelog and cs-fixer 2021-12-13 19:43:07 +01:00
976f2fd41a fix thirdparty renderbox after merge 2021-12-13 19:37:19 +01:00
19741530bf Corrections after merge (double declares) 2021-12-13 19:24:21 +01:00
6e079fa771 Fix bug remove associated party in activity form 2021-12-13 19:24:03 +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
5b531a0529 improve docgen wip 2021-12-13 19:04:37 +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
64015479b1 improve docgen, trnslations, admin 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
3973cdd3f6 update changelog [ci-skip] 2021-12-13 16:19:32 +01:00
52a137ee77 thirdparty: no need to burst the code: complete commit 1efdade38 2021-12-13 15:46:02 +01:00
985d8f0eae thirdparty form: clean builder, and test if this kind input address 2021-12-13 15:33:43 +01:00
13a1ab380e fix import social work metadata: use child social issue if any 2021-12-13 15:03:30 +01:00
041655d26e update changelog [ci-skip] 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
5526790d42 diaplay initialComment on course resume page 2021-12-13 14:49:16 +01:00
cc849e279d fix column name 2021-12-13 14:38:33 +01:00
550b4775bf behavior and style changed for adding motifs,obectifs, dispositifs 2021-12-13 14:32:59 +01:00
de262bbc28 civility::order: replace int by a float 2021-12-13 14:12:48 +01:00