d588c36308
Merge branch '327_pinned_comment' into issue321_layout_improvements_actionForm
2021-12-16 21:41:22 +01:00
91bee4aad3
wip goal-result on resume page
2021-12-16 18:55:21 +01:00
45b71b207e
activity fix: display comment in list
2021-12-16 13:58:43 +01:00
f01b87b348
comments: form controller
2021-12-15 23:34:41 +01:00
ecbe30ae53
person create button style changed to full width + update changelog
2021-12-15 14:21:31 +01:00
4e8492db70
Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles
2021-12-15 00:15:24 +01:00
48f62a2a17
refund template design for person household_history
2021-12-15 00:14:31 +01:00
decc74c040
Merge branch 'issue332_location_activity' into 'master'
...
fix: add availableForUsers condition from locationType in the location API endpoint
See merge request Chill-Projet/chill-bundles!264
2021-12-14 22:28:09 +00:00
de790d11a8
activity/location: refactor
...
Refactor the way for loading locations:
* fix showing the default location
* fix when there is not thirdparty default location
* separate api queries instead of inlines;
* use the store instead of the mounted
* refactored for a possible re-use in calendar
2021-12-14 23:20:47 +01:00
3a9fac08c3
Merge remote-tracking branch 'origin/master' into issue332_location_activity
2021-12-14 19:55:16 +01:00
f4fe297765
Merge branch 'issue336_internal_create_action_fixes' into 'master'
...
Issue336 internal create action fixes
See merge request Chill-Projet/chill-bundles!268
2021-12-14 18:48:31 +00:00
264bd76461
Issue336 internal create action fixes
2021-12-14 18:48:31 +00:00
45bcb27b79
Merge branch 'master' into fixes/thirdparty
2021-12-14 18:42:25 +01:00
cf22a49487
Merge branch 'master' into 327_pinned_comment
2021-12-14 18:40:12 +01:00
e71e369f15
temporary disable comment page in menu
2021-12-14 18:39:22 +01:00
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
