75dda5b999
userpicker: fix role type: adapt on both allowed types
2021-12-15 22:14:20 +01:00
46ecab24c2
update changelog
2021-12-15 22:14:20 +01:00
45c608cd48
AddPerson: optimize request while searching
...
* wait for a person to finish to type: delay before launching request;
* cancel previous requests, if any
2021-12-15 22:14:20 +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
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
de262bbc28
civility::order: replace int by a float
2021-12-13 14:12:48 +01:00
133e4858dc
household_member_editor: fix translation for onthefly and address modal, fix button appearance
2021-12-13 13:54:29 +01:00
2bafdd9e62
Merge branch 'fix/236-update-social-work-metadata-importer' into 'master'
...
Update Social Work Metadata importer
Closes champs-libres/departement-de-la-vendee/chill#236
See merge request Chill-Projet/chill-bundles!190
2021-12-13 12:49:03 +00: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
4a465b8f78
upd CHANGELOG
2021-12-13 12:39:09 +01:00
nobohan
eaf7ae6f2f
php cs fixer
2021-12-13 12:38:18 +01:00
nobohan
b5178c3be3
main: add order field to civility
2021-12-13 12:35:17 +01:00
nobohan
4b432c64b0
php cs fixer
2021-12-13 11:07:30 +01:00
nobohan
8493a64794
upd CHANGELOG
2021-12-13 11:05:46 +01:00
nobohan
82c027fe2a
add the current location of the user as API point + add it in the activity location list
2021-12-13 11:04:10 +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
20c4d07668
fix of aside activity category creation
2021-12-13 10:05:51 +01:00