Commit Graph

Select branches

Hide Pull Requests

actris

main

mcda_apps

scicat-rocrate

scicat-rocrate-qa

sinqstatus

spotscan

summer_student_selection

tcpwiki

update_nginx

Mono Color

• 82f199b8a9 Merge pull request 'Tier-ranking small bug fix' (#37) from huang_h/WebHosting_DMZ:main into main main bruhn_b 2026-08-31 14:44:11 +02:00
• e43f44198e Tier-ranking bug fix River 2026-08-31 14:41:19 +02:00
• 0ea49eacaa merge upstream huang_h 2026-08-31 14:36:06 +02:00
• 0df6f70059 Merge pull request 'scicat-rocrate prod deployment' (#36) from data-catalog-services/WebHosting_DMZ:scicat-rocrate into main bruhn_b 2026-08-31 09:50:47 +02:00
• 2ece82de8a scicat-rocrate prod deployment scicat-rocrate fpotier 2026-08-31 09:44:40 +02:00
• 2a7a1fe006 Update felira to 3.1.18 bruhn_b 2026-08-31 08:44:12 +02:00
• 8e6e770e3e Tier-ranking tool REST fix (#35) huang_handRiver Huang 2026-08-28 09:05:42 +02:00
• 3cef4016f5 Tier-ranking tool REST fix River Huang 2026-08-28 09:00:55 +02:00
• e841048d1c update logging bruhn_b 2026-08-25 15:29:51 +02:00
• 7d3bcf15fe update tiermaker bruhn_b 2026-08-25 11:23:29 +02:00
• 353a5997f0 downgrade tiermaker bruhn_b 2026-08-25 11:21:58 +02:00
• 1999e6e116 Merge pull request 'Quick fix' (#34) from huang_h/WebHosting_DMZ:main into main bruhn_b 2026-08-24 18:16:53 +02:00
• 114abf24a5 Quick fix River 2026-08-24 17:34:05 +02:00
• 19238c7565 whoopsie bruhn_b 2026-08-24 17:02:47 +02:00
• 8d94274ba2 Merge pull request 'deploy tiermaker to DMZ' (#33) from tiermaker into main bruhn_b 2026-08-24 17:01:52 +02:00
• 7bb9bfd645 update image bruhn_b 2026-08-24 17:00:15 +02:00
• 05af04a2a2 deploy tiermaker to DMZ bruhn_b 2026-08-24 16:56:05 +02:00
• ba77c1b8f2 Merge pull request 'bump scicat-rocrate-qa' (#32) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main bruhn_b 2026-08-20 15:09:18 +02:00
• 45ce670f54 bump scicat-rocrate-qa scicat-rocrate-qa potier_f 2026-08-20 14:45:22 +02:00
• c5862a784d Merge pull request 'bump scicat-rocrate-qa' (#31) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main bruhn_b 2026-08-17 14:46:00 +02:00
• 479ef33cd0 bump scicat-rocrate-qa fpotier 2026-08-17 14:44:41 +02:00
• c8c2dfc116 Merge pull request 'deploy omny to DMZ' (#30) from omny into main bruhn_b 2026-08-17 12:42:38 +02:00
• 6dbfd920d3 deploy omny to DMZ bruhn_b 2026-08-17 12:41:49 +02:00
• 4e31395218 Merge pull request 'move pct from docker to docker-dmz' (#29) from pct into main bruhn_b 2026-08-13 10:53:45 +02:00
• f8a67be32e move pct from docker to docker-dmz bruhn_b 2026-08-13 10:51:40 +02:00
• 6e160f8329 Merge pull request 'scicat-rocrate-qa: config' (#28) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main bruhn_b 2026-08-11 14:20:59 +02:00
• 7b49e635a7 update hostname fpotier 2026-08-11 14:19:10 +02:00
• 1121d4b654 Merge pull request 'MCDA SRF update' (#27) from huang_h/WebHosting_DMZ:main into main bruhn_b 2026-08-10 13:32:38 +02:00
• ecc77916ba Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ River 2026-08-10 12:03:54 +02:00
• ff7a5d3153 MCDA SRF update River 2026-08-10 12:03:53 +02:00
• 72ddfbdca5 Merge pull request 'bump scicat-rocrate-qa' (#26) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main bruhn_b 2026-08-06 15:18:35 +02:00
• b7c04ac7cf bump scicat-rocrate-qa fpotier 2026-08-06 14:08:49 +02:00
• 803ddcfcf5 Merge pull request 'bump scicat-rocrate-qa' (#25) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main bruhn_b 2026-08-06 11:40:59 +02:00
• 52fff61a22 bump scicat-rocrate-qa fpotier 2026-08-06 11:35:43 +02:00
• 04bd1da6e8 Merge pull request 'scicat-rocrate: enable logging on the NFS share' (#24) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main bruhn_b 2026-08-05 11:16:21 +02:00
• 29f0167e0d bump version fpotier 2026-08-05 11:12:54 +02:00
• aeeaeac185 log on NFS share fpotier 2026-08-05 09:57:29 +02:00
• e7a90c5644 Merge pull request 'UP-MAVT update' (#22) from huang_h/WebHosting_DMZ:main into main bruhn_b 2026-08-04 08:15:22 +02:00
• 576450eb14 Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ River 2026-08-03 16:49:12 +02:00
• 0ebd01f504 UP-MAVT update River 2026-08-03 16:49:11 +02:00
• 484ee182af Merge pull request 'Update scicat-rocrate deployment' (#21) from data-catalog-services/WebHosting_DMZ:update-scicat-rocrate into main bruhn_b 2026-07-30 13:02:36 +02:00
• d0f591469e update scicat-rocrate fpotier 2026-07-29 16:03:47 +02:00
• 9f6174cab5 Merge pull request 'Deploy Rhodo 1.2.0 images' (#20) from hidber_f/WebHosting_DMZ:rhodo-1.2.0 into main bruhn_b 2026-07-23 11:29:48 +02:00
• fd1f3f7583 Deploy Rhodo 1.2.0 images flurinh 2026-07-23 10:15:01 +02:00
• 9282a905ff Merge pull request 'fix felira' (#19) from ebner-patch-2 into main ebner 2026-07-20 09:02:17 +02:00
• c8295d6ab0 fix felira ebner 2026-07-20 09:01:42 +02:00
• b145fd7b7e Update docker-compose.yaml bruhn_b 2026-07-17 12:01:34 +02:00
• c2e0ccd183 Update docker-compose.yaml bruhn_b 2026-07-17 10:07:16 +02:00
• 864f810113 change mount points for rocrate qa bruhn_b 2026-07-16 14:53:13 +02:00
• f5c726326a Merge pull request 'Update docker-compose.yaml' (#18) from ebner-patch-1 into main ebner 2026-07-14 11:14:24 +02:00
• 09495fa0db Update docker-compose.yaml ebner 2026-07-14 11:13:16 +02:00
• 021c5ec54a Merge pull request 'Update MCDA-SRF' (#17) from huang_h/WebHosting_DMZ:main into main bruhn_b 2026-07-13 15:32:59 +02:00
• 826ac1ed47 Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ River 2026-07-13 15:29:44 +02:00
• eadf3b6da5 Update MCDA-SRF River 2026-07-13 15:29:43 +02:00
• 1ae1cae663 upload limit for felira-web bruhn_b 2026-07-13 13:39:18 +02:00
• 4a3d6c4a9e add data dir for leaps bruhn_b 2026-07-08 10:38:10 +02:00
• 0caec46eb8 felira container name bruhn_b 2026-07-07 12:14:13 +02:00
• d62d5234e0 all names bruhn_b 2026-07-02 16:16:54 +02:00
• 63a48a50a0 the webserver is using some hardcoded values bruhn_b 2026-07-02 16:16:01 +02:00
• 71bb3fa482 Merge pull request 'MCDA-UP enhance debug log update' (#16) from huang_h/WebHosting_DMZ:main into main bruhn_b 2026-07-01 18:58:30 +02:00
• 969ecdcb8c MCDA-UP enhance debug log update 1 River 2026-07-01 17:17:50 +02:00
• edf50f947c MCDA-UP enhance debug log update River 2026-07-01 16:47:47 +02:00
• 0b5b1e2ec0 Merge pull request 'deploy leaps app for fritjof' (#14) from leaps_felira into main bruhn_b 2026-07-01 16:24:05 +02:00
• 78ea71cf41 deploy leaps app for fritjof bruhn_b 2026-07-01 16:22:44 +02:00
• 0273021cf3 typo bruhn_b 2026-07-01 12:22:59 +02:00
• 6f024ad9a7 Merge pull request 'add scicat-rocrate QA' (#13) from data-catalog-services/WebHosting_DMZ:scicat-rocrate into main bruhn_b 2026-07-01 12:20:47 +02:00
• ac6622d500 update certificate name fpotier 2026-07-01 11:51:19 +02:00
• 24cb61de69 fix service name fpotier 2026-07-01 11:43:40 +02:00
• c888f5fa86 mount nfs share fpotier 2026-07-01 11:42:11 +02:00
• b9bcc9ae94 add scicat-rocrate QA fpotier 2026-06-26 11:13:18 +02:00
• 44cdec3271 Merge pull request 'MCDA-UP update' (#12) from huang_h/WebHosting_DMZ:main into main bruhn_b 2026-06-23 10:31:34 +02:00
• 6021137395 MCDA-UP update River 2026-06-11 14:08:04 +02:00
• 0738ce0cf3 add nginx conf to INC0163729 bruhn_b 2026-05-22 15:14:55 +02:00
• c04aa690e1 deploy INC0163729 bruhn_b 2026-05-22 15:12:17 +02:00
• 18afb54d74 Merge pull request 'MCDA-UP update' (#10) from huang_h/WebHosting_DMZ:main into main bruhn_b 2026-05-18 11:50:41 +02:00
• edb91fb3d5 MCDA-UP update cx7388 2026-05-18 11:41:02 +02:00
• ada9a1cffa Update software from river to 0.5.0 like in test bruhn_b 2026-05-12 13:58:25 +02:00
• 397ff56a24 Merge pull request 'deploying several MCDA apps' (#9) from mcda_apps into main bruhn_b 2026-04-30 12:44:34 +02:00
• 53b4e80fce update nginx mcda_apps bruhn_b 2026-04-30 12:44:23 +02:00
• 9fe65b5ac9 deploying several MCDA apps bruhn_b 2026-04-30 10:45:31 +02:00
• 392d03eb28 add pepisco to production bruhn_b 2026-03-19 09:37:35 +01:00
• 37889e87c9 symlinks bruhn_b 2026-02-24 10:41:49 +01:00
• c7b41d7729 traversal and symlink bruhn_b 2026-02-24 10:24:23 +01:00
• 40c67b0902 make dokuwiki easy to update bruhn_b 2026-02-24 10:19:37 +01:00
• e2f25fbb30 Merge pull request 'dokuwiki moved over from tcpwiki-01' (#8) from tcpwiki into main bruhn_b 2026-02-10 11:31:37 +01:00
• ff4c490c0a dokuwiki moved over from tcpwiki-01 tcpwiki bruhn_b 2026-02-10 11:27:42 +01:00
• 5c40af0314 fix omny to omny.web bruhn_b 2026-01-30 09:44:20 +01:00
• c49600c429 omny web to external hosting bruhn_b 2026-01-29 10:10:13 +01:00
• 2f7495232e path changed due to users requests bruhn_b 2026-01-26 15:12:01 +01:00
• f4f668af71 deploy cas-status to dmz bruhn_b 2026-01-22 16:00:34 +01:00
• 98834e8cdf switch path to a writeable bruhn_b 2026-01-22 15:41:30 +01:00
• 9c5cca75b0 remove actris actris ebner 2026-01-19 09:42:47 +01:00
• b9454c8d4c Merge pull request 'deploy summer project selection from test to prod' (#7) from summer_student_selection into main bruhn_b 2026-01-19 08:02:20 +01:00
• 0d905552a6 deploy summer project selection from test to prod summer_student_selection bruhn_b 2026-01-19 08:01:56 +01:00
• 6478619f22 Merge pull request 'add actris service' (#6) from actris into main ebner 2026-01-13 16:14:16 +01:00
• 260fb2283b add actris service ebner 2026-01-13 16:11:10 +01:00
• 9a708b6317 add srem-test to DMZ as srem.psi.ch bruhn_b 2025-11-27 12:25:37 +01:00
• aa758539fd rw and vhost bruhn_b 2025-11-24 12:22:20 +01:00
• a60651c498 folder location DMZ bruhn_b 2025-11-24 12:16:00 +01:00
• cc30a18c40 fluid eos bruhn_b 2025-11-24 11:00:11 +01:00