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
9e063180bf
forgotten translation
2022-03-21 16:37:14 +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
704392a729
do not add referrer if user is null (fix condition)
2022-03-21 15:21:29 +01:00
efeda81e05
do not add referrer if user is null
2022-03-21 15:17:33 +01:00
ae5940eb48
Merge remote-tracking branch 'origin/master' into issue511_document_evaluations
2022-03-21 15:00:40 +01:00
638ae3315f
Merge branch 'issue509_parcours_referent' into 'master'
...
Reassign parcours of absent user
See merge request Chill-Projet/chill-bundles!387
2022-03-21 13:58:33 +00:00
ac9e55e2fc
fix methods for accompanying period repository acl aware
...
* add method to interface
* delegate ACL to another method
2022-03-21 14:54:01 +01:00
293efc03b4
fixes for reasign list
...
* use existing method in UserRepository and use a method instead of
building a query outside of the repository;
* use renderString to render users
* fix building of filter form (add $data). This make the use of the
method "get" instead of post
2022-03-21 13:35:14 +01:00
f084078cf2
Merge remote-tracking branch 'origin/master' into issue509_parcours_referent
2022-03-21 12:59:24 +01:00
c8a66f008e
Merge branch 'issue502_user_in_actions' into 'master'
...
Issue502 referres in AccompanyingPeriodWork
See merge request Chill-Projet/chill-bundles!381
2022-03-21 11:55:24 +00:00
b6b6c25b3b
adapt queries for listing near recents evaluation and work on homepage, taking care of referrers
2022-03-21 12:54:50 +01:00
cb35aed202
use remove-items UI api for listing referrers
2022-03-21 12:45:20 +01:00
eebe1d669a
first commit
2022-03-21 12:39:33 +01:00
8f462da627
fix cs
2022-03-21 12:32:46 +01:00
3aaecc8630
set creator as referrer for works
2022-03-21 12:32:40 +01:00
9b97b03d42
csfixes
2022-03-21 12:16:49 +01:00
bdb07a3a05
options added to create person or parcours and to access global history
2022-03-21 12:10:03 +01:00
2fda5b751b
Merge remote-tracking branch 'origin/master' into issue502_user_in_actions
2022-03-21 11:53:21 +01:00
ddb048daca
Merge branch 'issue479_admin_user' into 'master'
...
user admin
See merge request Chill-Projet/chill-bundles!372
2022-03-21 10:47:43 +00:00
ac42de7863
Merge branch 'fix-test-2022-03-21'
2022-03-21 11:46:48 +01:00
2c55cfe1dc
by default, translate menu items
2022-03-21 11:41:16 +01:00
3ba3498892
Merge remote-tracking branch 'origin/master' into issue479_admin_user
2022-03-21 11:36:28 +01:00
99276dc41c
fix cs
2022-03-21 11:35:50 +01:00
fced8ef4b7
try to fix test with null id
2022-03-21 11:34:54 +01:00
a06a0788c1
csfixes
2022-03-21 10:22:28 +01:00
5a8291dc87
merge master into branch
2022-03-21 10:21:59 +01:00
15af0203ff
add menu entry in section menu
2022-03-21 10:21:12 +01:00
7006196691
csfixes
2022-03-21 09:54:53 +01:00
5cbe14464d
fix in view template to display firstname + lastname in title if it exists
2022-03-21 09:53:59 +01:00
2463a492c8
merge master into branch
2022-03-21 09:40:39 +01:00
72f69f0f82
changelog updated
2022-03-19 12:11:49 +01:00
a2daeff384
csfixes
2022-03-19 12:10:47 +01:00
caaa25ef8e
controller action to create parcours from within household + link added in template
2022-03-19 12:08:20 +01:00
ff5aeaae17
translation changed in action evaluation section
2022-03-19 11:32:16 +01:00
