Commit Graph

940 Commits

Author SHA1 Message Date
p.delpy@dkfz-heidelberg.de 75087fccda trigger update with empty commit 2024-09-13 14:16:18 +02:00
p.delpy@dkfz-heidelberg.de 4590b30a7f fix: checkout develop at all pilot sites 2024-09-12 10:56:11 +02:00
p.delpy@dkfz-heidelberg.de a839996788 hotfix: add kr to projects 2024-09-04 10:07:56 +02:00
Pierre Delpy 4fd13b5e3c
Merge pull request #206 from samply/feature/pilot-projects-email-patch
Fix the support email for cce & itcc projects.
2024-08-22 09:09:17 +02:00
Manoj Waikar 67b6c9e7d3 Fix the support email for cce & itcc projects. 2024-08-21 16:09:56 +02:00
p.delpy@dkfz-heidelberg.de ceb59f3087 Merge branch 'refs/heads/main' into feature/pilot-projects
# Conflicts:
#	minimal/docker-compose.yml
2024-08-20 16:23:58 +02:00
Torben Brenner b9f0bf7064
Merge pull request #205 from samply/fix/login-confusion-with-datashield
fix: specify host for id-management login
2024-08-20 08:22:24 +02:00
Torben Brenner 6228cb3762 fix: specify host for id-management login
Otherwise traefik will match the route with the one specified in datashield-compose.yml
2024-08-19 17:09:10 +02:00
Torben Brenner 05fa323c33
Merge pull request #198 from samply/fix/idmanagement-authentication
Switch ID-Management to Keycloak from Samply.Auth
2024-08-19 15:53:54 +02:00
Torben Brenner 33843fe961 fix: switch id-management to keycloak 2024-08-19 14:43:21 +02:00
Torben Brenner 0f1f88f538
Merge pull request #204 from samply/fix/environment
Don't repeat definition of ENVIRONMENT var
2024-08-19 09:15:52 +02:00
Martin Lablans 60acac619d Don't repeat definition of ENVIRONMENT var 2024-08-19 08:38:34 +02:00
Tobias Kussel 376cd03bed
Merge pull request #203 from samply/fix/environment
export ENVIRONMENT
2024-08-19 08:33:05 +02:00
Patrick Skowronek ae95f14030 export ENVIRONMENT 2024-08-19 08:27:20 +02:00
Martin Lablans 25e1d4fb15
Merge pull request #202 from samply/main_fix_dirsync_passwd
Fixed environment variable passing for Directory sync
2024-08-15 13:43:39 +02:00
lablans 18c9e1bb30 Remove DP statement already present in readme. 2024-08-15 11:43:14 +00:00
lablans de847f309c Provide defaults 2024-08-15 11:40:44 +00:00
DavidCroftDKFZ 3496fa7a0f Let Directory sync handle connection with Blaze
Remove the delayed start, because Directory sync will automatically keep trying to
connect to Blaze if not initially present.
2024-08-15 13:36:57 +02:00
DavidCroftDKFZ 95574f38be Included Blaze dependency 2024-08-15 10:33:28 +02:00
Jan bff316cde1
Merge pull request #201 from samply/update/landing-page
Added env to landing-page
2024-08-15 10:00:09 +02:00
DavidCroftDKFZ b8b81b1242 Fixed environment variable passing for Directory sync
There were problems with the passing of environment variables from
bbmri.conf to the Directory synce container:

* The Directory password variable was misspellt.
* Some useful variables were missing.

