|
|
866bcec114
|
Merge remote-tracking branch 'origin/master'
|
2022-03-24 20:53:10 +01:00 |
|
|
|
f04474c82f
|
Merge branch 'issue494_activity_field_visibility' into 'master'
Activity display fields based on ActivityType + show error message
See merge request Chill-Projet/chill-bundles!376
|
2022-03-24 17:29:38 +00:00 |
|
|
|
156398caba
|
Merge remote-tracking branch 'origin/master' into issue494_activity_field_visibility
|
2022-03-24 18:25:03 +01:00 |
|
|
|
ae3091f620
|
Merge branch 'issue469_budget' into 'master'
Adapt BudgetBundle to Vendee
See merge request Chill-Projet/chill-bundles!357
|
2022-03-24 17:23:26 +00:00 |
|
|
|
84f9fdba28
|
add budget to docgen
|
2022-03-24 18:22:49 +01:00 |
|
|
|
531f940b65
|
add a debug feature in docgenerator template controller
|
2022-03-24 18:22:36 +01:00 |
|
|
|
d907f3f11b
|
desactivate calculator in current budget for household
|
2022-03-24 16:29:13 +01:00 |
|
|
|
02409d4992
|
Merge remote-tracking branch 'origin/master' into issue469_budget
|
2022-03-24 16:22:52 +01:00 |
|
|
|
771b6a59a5
|
Merge branch 'issue519_filiation_create_person' into 'master'
Add person to filiation
See merge request Chill-Projet/chill-bundles!392
|
2022-03-24 14:08:54 +00:00 |
|
|
|
2e336ac874
|
update case when the person was already on the graph
|
2022-03-24 15:07:46 +01:00 |
|
|
|
f9d87876f2
|
Merge remote-tracking branch 'origin/master' into issue519_filiation_create_person
|
2022-03-24 11:12:56 +01:00 |
|
|
|
7df70cab98
|
allow a user/referrer to see his own courses, even if the scope is not his own
|
2022-03-24 10:58:43 +01:00 |
|
|
|
cba6394823
|
Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles
|
2022-03-24 09:10:53 +01:00 |
|
|
|
eea0711a04
|
autowire sectionmenu service
|
2022-03-24 09:10:32 +01:00 |
|
|
|
949bdfd993
|
add missing property (phpstanerror)
|
2022-03-23 22:59:45 +01:00 |
|
|
|
3067da5d24
|
fix tests for removing temporarily resources on person
|
2022-03-23 22:56:45 +01:00 |
|
|
|
546c925224
|
Enforce a limit for search results when searching through api
|
2022-03-23 22:51:45 +01:00 |
|
|
|
d7b5944c5f
|
temporarily desactivate resources for docgen
|
2022-03-23 22:51:45 +01:00 |
|
|
|
aa234e0749
|
activity annexe button made sticky
|
2022-03-23 17:33:23 +01:00 |
|
|
|
e89489fde9
|
update changelog
|
2022-03-23 15:04:52 +01:00 |
|
|
|
a7be9c0a83
|
Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles
|
2022-03-23 14:59:44 +01:00 |
|
|
|
6331d8fd3e
|
validation fix for person ressource
|
2022-03-23 14:59:30 +01:00 |
|
nobohan
|
eb6790b17d
|
quick fix: missing translation
|
2022-03-23 14:58:09 +01:00 |
|
|
|
61f010f5ad
|
Merge branch 'issue507_conditional_menu_entries' into 'master'
Options added for section menu entries
See merge request Chill-Projet/chill-bundles!391
|
2022-03-23 13:23:32 +00:00 |
|
|
|
30fd36b741
|
forgotten translation added
|
2022-03-23 14:16:38 +01:00 |
|
|
|
91aacb91cc
|
merge master into branch
|
2022-03-23 14:07:26 +01:00 |
|
|
|
73c17febd9
|
remove inter database reference
|
2022-03-23 00:05:36 +01:00 |
|
|
|
99dc9dd4a8
|
handle case when user is null in comment embeddable
|
2022-03-22 23:36:02 +01:00 |
|
|
|
c5ffca22ff
|
ease docgen normlisation for resources
|
2022-03-22 22:37:19 +01:00 |
|
|
|
89e7eb85ff
|
fix cs
|
2022-03-22 22:36:01 +01:00 |
|
|
|
98d5de29b0
|
translations added
|
2022-03-22 16:09:03 +01:00 |
|
|
|
4939c8c8e4
|
changelog updated
|
2022-03-22 15:50:31 +01:00 |
|
|
|
8d5c66dc40
|
person can be added to filiation graph and relationship created
|
2022-03-22 15:49:25 +01:00 |
|
|
|
6d65009987
|
Merge remote-tracking branch 'origin/master'
|
2022-03-21 18:05:38 +01:00 |
|
|
|
386e88387d
|
Merge branch 'issue560_ACCent_parcours_household' into 'master'
Create parcours from within household context
See merge request Chill-Projet/chill-bundles!390
|
2022-03-21 17:05:00 +00:00 |
|
|
|
22473d6547
|
Merge remote-tracking branch 'origin/master' into issue560_ACCent_parcours_household
|
2022-03-21 18:01:26 +01:00 |
|
|
|
e7b4f1a54f
|
Merge branch 'issues546_553_554_documents_acc_period_activity' into 'master'
issues553_554_documents_activity
See merge request Chill-Projet/chill-bundles!389
|
2022-03-21 17:00:21 +00:00 |
|
|
|
1f6565d2ef
|
add return path when creating an activity
|
2022-03-21 17:59:41 +01:00 |
|
|
|
e838a82556
|
Merge remote-tracking branch 'origin/master' into issues546_553_554_documents_acc_period_activity
|
2022-03-21 17:35:10 +01:00 |
|
|
|
eebca7b0f1
|
Merge branch 'issue517_extend_document_to_person_vendee' into 'master'
commentembeddable: add a condition for the early return in normalisation
See merge request Chill-Projet/chill-bundles!388
|
2022-03-21 16:33:23 +00:00 |
|
|
|
169d4dc41c
|
finalize normalization on ressources
|
2022-03-21 17:33:01 +01:00 |
|
|
|
5b0b15f395
|
Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles
|
2022-03-21 16:23:16 +01:00 |
|
|
|
736d43e756
|
translation fixed
|
2022-03-21 16:23:06 +01:00 |
|
|
|
b4add2de95
|
Merge remote-tracking branch 'origin/master' into issue517_extend_document_to_person_vendee
|
2022-03-21 16:20:03 +01:00 |
|
|
|
37a8928e41
|
remove dump
|
2022-03-21 16:19:27 +01:00 |
|
|
|
0a0243eb85
|
Merge branch 'issue511_document_evaluations' into 'master'
AccompanyingCourseWorkEdit: replace document by a new one, fix deleting
See merge request Chill-Projet/chill-bundles!384
|
2022-03-21 15:17:34 +00:00 |
|
|
|
a6c7c1d997
|
fix tests for user
|
2022-03-21 16:17:19 +01:00 |
|
|
|
c7caa2ba76
|
addpersons component, doesnt hear emitted event...
|
2022-03-21 16:13:02 +01:00 |
|
|
|
2ce8b1110d
|
allow to change color for asyncupload button
|
2022-03-21 16:13:02 +01:00 |
|
|
|
11d57094e8
|
fix cs
|
2022-03-21 15:22:40 +01:00 |
|
