|
|
2102e65729
|
Merge branch 'issue180_activity_coherence' into 'master'
activity: edit an activity: choose the context based on the activity, not the url parameters
See merge request Chill-Projet/chill-bundles!226
|
2021-11-29 13:56:12 +00:00 |
|
juminet
|
975fbfbdee
|
activity: edit an activity: choose the context based on the activity, not the url parameters
|
2021-11-29 13:56:12 +00:00 |
|
|
|
3b725a8a12
|
Merge branch '295_resume_retouches' into 'master'
295 resume retouches
See merge request Chill-Projet/chill-bundles!238
|
2021-11-29 13:48:18 +00:00 |
|
|
|
5d9ceb5757
|
295 resume retouches
|
2021-11-29 13:48:18 +00:00 |
|
|
|
3c70cec396
|
merge origin/master
|
2021-11-29 14:33:29 +01:00 |
|
|
|
16b130b9a5
|
Merge remote-tracking branch 'origin/master' into issue314_suggest_persons
|
2021-11-29 14:28:39 +01:00 |
|
|
|
eee9bff711
|
remove entities which are present twice
|
2021-11-29 14:28:24 +01:00 |
|
|
|
4acedc84b0
|
vue_accourse: fix list-suggest asset for items suggestions
|
2021-11-29 13:55:38 +01:00 |
|
|
|
c64ab86f8e
|
Merge remote-tracking branch 'origin/master' into issue314_suggest_persons
|
2021-11-29 13:45:37 +01:00 |
|
|
|
bd98e9cc9b
|
Merge branch 'add_toasters' into 'master'
Display of toasts for accompanying course + general makeFetch
See merge request Chill-Projet/chill-bundles!221
|
2021-11-29 12:39:11 +00:00 |
|
|
|
d5a269356b
|
Display of toasts for accompanying course + general makeFetch
|
2021-11-29 12:39:11 +00:00 |
|
|
|
02a8c1ae10
|
Merge branch 'issue313_activity' into 'master'
activity: avoid existing entities being added in Users, ThirdParties, Persons
See merge request Chill-Projet/chill-bundles!237
|
2021-11-29 12:27:55 +00:00 |
|
juminet
|
b300858bdd
|
activity: avoid existing entities being added in Users, ThirdParties, Persons
|
2021-11-29 12:27:54 +00:00 |
|
|
|
58119b3de0
|
Merge branch 'issue297_confidential_toggle' into 'master'
confidential toggle rights
See merge request Chill-Projet/chill-bundles!227
|
2021-11-29 11:01:51 +00:00 |
|
|
|
e4e1edff68
|
confidential toggle rights
|
2021-11-29 11:01:51 +00:00 |
|
|
|
6d6f930afa
|
Merge branch 'issue307_location' into 'master'
improve location encoding
See merge request Chill-Projet/chill-bundles!230
|
2021-11-29 10:40:10 +00:00 |
|
nobohan
|
cb89fc5ef5
|
person: style list-suggest
|
2021-11-29 10:16:23 +01:00 |
|
nobohan
|
efaaa72a7e
|
upd CHANGELOG
|
2021-11-29 09:34:46 +01:00 |
|
nobohan
|
037532d13c
|
person: entities suggestion in parcours: style list
|
2021-11-29 09:31:33 +01:00 |
|
nobohan
|
60422f5eee
|
person: suggest entities for resources
|
2021-11-28 22:53:36 +01:00 |
|
nobohan
|
4abb1a7a57
|
person: suggest entities for requestor
|
2021-11-28 22:32:19 +01:00 |
|
nobohan
|
0ad7ca6235
|
person: init suggested entities in accompanying course
(working)
|
2021-11-28 22:17:00 +01:00 |
|
nobohan
|
5fab0ffe27
|
accompanying course: add resource
|
2021-11-28 21:16:48 +01:00 |
|
nobohan
|
44a09903a0
|
person: init suggested entities in accompanying course
|
2021-11-26 21:08:07 +01:00 |
|
nobohan
|
5aa5cb3e08
|
location: use fetchResults for getLocations and getLocationTypes
|
2021-11-25 17:22:25 +01:00 |
|
nobohan
|
f002d48efd
|
location: fix error when there is no defaultFor defined for locationType entities
|
2021-11-25 16:53:02 +01:00 |
|
nobohan
|
aad4b6e5d0
|
location: allow null value for defaultFor
|
2021-11-25 16:18:45 +01:00 |
|
nobohan
|
36c57511e8
|
location: fix code style with phpstan
|
2021-11-25 16:10:08 +01:00 |
|
|
|
3f35f0e251
|
add unique constraint on property validFor for LocationType
|
2021-11-25 15:40:38 +01:00 |
|
nobohan
|
09a679ffb9
|
upd CHANGELOG
|
2021-11-25 15:40:38 +01:00 |
|
nobohan
|
3d5db29a4c
|
location: filter location api point only by active and availableForUsers
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
e73179688a
|
activity: format location label for parcours location
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
2ee4a6b2ac
|
calendar: dynamic way of creating location when creating a calendar
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
220f297391
|
calendar: cast collection to array
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
d13d42b9bf
|
activity: group locations by type in the selector
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
0bd0487801
|
activity: fix the on-the-fly POSTing of the location entity
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
d27f085ac9
|
location: change display in twig
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
c7f2717676
|
activity: new activity: show address in parcours location
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
a2f6f2b5cb
|
activity: post new location on-the-fly
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
1b579f7930
|
activity: label location
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
c1a2112d48
|
activity: add location from concerned person and 3rd parties in the location selector
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
1519fcd4dd
|
activity: add location of the accompanying course
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
b808e970ab
|
activity: correct activityController after rebase
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
92e59e211d
|
activity: suggest location based on accompanying period (WIP)
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
7eeb2f2a7d
|
main: LocationType: add new property defaultFor in the admin
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
32af076986
|
main: locationType: add defaultFor property
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
e3040f4bfb
|
correct deprecated activity method
|
2021-11-25 15:39:30 +01:00 |
|
nobohan
|
1bd6df7ce2
|
correct deprecated activity method
|
2021-11-25 15:39:30 +01:00 |
|
|
|
69e260f0b1
|
Merge branch 'issue317_add_geom_to_postal_code' into 'master'
Issue317 add geom to postal code
See merge request Chill-Projet/chill-bundles!236
|
2021-11-25 13:16:36 +00:00 |
|
|
|
6d67f2706d
|
Merge branch 'feature/add-api-endpoint-for-permission'
See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
|
2021-11-25 14:15:08 +01:00 |
|
