|
|
aca1d1f9e9
|
Merge branch 'master' into 295_resume_retouches
|
2021-11-29 15:43:16 +01:00 |
|
|
|
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 |
|
|
|
f58df2a25a
|
update changelog
|
2021-11-29 12:35:05 +01:00 |
|
|
|
ed38322218
|
Merge branch '_concernedgroups_twig_' into 295_resume_retouches
|
2021-11-29 12:29:57 +01:00 |
|
|
|
be71decee5
|
concernedGroups.html.twig check if block isVisible, count block and adjust width
|
2021-11-29 12:29:15 +01: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 |
|
|
|
ccff346dbb
|
resume page: change order for masonry blocks, don't render empty blocks
|
2021-11-29 10:51:26 +01:00 |
|
|
|
bbf6b1412f
|
repair admin docgen WIP
|
2021-11-29 10:42:43 +01:00 |
|
nobohan
|
cb89fc5ef5
|
person: style list-suggest
|
2021-11-29 10:16:23 +01:00 |
|
|
|
6ee01621c8
|
update changelog
|
2021-11-29 09:46:27 +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 |
|
|
|
9f868bff4f
|
create module for generating document in twig pages
|
2021-11-28 21:24:18 +01:00 |
|
nobohan
|
5fab0ffe27
|
accompanying course: add resource
|
2021-11-28 21:16:48 +01:00 |
|
|
|
406ec14c3d
|
add JS masonry placement on resume page
|
2021-11-27 16:34:55 +01:00 |
|
|
|
aeb165d6cc
|
update changelog
|
2021-11-27 12:27:57 +01:00 |
|
|
|
d616c20534
|
accourse resume page: add all informations needed for activities
|
2021-11-27 12:24:54 +01:00 |
|
|
|
1c18ba20fc
|
docgen: improve listing for templates
|
2021-11-27 01:23:34 +01:00 |
|
nobohan
|
44a09903a0
|
person: init suggested entities in accompanying course
|
2021-11-26 21:08:07 +01:00 |
|
|
|
34c525e378
|
accourse resume page: social-actions, list of evaluations with colored triangle bullet
|
2021-11-26 20:10:00 +01:00 |
|
|
|
16fcfda88f
|
accourse resume page: social-actions, put some items in 2 columns
|
2021-11-26 19:57:06 +01:00 |
|
|
|
93dbc32009
|
accourse resume page: add all informations needed for social-actions
cfr. vendee PROPOSITION_INFO_AFFICHEES.xlsx (column F)
|
2021-11-26 18:56:56 +01:00 |
|
|
|
40ca1e276b
|
styles sheets cleaning
|
2021-11-26 17:08:29 +01:00 |
|
|
|
74660448a1
|
accourse resume page: actions and activities are clickable links
|
2021-11-26 16:51:00 +01:00 |
|
|
|
10070d1581
|
update changelog
|
2021-11-25 19:13:17 +01:00 |
|
|
|
37cc540970
|
vue_accourseWorkEdit: improve show/hide button + list-suggest improve hyphens on badge too large
|
2021-11-25 19:04:13 +01:00 |
|
nobohan
|
5aa5cb3e08
|
location: use fetchResults for getLocations and getLocationTypes
|
2021-11-25 17:22:25 +01:00 |
|
|
|
8ac3dab0a2
|
update changelog
|
2021-11-25 16:54:49 +01:00 |
|
nobohan
|
f002d48efd
|
location: fix error when there is no defaultFor defined for locationType entities
|
2021-11-25 16:53:02 +01:00 |
|
|
|
666b4c9f5e
|
Merge branch '_resume_test_persons' into 295_resume_retouches
|
2021-11-25 16:51:30 +01:00 |
|
|
|
d274ba3823
|
#258 apply assets to lists of suggestion, adapt item-title case
|
2021-11-25 16:49:50 +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 |
|
