6642b87168
Merge branch 'bugfixes/tasks-list' into 'master'
...
Bugfixes/tasks list
# Description of changes
<!--
describe here the change of your MR. It can be either a text, or a bullet list
for changes
-->
* different title for task list and my title
* fixes link to tasks in alert
# Issues related
<!--
list the issues related to this MR.
It may be client issues, or dev issues
-->
no issues related
# Tests
The tests for listing task does apply
See merge request Chill-Projet/chill-bundles!200
2021-11-05 12:31:41 +00:00
35d807cab0
Bugfixes/tasks list
2021-11-05 12:31:41 +00:00
e1677cd2b6
Merge branch 'feature/household-accept-members-without-position' into 'master'
...
An household can have members without position
See merge request Chill-Projet/chill-bundles!189
2021-11-05 09:26:16 +00:00
261810374f
Merge branch 'issue83_ACCent_addDocument_toAction' into 'master'
...
cascade persist added to Activity::documents
See merge request Chill-Projet/chill-bundles!197
2021-11-04 11:44:57 +00:00
8f541c8418
Merge branch 'master' into 'issue83_ACCent_addDocument_toAction'
...
# Conflicts:
# CHANGELOG.md
2021-11-04 11:40:56 +00:00
b69cee84b6
Update CHANGELOG.md
2021-11-04 09:12:06 +00:00
b7e0753dbf
changelog fixed
2021-11-04 10:09:08 +01:00
9c57d21e5a
Merge branch 'issue153_ACCent_activity_admin' into 'master'
...
Issue153_accent_activity_admin
See merge request Chill-Projet/chill-bundles!193
2021-11-04 08:57:13 +00:00
c03b925bd9
Merge branch 'master' into 'issue153_ACCent_activity_admin'
...
# Conflicts:
# CHANGELOG.md
# src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
2021-11-04 08:52:32 +00:00
6fdbefa4c8
changelog updated and comments removed
2021-11-04 09:50:25 +01:00
13b43ace39
update of changelog.md
2021-11-04 09:45:35 +01:00
12c3bfa578
Merge branch 'improve_localisation_271'
2021-11-03 16:18:53 +01:00
nobohan
52778a7051
upd CHANGELOG
2021-11-03 16:17:33 +01:00
nobohan
a768563cd0
location: display the error message in case of wrong phone number or email
2021-11-03 16:16:51 +01:00
nobohan
4011fc6e77
location: client side validation
2021-11-03 16:16:51 +01:00
nobohan
51938a99db
location: allow null value for location in Calendar
2021-11-03 16:16:51 +01:00
nobohan
c1f4e77293
location: allow null value for location in Activity
2021-11-03 16:16:51 +01:00
nobohan
bfb219746a
location: client-side form validation
2021-11-03 16:16:51 +01:00
nobohan
4e72bdead5
location: code refactoring: move saveNewLocation + order of fields
2021-11-03 16:16:51 +01:00
nobohan
e52880bb53
location: filter location-type by active and availableForUsers
2021-11-03 16:16:51 +01:00
nobohan
0439e6a821
location: filter location endpoint by NULL names
2021-11-03 16:16:51 +01:00
72337a8fba
Merge branch 'issue74_ACCent_rename_evaluations' into 'master'
...
section title evaluations changed for accompanyingcoursework edit
See merge request Chill-Projet/chill-bundles!196
2021-11-03 15:16:01 +00:00
645603a98f
Merge branch 'master' into improve_localisation_271
2021-11-03 16:09:53 +01:00
c6d7de3e58
Merge branch 'bugfix/authorization-helper-fix-constructor' into 'master'
...
authorization helper: fix consructor
See merge request Chill-Projet/chill-bundles!194
2021-11-03 14:59:08 +00:00
8c5bf6786b
increase memory on gitlab-ci operations
2021-11-03 15:46:00 +01:00
7c5d0fce51
update changelog
2021-11-03 15:36:06 +01:00
35154f5ae1
fix constructor into acl aware repository
2021-11-03 15:35:38 +01:00
6911ace412
Refactor authorization helper to separate some methods
...
Methods regarding to role hierarchi are now delegated to a parent role helper.
2021-11-03 15:35:38 +01:00
87e16ec24f
authorization helper: fix consructor
2021-11-03 15:35:38 +01:00
765a450bb9
update changelog with issues into vendee changelog
2021-11-03 15:33:31 +01:00
nobohan
93880f7010
upd CHANGELOG
2021-11-03 14:55:33 +01:00
nobohan
0231433a6c
location: display the error message in case of wrong phone number or email
2021-11-03 14:45:15 +01:00
b2fe024534
Code that causes error commented: UserMenuBuilder.php
2021-11-03 13:27:32 +00:00
39e0e01eb8
cascade persist added to Activity::documents
2021-11-03 14:15:48 +01:00
nobohan
2aa588037a
location: client side validation
2021-11-03 13:51:15 +01:00
nobohan
addb362478
location: allow null value for location in Calendar
2021-11-03 13:43:34 +01:00
nobohan
819fc8af46
location: allow null value for location in Activity
2021-11-03 13:42:35 +01:00
e7ad96aaf7
Add a template for merge request [ci-skip]
2021-11-03 12:02:09 +01:00
nobohan
f4bd55262a
location: client-side form validation
2021-11-03 11:59:06 +01:00
eebff23282
section title evaluations changed for accompanyingcoursework edit
2021-11-03 11:49:31 +01:00
2d33ae26d8
Merge branch '106_tasks_to_parcours'
2021-11-03 11:45:40 +01:00
7a384f9657
Separate cache:clear from doctrine:fixtures:load in ci
...
This is an attempt to fix the bug which replace references by NULL
values
2021-11-03 11:43:57 +01:00
nobohan
c8bc6ac495
location: code refactoring: move saveNewLocation + order of fields
2021-11-03 11:34:52 +01:00
b0471c4851
translation fixes for aside activities
2021-11-03 10:56:28 +01:00
6d248ab47b
Activity link added to admin homepage
2021-11-03 10:55:51 +01:00
nobohan
999658e792
location: filter location-type by active and availableForUsers
2021-11-03 10:27:58 +01:00
nobohan
1646740382
location: filter location endpoint by NULL names
2021-11-03 09:59:40 +01:00
94e84fbdf0
Merge branch 'blur_confidential_info' into 'master'
...
Blur confidential info
See merge request Chill-Projet/chill-bundles!172
2021-10-30 00:22:41 +00:00
20cebfc517
Merge branch '129_ACCent_gender_display' into 'master'
...
129_accent_gender_display
See merge request Chill-Projet/chill-bundles!187
2021-10-30 00:22:05 +00:00
e9d20a56ff
show members without position in list
2021-10-30 02:08:31 +02:00
