980a305456
Merge branch 'dune-risky'
...
Conflicts:
src/Bundle/ChillActivityBundle/config/services.yaml
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
2021-06-02 16:23:45 +02:00
cfd9f1bab1
replace call to entity by class FQDN
2021-06-02 00:46:55 +02:00
126ffc55bf
Merge branch 'fix-getParticipationsContainsPerson' into 'master'
...
Fix `::getParticipationsContainsPerson`.
See merge request Chill-Projet/chill-bundles!50
2021-05-31 19:35:33 +00:00
8f1091b8a3
Merge branch '50-ajout-problematique-sociale-modele' into 'master'
...
Add many2many relation between socialIssue and accompanying period + api endpoint
See merge request Chill-Projet/chill-bundles!53
2021-05-31 19:11:15 +00:00
85dda8b680
hide flex-table test on page AccompanyingCourse history
2021-05-27 11:34:49 +02:00
2e1201418a
Merge branch 'fix-activity-menubuilder-definition' into 'master'
...
fix activityBundle menuBuilder definition
See merge request Chill-Projet/chill-bundles!69
2021-05-27 08:40:29 +00:00
a9fb916843
fix activityBundle menuBuilder definition
2021-05-27 10:37:24 +02:00
e26e3ac67b
Merge branch '59_parcours_resu_2'
2021-05-27 09:28:23 +02:00
124e36b9d4
fix declaration of entity rendering
2021-05-26 22:58:28 +02:00
358410cde1
Remove dead code
2021-05-26 19:44:58 +00:00
06c74ed5ed
add menu into section
2021-05-26 21:14:42 +02:00
25c986cc61
fix rendering for timeline entries in center context
2021-05-26 18:10:51 +02:00
cad8174333
apply timelineSingleQuery on events
2021-05-26 18:05:02 +02:00
6c8f1f77ff
improve flex-table and flex-box
2021-05-26 18:03:54 +02:00
75c586fbf8
fix documentation for timeline
2021-05-26 17:58:58 +02:00
2cb9dfc250
add tasks to global timeline
2021-05-26 17:50:54 +02:00
3b2d4142c1
Merge branch 'master' into 'gitlab-ci-fix-initialization'
...
# Conflicts:
# phpunit.xml.dist
2021-05-26 14:33:58 +00:00
9a6bab7ba2
Update phpunit.xml.dist
2021-05-26 14:27:31 +00:00
c2bbee299c
remove tests for person bundle
2021-05-26 13:56:42 +00:00
f4db9be557
remove tests for person, which are not fixed
2021-05-26 13:43:41 +00:00
5449efdd97
Increase memory for running phpunit
2021-05-26 13:35:38 +00:00
7896d288e7
Increase memory_limit for some operations
2021-05-26 13:31:25 +00:00
b98d6fa505
launch a bash command for debugging
2021-05-26 13:25:29 +00:00
e4d1b951a3
Merge branch 'fix-missing-dependency' into 'master'
...
Fix repositories - add typing - add missing methods - remove obsolete phpdoc
See merge request Chill-Projet/chill-bundles!60
2021-05-26 13:22:25 +00:00
ae8e5bc2e3
Merge branch 'master' into 'fix-accompanying-period-opening'
...
# Conflicts:
# src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
2021-05-26 13:11:23 +00:00
9b66f7a83f
Merge branch 'fix_load_fixtures' into 'master'
...
Fix load fixtures
See merge request Chill-Projet/chill-bundles!66
2021-05-26 11:04:43 +00:00
Pol Dellaiera
13d5b7078e
Prevent infinite loop and memory leak.
2021-05-26 10:44:35 +02:00
37996651c4
Search list with periods, html/scss refactoring
2021-05-26 00:09:25 +02:00
Marc Ducobu
679665d9db
Handle parent deletion in associated tables (ThirdPartyBundle)
2021-05-25 23:47:15 +02:00
Marc Ducobu
1d4edd5b7b
Handle parent deletion in associated tables (PersonBundle)
2021-05-25 23:46:05 +02:00
Marc Ducobu
f1c77277f3
Handle parent deletion in associated tables (MainBundle)
2021-05-25 23:45:08 +02:00
6264171c0c
Merge branch 'period-in-list-result' into 59_parcours_resu_2
2021-05-25 22:00:58 +02:00
902d8b52d3
Merge branch 'master' into 59_parcours_resu_2
2021-05-25 21:51:06 +02:00
caeb75ce13
vue requestor component, flex-table design
2021-05-25 21:44:15 +02:00
2f27674e05
flex table (row) design
2021-05-25 20:40:05 +02:00
ce9070e641
redirect to resume page after confirm action
2021-05-25 19:09:50 +02:00
5350a09951
apply timeline for report
2021-05-25 19:07:09 +02:00
31252461c9
load vue banner component for each page of AccompanyingCourse context
...
* vue css and js loaded from layout.html.twig
* rename 'show' template to 'edit' template
* overwrite js block for 'edit' template (load all component, not only banner)
2021-05-25 19:05:51 +02:00
73790db700
Merge branch 'add-doctrine-dbal-configuration-in-the-bundle' into 'master'
...
Add Doctrine DBAL postgis configuration in the bundle.
See merge request Chill-Projet/chill-bundles!65
2021-05-25 16:52:23 +00:00
fc2a2da75f
page blocs design
2021-05-25 15:36:07 +02:00
juminet
743b456030
Merge branch 'add-api-for-person' into 'master'
...
Add api for person
See merge request Chill-Projet/chill-bundles!61
2021-05-25 12:59:59 +00:00
0dbd42ba5b
Merge branch '139_demandeur' into 'master'
...
139 suite et fin
See merge request Chill-Projet/chill-bundles!62
2021-05-25 12:39:00 +00:00
7efbf2fce8
59 résumé, flex person position
2021-05-25 10:49:11 +02:00
9b1a66c992
fix query in timeline in activity and person bundle
2021-05-25 09:48:19 +02:00
Pol Dellaiera
cb897cfef1
Move Doctrine DBAL configuration in the appropriate and already existing code section.
2021-05-25 08:05:18 +02:00
Pol Dellaiera
bafbc2dd74
Add Doctrine DBAL postgis configuration in the bundle.
...
This can now be removed totally from the user application.
2021-05-25 07:57:12 +02:00
74541f360b
fix activity timeline using TimelineSingleQuery
2021-05-24 20:26:33 +02:00
20a14c9ff4
cleaning chillmain.scss
2021-05-24 13:19:37 +02:00
cdade50d76
display person and thirdparty informations in accompanyingCourse index template (twig)
2021-05-24 11:23:03 +02:00
d4f96ee25f
add 'with_icon' option in twig address macro
2021-05-24 11:22:27 +02:00
