Commit Graph

854 Commits

Author SHA1 Message Date
b32a37da32 Merge branch '2410-ci-git-psi-ch-fix' into 'main'
Fix for pipeline (no new release!)

See merge request jungfraujoch/nextgendcu!95
2024-10-23 20:05:05 +02:00
631a9d5312 Fix for pipeline (no new release!) 2024-10-23 20:05:05 +02:00
89b692551b Merge branch '2410-count-time-error' into 'main'
Version 1.0.0-rc.23

See merge request jungfraujoch/nextgendcu!94
1.0.0-rc.23
2024-10-23 19:03:09 +02:00
4e57c3cda4 Version 1.0.0-rc.23 2024-10-23 19:03:09 +02:00
c0fd38880c Merge branch '2410-raw-data-fix' into 'main'
Fix seg fault with raw data

See merge request jungfraujoch/nextgendcu!93
1.0.0-rc.22
2024-10-23 16:20:48 +02:00
5034121c0b Fix seg fault with raw data + improve data processing settings display in Frontend 2024-10-23 16:20:48 +02:00
72e3aae608 Merge branch '2410-1.0.0-rc.21' into 'main'
version 1.0.0-rc.21

See merge request jungfraujoch/nextgendcu!92
1.0.0-rc.21
2024-10-23 10:16:37 +02:00
36e3a59802 version 1.0.0-rc.21 2024-10-23 10:16:37 +02:00
950c580558 Merge branch '2410-release-fix' into 'main'
CI: Remove FPGA build from CI

See merge request jungfraujoch/nextgendcu!91
1.0.0-rc.20
2024-10-22 08:52:07 +02:00
3c556c69c5 CI: Remove FPGA build from CI 2024-10-22 08:18:55 +02:00
0f6d02a878 Merge branch '2410-rx19-fixes' into 'main'
version 1.0.0-rc.20

See merge request jungfraujoch/nextgendcu!90
2024-10-21 13:30:56 +02:00
40c1e3d49f version 1.0.0-rc.20 2024-10-21 13:30:56 +02:00
abf7072ee1 Merge branch '2410-rc.18-quick-fixes' into 'main'
version 1.0.0-rc.19

See merge request jungfraujoch/nextgendcu!89
2024-10-18 20:17:29 +02:00
2e62cb1738 version 1.0.0-rc.19 2024-10-18 20:17:29 +02:00
e6eb7af5ae Merge branch '2410-1.0.0.rc-18.fixes' into 'main'
Fixes to version 1.0.0-rc.18

See merge request jungfraujoch/nextgendcu!88
1.0.0-rc.18
2024-10-17 16:29:39 +02:00
c9eb2ca65d Fixes to version 1.0.0-rc.18 2024-10-17 16:29:38 +02:00
3d9c93c32a Merge branch '2410-1.0.0-rc.18' into 'main'
version 1.0.0-rc.18

See merge request jungfraujoch/nextgendcu!87
2024-10-16 19:52:01 +02:00
1d7e5f173d version 1.0.0-rc.18 2024-10-16 19:52:01 +02:00
bc8afdcb55 Merge branch '2410-fpga-8x10g' into 'main'
Fixes to 8x10g FPGA image and frontend

