195 Commits
Author SHA1 Message Date
ebner 36f915c0e3 Merge pull request 'Update conf.d/pocketapp.conf' (#65) from pombas_n/WebHosting_DMZ:pombas_n-patch-2 into main
Reviewed-on: linux/WebHosting_DMZ#65
2026-09-28 14:40:02 +02:00
pombas_n 1556766bc1 Update conf.d/pocketapp.conf 2026-09-28 14:29:03 +02:00
ebner 9997f49ae3 Merge pull request 'added phoneboot api' (#64) from pombas_n/WebHosting_DMZ:pombas_n-patch-1 into main
Reviewed-on: linux/WebHosting_DMZ#64
2026-09-28 14:21:21 +02:00
pombas_n dd9e5bb705 added api 2026-09-28 14:19:53 +02:00
ebner 7eb42831e3 Merge pull request 'Update versions' (#63) from bb_if_produktiv/WebHosting_DMZ:update-versions-210 into main
Reviewed-on: linux/WebHosting_DMZ#63
2026-09-28 14:00:09 +02:00
Gitea Actions 68f3dddfed automatic version update! 2026-09-28 11:49:59 +00:00
ebner 63b2707dab Merge pull request 'revert clic changes' (#62) from revert_clic into main
Reviewed-on: linux/WebHosting_DMZ#62
2026-09-28 13:18:27 +02:00
ebner 7a973465bc revert clic changes 2026-09-28 13:17:21 +02:00
ebner d82308e45f Merge pull request 'Update CLIC image: Brightway exports, impact scoring and workflow fixes' (#60) from sacchi_r/WebHosting_DMZ:update/clic-brightway-da80c3ea10cb into main
Reviewed-on: linux/WebHosting_DMZ#60
2026-09-28 13:04:05 +02:00
ebner 72e6d568be Merge pull request 'update felira version to 3.1.60' (#61) from felira_3.1.60 into main
Reviewed-on: linux/WebHosting_DMZ#61
2026-09-28 13:02:47 +02:00
ebner f2de798123 update felira version to 3.1.60 2026-09-28 13:02:07 +02:00
romainsacchi 45d05f1826 Update CLIC image with Brightway export and workflow fixes 2026-09-28 12:47:07 +02:00
ebner eb51977ab0 Merge pull request 'Update versions' (#59) from bb_if_produktiv/WebHosting_DMZ:update-versions-204 into main
Reviewed-on: linux/WebHosting_DMZ#59
2026-09-28 11:02:03 +02:00
Gitea Actions 7f534732e8 Update psitrail and pocketapp versions 2026-09-28 08:51:30 +00:00
ebner 1acbc38b73 Merge pull request 'Update versions' (#58) from bb_if_produktiv/WebHosting_DMZ:update-versions-201 into main
Reviewed-on: linux/WebHosting_DMZ#58
2026-09-28 10:21:47 +02:00
Gitea Actions 6ed3718df2 Update psitrail and pocketapp versions 2026-09-28 07:38:02 +00:00
buchel_k fbf482521d Merge pull request 'Tier-ranking update' (#57) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#57
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
2026-09-25 14:32:44 +02:00
River 4489f7e354 Tier-ranking update 2026-09-25 14:24:05 +02:00
huang_h 95d22541b9 merge upstream 2026-09-25 14:21:30 +02:00
buchel_k c2f784fac3 Merge pull request 'roll out Leaps Ultrafast 3.1.51' (#56) from leaps_ultrafast_3.1.51 into main
Reviewed-on: linux/WebHosting_DMZ#56
2026-09-25 14:13:35 +02:00
buchel_k 485ef0b248 roll out Leaps Ultrafast 3.1.51, as requested by frithjof.nolting@psi.ch 2026-09-25 14:12:19 +02:00
bruhn_b b8a0d3ad61 Merge pull request 'bump scicat-rocrate-qa' (#55) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main
Reviewed-on: linux/WebHosting_DMZ#55
2026-09-24 17:21:04 +02:00
fpotier 82c7ff01f0 bump scicat-rocrate-qa 2026-09-24 15:31:02 +02:00
bruhn_b 5261e6c407 Merge pull request 'Fix CLIC 502: restore startup script permissions (a3b90f8)' (#54) from sacchi_r/WebHosting_DMZ:fix-clic-startup-permissions into main
Reviewed-on: linux/WebHosting_DMZ#54
2026-09-22 16:00:55 +02:00
romainsacchi 51fb3a5de3 Fix CLIC 502 by deploying startup permission repair a3b90f8 2026-09-22 15:46:00 +02:00
bruhn_b 2fc5f7c8d5 Merge pull request 'CLIC: release reviewed UVEK exports (1a5d217)' (#53) from sacchi_r/WebHosting_DMZ:update-clic-exports-1a5d217 into main
Reviewed-on: linux/WebHosting_DMZ#53
2026-09-22 15:33:24 +02:00
romainsacchi 1f58c8d289 Update CLIC services to reviewed export release 1a5d217 2026-09-22 13:39:07 +02:00
bruhn_b a30ff7bf25 Merge pull request 'CLIC: automatic Zenodo restore and container-managed nightly backups' (#52) from sacchi_r/WebHosting_DMZ:update-clic-archive-5bbfcaf into main
Reviewed-on: linux/WebHosting_DMZ#52
2026-09-21 13:35:39 +02:00
romainsacchi cedd87127c Remove CLIC archive handoff document from PR 2026-09-21 13:35:24 +02:00
romainsacchi fea43ce1cb Automate CLIC archive recovery and nightly backups in Compose 2026-09-21 13:35:24 +02:00
romainsacchi 64959d3d29 Update CLIC image for verified Zenodo nightly uploads 2026-09-21 13:35:24 +02:00
romainsacchi 634c045523 Update CLIC image to reviewed archive release 5bbfcaf 2026-09-21 13:35:24 +02:00
bruhn_b 6c42d84134 Merge pull request 'Update versions' (#51) from bb_if_produktiv/WebHosting_DMZ:update-versions-196 into main
Reviewed-on: linux/WebHosting_DMZ#51
2026-09-21 08:51:43 +02:00
Gitea Actions 0004e37bf2 Update psitrail and pocketapp versions 2026-09-18 19:11:47 +00:00
bruhn_b 82d0a67c8a Merge pull request 'Fix CLIC package worker unsupported skip-checks argument' (#50) from sacchi_r/WebHosting_DMZ:fix-clic-package-worker-arguments into main
Reviewed-on: linux/WebHosting_DMZ#50
2026-09-18 09:10:45 +02:00
romainsacchi 9bdaa10ef1 Fix CLIC package worker unsupported skip-checks argument 2026-09-17 21:56:59 +02:00
bruhn_b 8562d2c9cb wer lesen kann
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-17 13:20:22 +02:00
bruhn_b b93a6a9613 db name
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-17 13:18:57 +02:00
bruhn_b e651c810c9 update db name for felira
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-17 13:18:23 +02:00
bruhn_b c09f51f774 update felira web
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-17 11:30:41 +02:00
bruhn_b 49febaef19 tubulin decom
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-17 10:11:00 +02:00
bruhn_b f6204e9d85 Merge pull request 'Add pocketapp and psitrail' (#47) from pombas_n/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#47
2026-09-17 10:09:22 +02:00
pombas_n f343d80133 Update conf.d/pocketapp.conf 2026-09-16 14:51:23 +02:00
pombas_n 499caabe8a Add conf.d/pocketapp.conf 2026-09-16 14:49:42 +02:00
pombas_n 4d47a6154e Add conf.d/psitrail.conf 2026-09-16 14:49:28 +02:00
pombas_n edd3bb328d Update docker-compose.yaml 2026-09-16 14:48:50 +02:00
bruhn_b f421394fcb undeploy tubulin
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-16 12:48:12 +02:00
huang_handRiver 6356ae4abc MCDA software update (#45)
Co-authored-by: River <he.river.huang@gmail.com>
Reviewed-on: linux/WebHosting_DMZ#45
Co-authored-by: huang_h <river.huang@psi.ch>
2026-09-16 10:59:02 +02:00
River 9ea9529baa MCDA software update 2026-09-16 09:32:09 +02:00
bruhn_b 496ba2fb50 update felira web
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-14 15:49:45 +02:00