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
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
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
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
ff5aeaae17
translation changed in action evaluation section
2022-03-19 11:32:16 +01:00
184a664bf9
english text translated in thirdparty view page
2022-03-19 11:25:56 +01:00
nobohan
dbc604d84a
AccompanyingCourseWorkEdit: download existing documents
2022-03-18 17:02:35 +01:00
nobohan
9c353669ea
activity: fix delete button for documents
2022-03-18 16:11:09 +01:00
8d92cc0ba7
remove history from menus, temporarily
2022-03-18 15:40:01 +01:00
nobohan
215b859725
activity: hide delete button from asyncupload and add delete buttons from chill collection
2022-03-18 15:25:45 +01:00
da67fa4c4f
fix role for creating activity in person
2022-03-18 14:33:05 +01:00
5b4c3ae9b3
Merge branch 'issue503_workflow_document_template' into 'master'
...
Workflow document template
See merge request Chill-Projet/chill-bundles!382
2022-03-18 13:24:40 +00:00
fdb36ab047
add document title to workflow EvaluationDocument handler
2022-03-18 14:18:47 +01:00
a1b1e6bb17
Merge remote-tracking branch 'origin/master' into issue503_workflow_document_template
2022-03-18 14:01:43 +01:00
nobohan
73dd97f7d3
upd CHANGELOG
2022-03-18 13:58:20 +01:00
bfd51c6615
allow downloads in LO editor
2022-03-18 13:55:33 +01:00
nobohan
b84e161399
quick fix css class in acc period evaluation form, issue client 557
2022-03-18 12:35:14 +01:00
nobohan
3b8c329ff6
upd CHANGELOG
2022-03-17 19:08:13 +01:00
nobohan
e7299bac4a
person: add person ressource to person docgen normaliser
2022-03-17 19:07:11 +01:00
Marc Ducobu
80d518e4af
Merge branch 'fixdataimportcp4digits' into 'master'
...
Fix pbm importing CP from France on 4 digits
See merge request Chill-Projet/chill-bundles!386
2022-03-17 17:44:39 +00:00
Marc Ducobu
730762d1c6
Merge branch 'master' into fixdataimportcp4digits
2022-03-17 18:37:00 +01:00