See merge request jungfraujoch/nextgendcu!86
2024-10-16 09:12:24 +02:00
4ae0668f2f Fixes to 8x10g FPGA image and frontend 2024-10-16 09:12:24 +02:00
4cf20ae71b Merge branch '2410-rc.17-fixes' into 'main'
xbflash.qspi: Add tool from Xilinx to flash cards (it is a nightmare to...

See merge request jungfraujoch/nextgendcu!85
2024-10-15 09:27:22 +02:00
c7d255de6f xbflash.qspi: Add tool from Xilinx to flash cards (it is a nightmare to... 2024-10-15 09:27:22 +02:00
7cc6f4508a Merge branch '2410-1.0.0-rc.17-2' into 'main'
version 1.0.0-rc.17

See merge request jungfraujoch/nextgendcu!84
1.0.0-rc.17
2024-10-14 15:03:38 +02:00
ce19996874 version 1.0.0-rc.17 2024-10-14 15:03:38 +02:00
ad579f5d22 Merge branch '2410-pistache-version' into 'main'
version1.0.0-rc.16 fixes

See merge request jungfraujoch/nextgendcu!83
2024-10-11 16:43:06 +02:00
26408608d4 version1.0.0-rc.16 fixes 2024-10-11 16:43:06 +02:00
e92169a244 Merge branch '2410-1.0.0-rc.16-fixes' into 'main'
version1.0.0-rc.16 fixes

See merge request jungfraujoch/nextgendcu!82
2024-10-11 13:21:26 +02:00
6aa43e6b7e version1.0.0-rc.16 fixes 2024-10-11 13:21:26 +02:00
2203513ffb Merge branch '2410-1.0.0-rc.16' into 'main'
version 1.0.0-rc.16

See merge request jungfraujoch/nextgendcu!81
2024-10-11 11:11:37 +02:00
b605b95127 version 1.0.0-rc.16 2024-10-11 11:11:37 +02:00
040c43084e Merge branch '2410-eiger-test' into 'main'
version 1.0.0-rc.15

See merge request jungfraujoch/nextgendcu!80
2024-10-08 21:04:09 +02:00
95eaad3d35 version 1.0.0-rc.15 2024-10-08 21:04:09 +02:00
7a23eade30 Merge branch '2410-pedestal-no-window' into 'main'
version 1.0.0-rc.14

See merge request jungfraujoch/nextgendcu!79
1.0.0-rc.14
2024-10-07 11:56:40 +02:00
3be959f272 version 1.0.0-rc.14 2024-10-07 11:56:40 +02:00
9e21d312b2 Merge branch '2410-first-release' into 'main'
version 1.0.0-rc.13

See merge request jungfraujoch/nextgendcu!78
1.0.0-rc.13
2024-10-05 13:14:49 +02:00
e812918e2e version 1.0.0-rc.13 2024-10-05 13:14:49 +02:00
e03a41ec73 Merge branch '2408-maxiv-ci' into 'main'
MAXIV CI: Add docker-shared tag

See merge request jungfraujoch/nextgendcu!77
2024-08-08 12:37:51 +02:00
f7ae0546bd MAXIV CI: Add docker-shared tag 2024-08-08 12:18:31 +02:00
e1045ee3b6 Merge branch '2407-minor-fix' into 'main'
1.0.0-rc.12 Minor fixes

See merge request jungfraujoch/nextgendcu!76
1.0.0-rc.12
2024-07-08 19:58:27 +02:00
3e5ed2e9f9 1.0.0-rc.12 Minor fixes 2024-07-08 19:58:27 +02:00
3a08733872 Merge branch '2407-versioning' into 'main'
1.0.0-rc.12: Fixes to versioning

See merge request jungfraujoch/nextgendcu!75
2024-07-06 10:56:55 +02:00
00be0bb224 1.0.0-rc.12: Fixes to versioning 2024-07-06 10:56:54 +02:00
c4fc178f7a Merge branch '2406-sqroot' into 'main'
Version 1.0.0-rc.12

See merge request jungfraujoch/nextgendcu!74
2024-07-06 09:34:44 +02:00
6b5fddf2b7 Version 1.0.0-rc.12 2024-07-06 09:34:44 +02:00
2b9ce9a26e Merge branch '2406-more-minor-stuff' into 'main'
v1.0.0_rc.11

See merge request jungfraujoch/nextgendcu!73
1.0.0_rc.11
2024-06-30 17:48:35 +02:00
3035d9e144 v1.0.0_rc.11 2024-06-30 17:48:35 +02:00
53b5a304d3 Merge branch '2406-openapi-python-client' into 'main'
Minor modifications to jfjoch_writer and OpenAPI

See merge request jungfraujoch/nextgendcu!72
1.0.0_rc.10
2024-06-28 20:44:51 +02:00
30a92d8eb9 Minor modifications to jfjoch_writer and OpenAPI 2024-06-28 20:44:51 +02:00
81df571961 Merge branch '2406-after-crmx' into 'main'
Modifications after CristallinaMX beamtime

See merge request jungfraujoch/nextgendcu!71
2024-06-27 20:26:11 +02:00
1717e171b9 Modifications after CristallinaMX beamtime 2024-06-27 20:26:11 +02:00