1191 Commits

Author	SHA1	Message	Date
meggert	20920fe22f	Merge branch 'detumble-fix' into ptg-fixes	2024-01-29 17:03:19 +01:00
meggert	e17ef1bcfd	Merge branch 'main' into detumble-fix	2024-01-29 14:23:05 +01:00
meggert	a4d514fbb5	Merge branch 'main' into ptg-fixes	2024-01-29 14:18:24 +01:00
meggert	8390a02690	changelog	2024-01-29 14:15:16 +01:00
meggert	62c11798e5	Merge branch 'main' into cmd-rw-fix	2024-01-29 10:53:16 +01:00
meggert	3cc6fce575	Merge branch 'main' into smaller-ploc-tweaks	2024-01-29 10:51:17 +01:00
Robin Mueller	5c7f712bf2	Merge branch 'smaller-ploc-tweaks' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into smaller-ploc-tweaks	2024-01-29 10:40:19 +01:00
Robin Mueller	c4d0203846	changelog	2024-01-29 10:39:50 +01:00
Robin Mueller	5ec173f8c9	changelog	2024-01-29 10:38:29 +01:00
meggert	8dbbb7b9ec	Merge branch 'main' into cmd-rw-fix	2024-01-29 10:35:46 +01:00
meggert	68b0e3b20a	changelog	2024-01-29 10:25:23 +01:00
meggert	060217fbb4	changelog	2024-01-27 11:33:33 +01:00
meggert	398ddd1a3f	typo	2024-01-27 11:30:37 +01:00
meggert	c4297975ff	changelog	2024-01-27 10:47:42 +01:00
meggert	315365921e	changelog	2024-01-27 10:37:39 +01:00
Robin Mueller	a778daacfd	changelog	2024-01-25 11:14:57 +01:00
meggert	65502c0107	changelog	2024-01-22 10:05:05 +01:00
meggert	d3e08c36a2	changelog	2024-01-16 16:53:55 +01:00
meggert	0fe6c1397d	changelog	2024-01-16 16:36:17 +01:00
Robin Mueller	2abfb4a6b3	prep next patch	2023-12-19 11:55:48 +01:00
Robin Mueller	c0358d29ce	update CHANGELOG	2023-12-19 11:29:59 +01:00
Robin Mueller	262cc78e7e	prep v7.5.2	2023-12-14 10:00:59 +01:00
meggert	4701276523	changelog	2023-12-13 16:53:35 +01:00
Robin Mueller	9ceaa6817c	bump tmtc version	2023-12-13 11:32:19 +01:00
Robin Mueller	5cdb8db42a	prep v7.5.1	2023-12-13 11:31:59 +01:00
Robin Müller	d8bd52b4e3	Merge branch 'main' into allow-more-scheduled-commands	2023-12-13 11:24:29 +01:00
meggert	f9b56d206e	changelog	2023-12-13 10:13:21 +01:00
Robin Mueller	795b63c34f	Merge remote-tracking branch 'origin/main' into allow-more-scheduled-commands	2023-12-13 10:01:43 +01:00
Robin Mueller	9723bf70a0	changelog update	2023-12-12 17:54:29 +01:00
meggert	4858c1ea57	changelog	2023-12-12 17:03:58 +01:00
Robin Mueller	30fb60bd2b	OH MY GOD	2023-12-06 17:43:57 +01:00
Robin Mueller	91a12a7b72	changelog shenanigans	2023-12-06 17:43:00 +01:00
Robin Mueller	fe0ceac9b4	something went wrong here	2023-12-06 17:42:30 +01:00
Robin Mueller	160159ff8d	bump eive-tmtc version	2023-12-06 17:21:52 +01:00
meggert	4cad1176d0	changelog	2023-12-06 14:46:36 +01:00
meggert	09aa7bb439	Merge branch 'dev-7.5.0' into higher-acs-modes-only-str	2023-12-06 13:06:38 +01:00
meggert	215bc8022b	Merge branch 'main' into dev-7.5.0	2023-12-06 13:04:51 +01:00
Robin Mueller	3294cc85fc	bump patch version	2023-12-06 11:33:13 +01:00
meggert	b0b279e313	Merge branch 'dev-7.5.0' into higher-acs-modes-only-str	2023-12-04 13:19:28 +01:00
meggert	d0588b144a	Merge branch 'dev-7.5.0' into higher-acs-modes-only-str	2023-12-04 13:15:25 +01:00
meggert	aab705ca04	changelog	2023-12-01 14:22:10 +01:00
meggert	b86ee21da0	fix for failed handling	2023-12-01 12:56:31 +01:00
meggert	f9ab7962cd	Merge branch 'dev-7.5.0' into persistent-tle-store	2023-12-01 10:30:06 +01:00
meggert	03b43da57f	Merge branch 'main' into persistent-tle-store	2023-12-01 10:23:13 +01:00
meggert	c6d0357ac9	changelog fix	2023-12-01 10:22:52 +01:00
meggert	99195565f6	Merge branch 'main' into dev-7.5.0	2023-12-01 10:21:14 +01:00
Robin Mueller	fa727b1e44	bump tmtc to v5.11.0	2023-11-30 15:47:12 +01:00
Robin Mueller	325a6ff70b	prep v7.4.0	2023-11-30 15:20:50 +01:00
meggert	3c24dfad8c	Merge branch 'dev-7.5.0' into persistent-tle-store	2023-11-30 11:51:17 +01:00
meggert	7239b2e26d	small fixes	2023-11-30 11:43:12 +01:00
Robin Müller	c475c8fd8d	Merge branch 'dev-7.5.0' into acs-board-b-as-default	2023-11-29 18:51:25 +01:00
meggert	3969d05476	Merge branch 'main' into persistent-tle-store	2023-11-29 17:13:07 +01:00
meggert	f395c71fd0	changelog	2023-11-29 17:12:10 +01:00
meggert	882c5ce598	changelog	2023-11-29 17:03:34 +01:00
Robin Müller	e1e8b525b3	Merge branch 'main' into disable-order-check-plpcdu	2023-11-29 15:13:37 +01:00
Robin Müller	faf213d3b8	Merge branch 'main' into revert-str-com-if-changes	2023-11-29 15:13:19 +01:00
Robin Müller	d553afcc5b	Merge branch 'main' into revert-str-com-if-changes	2023-11-29 14:57:05 +01:00
Robin Mueller	6b6793d93f	Merge remote-tracking branch 'origin/main' into disable-order-check-plpcdu	2023-11-29 14:56:44 +01:00
Robin Mueller	30964a9648	Merge remote-tracking branch 'origin/main' into virt-channel-bugfix	2023-11-29 14:52:40 +01:00
Robin Mueller	210ee7b6d9	Merge remote-tracking branch 'origin/main' into ploc-supv-extensions	2023-11-29 14:24:01 +01:00
Robin Mueller	2fd30a2f38	Merge remote-tracking branch 'origin/main' into virt-channel-bugfix	2023-11-29 14:21:40 +01:00
Robin Mueller	e6278c7a23	Merge remote-tracking branch 'origin/main' into ploc-supv-extensions	2023-11-29 14:18:12 +01:00
Robin Mueller	178da2fec1	changelog update	2023-11-29 14:17:17 +01:00
Robin Mueller	5bad2a46a8	Merge remote-tracking branch 'origin/main' into persistent-tm-store-delete-time-range	2023-11-29 14:11:19 +01:00
meggert	6ed3dc1b50	one of those days ...	2023-11-29 10:43:10 +01:00
meggert	bd71446e05	changelog	2023-11-29 10:42:36 +01:00
Robin Mueller	14e545618c	typo	2023-11-28 15:42:36 +01:00
Robin Mueller	f92642623e	update changelog	2023-11-28 15:38:57 +01:00
Robin Mueller	b987566947	changelog	2023-11-27 15:41:58 +01:00
Robin Mueller	9e31c06563	changelog update	2023-11-23 17:47:44 +01:00
Robin Mueller	66619909a6	changelog	2023-11-21 17:44:51 +01:00
Robin Mueller	5348188f6b	changelog	2023-11-16 17:11:19 +01:00
Robin Mueller	9010d1d202	add new command to reload the JSON file	2023-11-16 17:07:47 +01:00
meggert	c465558543	Merge branch 'main' into higher-acs-modes-only-str	2023-11-14 16:07:22 +01:00
Robin Mueller	49a87224e7	changelog update	2023-11-07 09:13:21 +01:00
Marius Eggert	3fe2c44955	Merge branch 'main' into prep_v7.3.0	2023-11-06 15:36:04 +01:00
Robin Mueller	93c5e542bd	bump release date	2023-11-06 14:44:01 +01:00
Robin Mueller	4986955a0f	bump changelog	2023-11-06 14:43:31 +01:00
meggert	65f907448c	Merge branch 'make-robin-happy-about-timestuff' into higher-acs-modes-only-str	2023-11-02 16:30:54 +01:00
meggert	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
Robin Mueller	c11867323c	changelog	2023-10-30 16:11:36 +01:00
Robin Mueller	e45f9899ff	changelog	2023-10-30 14:46:46 +01:00
Robin Müller	37853f8fe2	Merge branch 'main' into prep_v7.2.0	2023-10-30 10:32:12 +01:00
meggert	a2090448ff	changelog	2023-10-30 08:52:18 +01:00
Robin Mueller	647a394150	eive-tmtc version	2023-10-27 15:04:11 +02:00
Robin Mueller	43e981dfed	prep v7.2.0	2023-10-27 14:24:59 +02:00
Robin Müller	49b2bef8f4	Merge pull request 'PL PCDU JSON update' (#812) from plpcdu-json-file-update into main ... Reviewed-on: #812	2023-10-27 14:17:06 +02:00
Robin Mueller	68763e327b	Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update	2023-10-27 14:05:45 +02:00
Robin Müller	3c55a07404	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 14:05:05 +02:00
Robin Müller	febb36f0eb	Merge branch 'main' into swap-rtd-9-and-11	2023-10-27 13:50:28 +02:00
Robin Mueller	d2b5384f05	make marius happy	2023-10-27 12:54:32 +02:00
Robin Mueller	5a67ce56aa	changelog	2023-10-27 12:43:32 +02:00
Robin Müller	65bb860fb2	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 12:39:39 +02:00
Robin Mueller	6459a945ea	Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update	2023-10-27 12:35:55 +02:00
Robin Mueller	b30c85866f	Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11	2023-10-27 12:34:52 +02:00
Robin Mueller	db582febb7	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-27 12:32:49 +02:00
meggert	44d9541e52	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 09:41:50 +02:00
Robin Mueller	599ff256ff	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-26 19:18:28 +02:00
Robin Mueller	be9d00be04	Merge remote-tracking branch 'origin/main' into cfdp-fault-handler-event	2023-10-26 13:46:11 +02:00
Robin Mueller	c06cd710cf	Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11	2023-10-26 13:45:10 +02:00