1231 Commits

Author SHA1 Message Date
2fd30a2f38
Merge remote-tracking branch 'origin/main' into virt-channel-bugfix 2023-11-29 14:21:40 +01:00
e6278c7a23
Merge remote-tracking branch 'origin/main' into ploc-supv-extensions 2023-11-29 14:18:12 +01:00
178da2fec1
changelog update 2023-11-29 14:17:17 +01:00
5bad2a46a8
Merge remote-tracking branch 'origin/main' into persistent-tm-store-delete-time-range 2023-11-29 14:11:19 +01:00
6ed3dc1b50 one of those days ... 2023-11-29 10:43:10 +01:00
bd71446e05 changelog 2023-11-29 10:42:36 +01:00
14e545618c typo 2023-11-28 15:42:36 +01:00
f92642623e update changelog 2023-11-28 15:38:57 +01:00
b987566947
changelog 2023-11-27 15:41:58 +01:00
9e31c06563 changelog update 2023-11-23 17:47:44 +01:00
66619909a6 changelog 2023-11-21 17:44:51 +01:00
5348188f6b changelog 2023-11-16 17:11:19 +01:00
9010d1d202 add new command to reload the JSON file 2023-11-16 17:07:47 +01:00
c465558543 Merge branch 'main' into higher-acs-modes-only-str 2023-11-14 16:07:22 +01:00
49a87224e7
changelog update 2023-11-07 09:13:21 +01:00
3fe2c44955 Merge branch 'main' into prep_v7.3.0 2023-11-06 15:36:04 +01:00
93c5e542bd
bump release date 2023-11-06 14:44:01 +01:00
4986955a0f
bump changelog 2023-11-06 14:43:31 +01:00
65f907448c Merge branch 'make-robin-happy-about-timestuff' into higher-acs-modes-only-str 2023-11-02 16:30:54 +01:00
b29c9c6e9c Merge branch 'make-robin-happy-about-timestuff' of egit.irs.uni-stuttgart.de:eive/eive-obsw into make-robin-happy-about-timestuff 2023-11-02 16:28:43 +01:00
c11867323c
changelog 2023-10-30 16:11:36 +01:00
e45f9899ff
changelog 2023-10-30 14:46:46 +01:00
37853f8fe2 Merge branch 'main' into prep_v7.2.0 2023-10-30 10:32:12 +01:00
a2090448ff changelog 2023-10-30 08:52:18 +01:00
647a394150
eive-tmtc version 2023-10-27 15:04:11 +02:00
43e981dfed
prep v7.2.0 2023-10-27 14:24:59 +02:00
49b2bef8f4 Merge pull request 'PL PCDU JSON update' () from plpcdu-json-file-update into main
Reviewed-on: 
2023-10-27 14:17:06 +02:00
68763e327b
Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update 2023-10-27 14:05:45 +02:00
3c55a07404 Merge branch 'main' into sus-fdir-reduce-events 2023-10-27 14:05:05 +02:00
febb36f0eb Merge branch 'main' into swap-rtd-9-and-11 2023-10-27 13:50:28 +02:00
d2b5384f05
make marius happy 2023-10-27 12:54:32 +02:00
5a67ce56aa
changelog 2023-10-27 12:43:32 +02:00
65bb860fb2 Merge branch 'main' into sus-fdir-reduce-events 2023-10-27 12:39:39 +02:00
6459a945ea
Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update 2023-10-27 12:35:55 +02:00
b30c85866f Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11 2023-10-27 12:34:52 +02:00
db582febb7 Merge remote-tracking branch 'origin/main' into str-extensions 2023-10-27 12:32:49 +02:00
44d9541e52 Merge branch 'main' into sus-fdir-reduce-events 2023-10-27 09:41:50 +02:00
599ff256ff Merge remote-tracking branch 'origin/main' into str-extensions 2023-10-26 19:18:28 +02:00
be9d00be04
Merge remote-tracking branch 'origin/main' into cfdp-fault-handler-event 2023-10-26 13:46:11 +02:00
c06cd710cf
Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11 2023-10-26 13:45:10 +02:00
ef2e62e418
changelog clarification 2023-10-25 17:51:41 +02:00
b7e33ebcb6
changelog 2023-10-25 17:49:31 +02:00
c67a9fa2c2
this might be a bugfix 2023-10-23 17:10:37 +02:00
3e5fae4458
Merge remote-tracking branch 'origin/main' into str-extensions 2023-10-23 13:53:01 +02:00
1f203e9f76
improvements for SoC FDIR 2023-10-19 14:20:40 +02:00
0854ec878b
added CFDP fault handler events 2023-10-19 11:27:21 +02:00
4295b6b987 Merge branch 'main' into str-extensions 2023-10-19 09:37:26 +02:00
b3f9a82064
changelog update 2023-10-18 18:16:32 +02:00
6621b20aef changelog 2023-10-18 14:36:34 +02:00
8b6fa63c60 changelog 2023-10-18 14:29:33 +02:00