|
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 |
|
|
5d7f4bde1d
|
minor stuffs
|
2021-11-03 21:17:25 +01:00 |
|
|
40c5322cba
|
visgraph: an event trigger unfoldPersonsByCourse (store)
|
2021-11-03 21:15:37 +01:00 |
|
|
8ab0fd59f8
|
visgraph: add basic graph event mechanism when clicking on nodes
|
2021-11-03 21:12:42 +01:00 |
|
|
aa9926aa29
|
translations
|
2021-11-03 16:56:11 +01:00 |
|
|
adac384279
|
visgraph: prepare PATCH relationship when submitting (wip)
|
2021-11-03 16:49:07 +01:00 |
|
|
2099edefc5
|
visgraph: fix error with GET relations response
|
2021-11-03 16:45:37 +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 |
|
|
e2110691ff
|
Merge branch 'household_filiation' of gitlab.com:Chill-Projet/chill-bundles into household_filiation
|
2021-11-03 16:11:05 +01:00 |
|
|
645603a98f
|
Merge branch 'master' into improve_localisation_271
|
2021-11-03 16:09:53 +01:00 |
|
|
cab7cc4150
|
PATCH added to swagger
|
2021-11-03 16:04:35 +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 |
|
|
6c52233a5a
|
visgraph: with reversed relationship, reverse arrow and not title
|
2021-11-03 15:56:25 +01:00 |
|
|
8c5bf6786b
|
increase memory on gitlab-ci operations
|
2021-11-03 15:46:00 +01:00 |
|
|
58f7715643
|
visgraph: fix logic error with relationship direction
|
2021-11-03 15:43:44 +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 |
|
|
e7900b8b21
|
visgraph: fix POST response (create link)
|
2021-11-03 14:54:27 +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 |
|
|
4d08f3583e
|
Merge branch 'household_filiation' of gitlab.com:Chill-Projet/chill-bundles into household_filiation
|
2021-11-03 14:29:39 +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 |
|
|
4dbbc40473
|
Merge branch 'household_filiation' of gitlab.com:Chill-Projet/chill-bundles into household_filiation
|
2021-11-03 12:52:41 +01:00 |
|
|
577ed7b6be
|
GET relations adapted, POST fixed
|
2021-11-03 12:52:21 +01:00 |
|
|
2d3549ee28
|
visgraph: give more space to graph in twig content
|
2021-11-03 12:39:47 +01:00 |
|
|
6e3cdb6f58
|
visgraph, disable action callback on nodes
|
2021-11-03 12:13:06 +01:00 |
|
|
e7ad96aaf7
|
Add a template for merge request [ci-skip]
|
2021-11-03 12:02:09 +01:00 |
|