Additionally, a delay was added before launching Directory sync,
to give Blaze time to start up.
2024-08-15 09:17:34 +02:00
Patrick Skowronek 7c560a2e93 Added env to landing-page 2024-08-15 09:10:37 +02:00
Martin Lablans 4a13395408
Merge pull request #200 from samply/reduce-update-interval
Reduce bridgehead update interval to once a day at 6am
2024-08-05 08:29:15 +02:00
Tobias Kussel 35d6a17778
Fix bridgehead update timer time convention
Co-authored-by: Martin Lablans <6804500+lablans@users.noreply.github.com>
2024-08-01 11:39:03 +02:00
Tobias Kussel ecd9269022
Add bridgehead update timer persistance
Co-authored-by: Martin Lablans <6804500+lablans@users.noreply.github.com>
2024-08-01 11:38:25 +02:00
Tobias Kussel 5227dc57a7
Fix systemd timer description
Co-authored-by: Jan <59206115+Threated@users.noreply.github.com>
2024-08-01 11:32:15 +02:00
Tobias Kussel 62edaf99e0 Reduce bridgehead update interval to once a day at 6am 2024-08-01 11:23:56 +02:00
Tobias Kussel 9c941853bd
Merge pull request #196 from samply/new-dashboard-backend
Add new/additional dashboard backend
2024-08-01 10:05:32 +02:00
Tobias Kussel 2e5aeabca8 Rename fhir2sql module files 2024-07-30 07:44:47 +00:00
Tobias Kussel af44b6b446 Fix depends_on syntax 2024-07-30 07:40:49 +00:00
davidmscholz 5ed07423f3 fix dashboard-compose 2024-07-30 09:24:07 +02:00
davidmscholz df08d67839 add optional dashboard module 2024-07-29 10:45:00 +02:00
p.delpy@dkfz-heidelberg.de 6e2e13eb2a add labels kr project 2024-07-29 09:59:07 +02:00
Torben Brenner 964c5324e6
Merge pull request #160 from samply/main_directory_sync_extra_attributes_and_star_model
Allow user to push star model facts to Directory
2024-07-26 14:09:39 +02:00
Torben Brenner 023be58528
Merge pull request #195 from samply/feature/caching-ccp
add caching in focus
2024-07-26 14:07:15 +02:00
DavidCroftDKFZ 8942b923b3 Added comment for consistency with Directory Sync README 2024-07-26 09:57:40 +02:00
p.delpy@dkfz-heidelberg.de 3ec06378b1 add labels to lens to replace missing landingpage config 2024-07-26 07:28:52 +02:00
DavidCroftDKFZ 3f8bb158bc Merge branch 'main' into main_directory_sync_extra_attributes_and_star_model 2024-07-25 16:54:47 +02:00
p.delpy@dkfz-heidelberg.de c34d8a5544 remove landing page, because it does not allow ccp or itcc project 2024-07-25 14:36:46 +02:00
p.delpy@dkfz-heidelberg.de cfa85067f0 initialize develop; add itcc and cce 2024-07-25 12:44:39 +02:00
Torben Brenner c3b770b70f
Merge pull request #194 from samply/workaround/secondary-cortex-blaze
Workaround/secondary cortex blaze
2024-07-25 10:32:38 +02:00
Pierre Delpy d316f1c798 add caching in focus 2024-07-24 13:56:53 +02:00
djuarezgf 293810f254 Added: exporter with blaze-secondary 2024-07-18 14:06:47 +02:00
p.delpy@dkfz-heidelberg.de 6b4480c54b workaround: add second blaze 2024-07-18 14:06:47 +02:00
Tobias Kussel a92b2eff76
Merge pull request #193 from samply/Fix-patientlisturl-in-obds2fhir-rest-compose.yml
Fix patientlisturl in obds2fhir-rest-compose.yml
2024-07-16 10:59:53 +02:00
Pierre Delpy b36c9ae03e
Fix patientlisturl in obds2fhir-rest-compose.yml 2024-07-16 10:49:23 +02:00
Torben Brenner 16629f3e45
Merge pull request #192 from samply/hotfix/idmanagementFlag
fix: use correct ID management flag for oBDS2FHIR and MTBA
2024-07-16 10:20:15 +02:00
Pierre Delpy 91dc31d039 fix: use correct ID management flag for oBDS2FHIR 2024-07-08 14:31:09 +02:00
patrickskowronekdkfz 7c54b6bb08
Merge pull request #191 from samply/fix/oauth-redirect
fix: Fix traefik label for oauth2 redirect
2024-07-03 15:10:28 +02:00
janskiba 9e4bc214ce fix: Fix traefik label for oauth2 redirect 2024-07-03 13:01:02 +00:00