|
|
08c13b8c98
|
Merge remote-tracking branch 'origin/master' into issue412_413_activity
|
2022-01-31 14:22:34 +01:00 |
|
|
|
1bc2500b28
|
update changelog [ci-skip]
|
2022-01-31 14:18:10 +01:00 |
|
nobohan
|
3978e7c959
|
upd CHANGELOG
|
2022-01-31 13:48:21 +01:00 |
|
|
|
c14101714c
|
update changelog
|
2022-01-31 13:09:13 +01:00 |
|
|
|
fba7060a91
|
update changelog
|
2022-01-31 13:05:41 +01:00 |
|
|
|
6894fa7101
|
Merge branch 'issue389_add_age' into 'master'
add age/ person text component
See merge request Chill-Projet/chill-bundles!308
|
2022-01-31 12:04:48 +00:00 |
|
nobohan
|
1967fc4bed
|
upd CHANGELOG
|
2022-01-31 12:01:52 +01:00 |
|
|
|
186b8847d9
|
Merge remote-tracking branch 'origin/issue389_add_age' into issue389_add_age
|
2022-01-31 11:46:07 +01:00 |
|
|
|
90d0cbc3b1
|
Merge remote-tracking branch 'origin/master' into issue389_add_age
|
2022-01-31 11:44:55 +01:00 |
|
|
|
ac3d39b151
|
Merge branch 'master' into 'issue389_add_age'
# Conflicts:
# CHANGELOG.md
|
2022-01-31 10:25:32 +00:00 |
|
|
|
76a7b019eb
|
Merge branch 'master' into 'issue411_openingDate_parcours'
# Conflicts:
# CHANGELOG.md
|
2022-01-31 10:19:54 +00:00 |
|
nobohan
|
a68a43adc0
|
upd CHANGELOG
|
2022-01-31 10:55:11 +01:00 |
|
|
|
125dd4d980
|
Merge remote-tracking branch 'origin/master' into issue_mes_parcours
|
2022-01-29 02:58:32 +01:00 |
|
|
|
2ddab027ed
|
Merge remote-tracking branch 'origin/master' into issue410_restyle_parcourslist_personSearch
|
2022-01-29 02:57:05 +01:00 |
|
|
|
318c001904
|
changelog updated
|
2022-01-28 18:07:20 +01:00 |
|
|
|
4620e32b82
|
changelog updated
|
2022-01-28 12:20:29 +01:00 |
|
|
|
646f39b9ed
|
Merge conflicts fixed
|
2022-01-28 12:15:51 +01:00 |
|
nobohan
|
105fe16122
|
upd CHANGELOG
|
2022-01-28 11:40:30 +01:00 |
|
|
|
ae33392ad0
|
update changelog
|
2022-01-28 10:58:24 +01:00 |
|
|
|
792eafce72
|
dynamic picker aside activity
|
2022-01-28 09:55:26 +00:00 |
|
juminet
|
21edc74ada
|
residentialAddress
|
2022-01-28 09:48:00 +00:00 |
|
juminet
|
8432c215a3
|
filiations: small adjustments (colors, labels, ...)
|
2022-01-28 08:49:59 +00:00 |
|
juminet
|
445fe0cee4
|
activity: order activities by date and by id
|
2022-01-27 16:12:07 +00:00 |
|
|
|
5b25f82963
|
changelog updated
|
2022-01-27 16:24:35 +01:00 |
|
|
|
7c8b08c3a7
|
Merge branch 'master' into issue394_address_confidential
|
2022-01-27 15:39:10 +01:00 |
|
|
|
14463dcd38
|
changelog updated
|
2022-01-27 11:45:03 +01:00 |
|
|
|
b38924cc3d
|
Revert "Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles"
This reverts commit 58c4e37116511032fc08ba1e1454cf32df5dea48.
|
2022-01-26 16:38:58 +01:00 |
|
|
|
6e554e74ab
|
Merge branch 'issue382_person_resource'
|
2022-01-26 14:43:50 +01:00 |
|
|
|
66ac5c7435
|
Merge remote-tracking branch 'origin/master' into issue406_truncate_comment
|
2022-01-26 14:03:49 +01:00 |
|
|
|
88d1fe24b4
|
Creation of PersonResource
|
2022-01-26 12:52:15 +00:00 |
|
|
|
5d36e56641
|
changelog updated
|
2022-01-26 12:57:14 +01:00 |
|
|
|
d365fcea39
|
merge conflict in changelog resolved
|
2022-01-26 12:13:37 +01:00 |
|
|
|
20f814766c
|
merge fixes
|
2022-01-26 12:10:18 +01:00 |
|
|
|
910f9a7e8e
|
update changelog
|
2022-01-26 12:08:18 +01:00 |
|
|
|
48c3432191
|
changelog entry added
|
2022-01-26 12:06:44 +01:00 |
|
|
|
6ef5390a26
|
update change log with release
|
2022-01-24 20:00:14 +01:00 |
|
|
|
0ac51da31a
|
Merge remote-tracking branch 'origin/issue386_dynamic_type_picker' into issue382_person_resource
|
2022-01-24 19:23:24 +01:00 |
|
|
|
90d43b0bd3
|
Merge remote-tracking branch 'origin/master' into issue382_person_resource
|
2022-01-24 19:21:06 +01:00 |
|
|
|
a9b216b16b
|
Merge remote-tracking branch 'origin/master' into issue385_comments_accourse
|
2022-01-24 14:54:00 +01:00 |
|
|
|
c7dbaae8d6
|
105 worflow
|
2022-01-24 13:17:46 +00:00 |
|
nobohan
|
25ee11e4ff
|
upd CHANGELOG
|
2022-01-24 13:48:47 +01:00 |
|
|
|
54c2b92962
|
Improve notifications
|
2022-01-24 10:09:57 +00:00 |
|
|
|
cdbae1eade
|
bugfix in parcours display if deathdate of associated person is not defined (ex. for thirdparty)
|
2022-01-21 17:00:04 +01:00 |
|
|
|
2b9f0e5177
|
changelog updated
|
2022-01-21 16:50:09 +01:00 |
|
|
|
84993ca05b
|
update changelog
|
2022-01-21 15:55:22 +01:00 |
|
|
|
c736c2b5bb
|
update changelog
|
2022-01-19 17:48:46 +01:00 |
|
|
|
b3aca957ff
|
Merge remote-tracking branch 'origin/master' into issue377_addFields_toPerson
|
2022-01-19 17:47:34 +01:00 |
|
juminet
|
256dab3739
|
person: add obele sign for dead persons
|
2022-01-19 11:23:51 +00:00 |
|
juminet
|
f0a7565302
|
[location] fix address saving in admin form
|
2022-01-19 11:22:33 +00:00 |
|
|
|
6460007aa1
|
changelog updated
|
2022-01-19 12:18:09 +01:00 |
|
