ddbd6a9f23
Merge branch 'improvements_acitivite_annexe' into 'master'
...
Improvements acitivite annexe
See merge request Chill-Projet/chill-bundles!153
2021-10-04 14:48:37 +00:00
b5eaea0e88
Merge branch 'fixes/aside-activities-before-integration' into 'improvements_acitivite_annexe'
...
Fixes/aside activities before integration
See merge request Chill-Projet/chill-bundles!165
2021-10-04 14:35:14 +00:00
ed8a569fea
remove obsolete test
2021-10-04 16:30:08 +02:00
c41bc7bef9
prevent recursion
2021-10-04 16:16:34 +02:00
27dea97bc6
fixes minor for admin aside activity
2021-10-04 15:55:35 +02:00
27125b838e
various minor fixes in aside activities
2021-10-04 15:15:26 +02:00
369a29af48
accompanying course work, specific render for list page or resume page (wip)
2021-10-04 14:22:27 +02:00
4c55631297
Merge conflicts in translations.yaml resolved.
...
# Conflicts:
# src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
# src/Bundle/ChillMainBundle/translations/messages.fr.yml
2021-10-04 11:22:03 +00:00
cd6dec5082
Display of aside activity title styling changed from badge to normal title display
2021-10-04 12:11:27 +02:00
152a7de1dc
section menu entries de-activated for role_admin
2021-10-04 12:09:26 +02:00
da19f68440
Title display of aside activities adjusted to display full title (parent > child > ...) Styling to be discussed
2021-10-04 11:20:07 +02:00
e895125d12
view template replaced by CRUD view template
2021-10-04 10:47:09 +02:00
fe9b76a1fb
Merge remote-tracking branch 'origin/master'
2021-10-04 10:17:32 +02:00
baf9251000
update changelog
2021-10-04 10:17:13 +02:00
665b38d166
fix details (translations, etc.)
2021-10-04 09:50:05 +02:00
9450d34af0
Merge branch 'fix/center-type-show-hidden-when-no-center-reachable' into 'master'
...
[CenterType] switch to hidden type with null value when no center is reachable
See merge request Chill-Projet/chill-bundles!162
2021-10-03 19:23:24 +00:00
42301c9df7
Merge branch 'master' into 'fix/center-type-show-hidden-when-no-center-reachable'
...
# Conflicts:
# CHANGELOG.md
2021-10-03 19:19:04 +00:00
eb1a7b2374
Merge branch 'fix/household-summary-show-comment-when-no-address' into 'master'
...
[household summary] show comment form even if no address are registered
See merge request Chill-Projet/chill-bundles!163
2021-10-03 19:17:44 +00:00
7f661f9022
Merge branch 'master' into 'fix/household-summary-show-comment-when-no-address'
...
# Conflicts:
# CHANGELOG.md
2021-10-03 19:17:35 +00:00
178ffdf6bf
Merge branch 'feature/add-requestor-in-search-results' into 'master'
...
Feature/add requestor in search results
See merge request Chill-Projet/chill-bundles!161
2021-10-03 19:16:35 +00:00
5f0238f614
Merge branch 'master' into 'feature/add-requestor-in-search-results'
...
# Conflicts:
# CHANGELOG.md
2021-10-03 19:16:17 +00:00
cfaa64884d
Merge branch 'fix/accept-sms-not-required' into 'master'
...
[person form] accept sms is not required
See merge request Chill-Projet/chill-bundles!160
2021-10-03 19:14:34 +00:00
faba2b67eb
updating changelog
2021-10-01 21:20:19 +02:00
a981661ea5
resume, list associated_persons : improve design, hover effects
2021-10-01 21:14:27 +02:00
3a3baa79c8
resume: list associated persons sorted by household. add method in entity
2021-10-01 20:48:45 +02:00
e35f002f2b
improvements based on draft review of MR 153
2021-10-01 19:05:03 +02:00
fbd17a1de6
OnTheFly: adding displayBadge option to replace button by badge
...
When using displayBadge=true, you need to pass buttonText=string with badge content.
Limitation: onTheFly cannot use directly PersonRenderBox to display badge,
because it don't have person object in props !
2021-10-01 18:46:25 +02:00
77d86d3836
[household summary] show comment form even if no address are registered
2021-10-01 16:53:27 +02:00
eb11597f9c
[CenterType] switch to hidden type with null value when no center is
...
reachable
2021-10-01 16:38:35 +02:00
daa8b03c8b
Merge branch 'onTheFly' into resume_accourse
2021-10-01 14:11:32 +02:00
9ee679a3b3
fix vue syntax error
2021-10-01 14:11:03 +02:00
8791c78426
Merge branch 'onTheFly' into resume_accourse
2021-10-01 14:07:37 +02:00
abd60f7ddf
resume: include _insert_vue_onthefly template
2021-10-01 14:06:15 +02:00
75348f6ba7
otf: add data attributes and pass them in vue component
2021-10-01 14:03:58 +02:00
75a06d6896
Merge branch 'onTheFly' into resume_accourse
2021-10-01 13:12:03 +02:00
65782d3a6b
fix js syntax
2021-10-01 13:11:34 +02:00
1dc01fa8e2
create OnTheFly rootComponent structure, and twig include template to insert it
2021-10-01 13:08:12 +02:00
db9a203df0
otf: prepare to create vue root component: moving files
2021-10-01 12:18:40 +02:00
2a7e3c0334
resume: display associated persons from accourse
2021-10-01 11:55:32 +02:00
ad72904aa9
resume accourse: simplify alerts with simple link to edit page
2021-10-01 11:41:02 +02:00
0b57b3c74d
Merge branch 'master' into onTheFly
2021-10-01 11:38:15 +02:00
8c0abbc5cd
updating changelog
2021-10-01 11:37:06 +02:00
c42b7c014b
udpate changelog [ci-skip]
2021-10-01 11:00:25 +02:00
0d5d4b3f05
add accompanying period where the person is requestor + badge in results
2021-10-01 09:50:13 +02:00
a3e43fcaaa
[person form] accept sms is not required
2021-09-30 23:27:56 +02:00
4047399b76
otf: comments to remember things to improve
2021-09-30 21:22:28 +02:00
4c9d352c46
otf: post/patch thirdparty ok, with addAddress creation/edition
2021-09-30 21:11:51 +02:00
a316cb9568
otf: manage address in edit/create form (wip)
2021-09-30 15:46:34 +02:00
14539f6f88
Merge branch 'onTheFly' into thirdparty
2021-09-30 15:13:03 +02:00
92e6506ecb
tp: adapt controller/entity/formtype to works with new ACL (TO BE CHECKED)
...
* rename type by types -> getTypes() getter
* adapt controller to fix centers errors
* remove voteOnAttribute return always true in voter
2021-09-30 15:03:47 +02:00
