 Robin Müller
|
accaf855ee
|
Merge remote-tracking branch 'upstream/service_11_bugfixes' into develop
|
2023-01-13 11:19:17 +01:00 |
|
Robin Müller
|
75fa7caf25
|
Merge remote-tracking branch 'upstream/development' into develop
|
2023-01-13 11:19:09 +01:00 |
|
Robin Müller
|
97c629ad84
|
update changelog
|
2023-01-13 10:53:36 +01:00 |
|
Robin Müller
|
2643ff194c
|
Merge remote-tracking branch 'upstream/development' into develop
|
2022-11-28 08:34:04 +01:00 |
|
Robin Müller
|
50930b41ba
|
Merge remote-tracking branch 'upstream/development' into mueller/dle_parser
|
2022-11-28 08:27:24 +01:00 |
 Steffen Gaisser
|
d6ee2ed400
|
Merge pull request 'AcceptsTelemetryIF tweaks' (#712) from eive/fsfw:mueller/accepts_tm_if_adaptions into development
Reviewed-on: fsfw/fsfw#712
|
2022-11-21 16:30:43 +01:00 |
|
Steffen Gaisser
|
f2150ff9c2
|
Merge pull request 'only delete table entry if not nullptr' (#710) from eive/fsfw:mueller/health_helper_bugfix into development
Reviewed-on: fsfw/fsfw#710
|
2022-11-21 16:24:13 +01:00 |
|
Steffen Gaisser
|
16ffa00155
|
Merge branch 'development' into mueller/dle_parser
|
2022-11-21 15:28:34 +01:00 |
|
Steffen Gaisser
|
0958c3a00e
|
Merge branch 'development' into mueller/health_helper_bugfix
|
2022-11-21 15:24:51 +01:00 |
|
Steffen Gaisser
|
3b0fed733f
|
Merge branch 'development' into mueller/uio_mapper_handle_symlinks
|
2022-11-21 15:23:15 +01:00 |
|
Robin Müller
|
dec7db3ae2
|
Merge remote-tracking branch 'upstream/development' into mueller/accepts_tm_if_adaptions
|
2022-11-21 15:00:06 +01:00 |
|
Robin Müller
|
b85ca64690
|
update changelog
|
2022-11-15 11:48:28 +01:00 |
|
Robin Müller
|
3bc3da5a8d
|
update changelog
|
2022-11-15 11:47:26 +01:00 |
|
Robin Müller
|
f8c07ec9cf
|
update changelog
|
2022-11-15 11:46:43 +01:00 |
|
Robin Müller
|
8199b8f359
|
bump changelog
|
2022-11-15 11:45:39 +01:00 |
|
Robin Müller
|
cbc8dbcdd4
|
update changelog
|
2022-11-15 11:44:45 +01:00 |
|
Robin Müller
|
1f58ba1f9b
|
update changelog
|
2022-11-15 09:58:15 +01:00 |
|
Robin Müller
|
002845108d
|
Merge remote-tracking branch 'upstream/development' into develop_update
|
2022-11-14 15:05:47 +01:00 |
|
Robin Müller
|
ab9b6c8c89
|
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers
|
2022-11-14 14:51:33 +01:00 |
|
Robin Müller
|
2461209169
|
Merge remote-tracking branch 'upstream/development' into develop
|
2022-10-28 10:10:20 +02:00 |
|
Robin Müller
|
f715b65d6e
|
Merge remote-tracking branch 'upstream/development' into mueller/local-pool-update-remove-ignore-fault-arg
|
2022-10-28 10:06:04 +02:00 |
|
Robin Müller
|
c11af63015
|
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers
|
2022-10-28 10:04:21 +02:00 |
|
Steffen Gaisser
|
955579c856
|
Merge branch 'development' into mueller/refactor-accepts-tc-tm-if
|
2022-10-24 14:57:38 +02:00 |
|
Steffen Gaisser
|
73e313c35b
|
Merge branch 'development' into mueller/local-pool-update
|
2022-10-24 14:35:24 +02:00 |
|
Robin Müller
|
dd2f42d22b
|
Merge branch 'development' into mueller/local-pool-update
|
2022-10-24 14:34:56 +02:00 |
|
Robin Müller
|
d8a4675842
|
bump changelog
|
2022-10-24 14:30:14 +02:00 |
|
Steffen Gaisser
|
a8041f220f
|
Merge branch 'development' into mueller/cfdp-update-without-handlers
|
2022-10-17 14:44:28 +02:00 |
|
Steffen Gaisser
|
f3e9277e59
|
Merge branch 'development' into mueller/refactor-accepts-tc-tm-if
|
2022-10-10 15:45:05 +02:00 |
|
Robin Müller
|
79ab0c4aa5
|
Merge branch 'mueller/smaller-tweaks' into develop
|
2022-09-16 18:24:39 +02:00 |
|
Robin Müller
|
72172a972b
|
update changelog
|
2022-09-16 18:24:23 +02:00 |
|
Robin Müller
|
3d2fc28468
|
Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into cfdp-integration
|
2022-09-16 11:10:35 +02:00 |
|
Robin Müller
|
1898b4f2db
|
Merge remote-tracking branch 'upstream/development' into update-from-upstream
|
2022-09-16 11:06:05 +02:00 |
|
Robin Müller
|
e585c1d84a
|
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers
|
2022-09-15 11:02:04 +02:00 |
|
Robin Müller
|
83b7b8707c
|
Merge remote-tracking branch 'origin/development' into mueller/refactor-accepts-tc-tm-if
|
2022-09-15 11:01:19 +02:00 |
|
Robin Müller
|
4f7f8310c9
|
Merge remote-tracking branch 'origin/development' into mueller/local-pool-update
|
2022-09-15 11:00:43 +02:00 |
|
Robin Müller
|
1a833e2d45
|
another missing changelog entry
|
2022-09-15 10:59:10 +02:00 |
|
Robin Müller
|
8df6d934d7
|
another missing changelog entry
|
2022-09-15 10:56:52 +02:00 |
|
Robin Müller
|
5363868120
|
added another missing changelog entry
|
2022-09-15 10:54:45 +02:00 |
|
Robin Müller
|
36cf59cc8e
|
Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers
|
2022-09-15 10:52:13 +02:00 |
|
Robin Müller
|
97fec909f2
|
Merge branch 'mueller/local-pool-update' into mueller/cfdp-update-without-handlers
|
2022-09-15 10:50:35 +02:00 |
|
Robin Müller
|
1db77753e3
|
Merge remote-tracking branch 'origin/development' into mueller/local-pool-update
|
2022-09-15 10:49:24 +02:00 |
|
Robin Müller
|
8501477a78
|
Merge remote-tracking branch 'origin/development' into mueller/refactor-accepts-tc-tm-if
|
2022-09-15 10:48:42 +02:00 |
|
Robin Müller
|
9a181aa6a8
|
another missing changelog entry
|
2022-09-15 10:47:50 +02:00 |
|
Robin Müller
|
655c944c0e
|
another missing changelog entry
|
2022-09-15 10:45:35 +02:00 |
|
Robin Müller
|
2e310fca8d
|
add another missing changelog entry
|
2022-09-15 10:43:45 +02:00 |
|
Robin Müller
|
37390dfc74
|
add missing changelog entry
|
2022-09-15 10:42:35 +02:00 |
|
Robin Müller
|
75ddfdc65d
|
Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers
|
2022-09-15 10:41:16 +02:00 |
|
Robin Müller
|
1efc0d2855
|
update changelog
|
2022-09-15 10:38:40 +02:00 |
|
Robin Müller
|
e063b44899
|
add link to PR
|
2022-09-15 10:32:38 +02:00 |
|
Robin Müller
|
b3c0e24611
|
bump changelog
|
2022-09-15 10:31:55 +02:00 |
|
Robin Müller
|
723f8749d4
|
bump changelog
|
2022-09-14 19:52:33 +02:00 |
|
Robin Müller
|
73f1917c81
|
update changelog
|
2022-09-14 19:26:07 +02:00 |
|
Robin Müller
|
eedf57624f
|
Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm' into develop
|
2022-08-30 15:40:52 +02:00 |
|
Robin Müller
|
d4ed528426
|
Merge remote-tracking branch 'upstream/mueller/data-wrapper' into mueller/data-wrapper-update
|
2022-08-30 14:52:09 +02:00 |
|
Robin Müller
|
e10e71cee9
|
Merge branch 'mueller/data-wrapper' into mueller/dhb-handle-device-tm
|
2022-08-30 14:42:13 +02:00 |
|
Robin Müller
|
d675a789a2
|
update changelog
|
2022-08-30 14:41:37 +02:00 |
|
Robin Müller
|
6b8c83be29
|
update changelog
|
2022-08-30 14:40:02 +02:00 |
|
Robin Müller
|
f91ad84bdc
|
Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-retval-merged
|
2022-08-24 17:13:41 +02:00 |
|
Robin Müller
|
a46d8c34d9
|
small changelog update
|
2022-08-22 16:37:53 +02:00 |
|
Robin Müller
|
10f34e5a48
|
Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack-with-retval-refactoring
|
2022-08-22 15:57:22 +02:00 |
|
Robin Müller
|
2a4ab0af7b
|
Merge branch 'mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-with-retval-refactoring
|
2022-08-22 14:17:24 +02:00 |
|
Robin Müller
|
e3648b6e30
|
Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring
|
2022-08-16 17:25:22 +02:00 |
|
Robin Müller
|
239d053562
|
update changelog
|
2022-08-16 17:23:10 +02:00 |
 Ulrich Mohr
|
f63f3fa564
|
more occurences in comments
|
2022-08-16 12:12:21 +02:00 |
|
Robin Müller
|
1037102349
|
merge retval refactoring
|
2022-08-16 01:08:26 +02:00 |
|
Robin Müller
|
221361eb9c
|
Merge remote-tracking branch 'origin/development' into mueller/expand-retval-if
|
2022-08-15 20:32:38 +02:00 |
|
Robin Müller
|
4224c3d009
|
bump changelog
|
2022-08-15 20:29:23 +02:00 |
|
Robin Müller
|
c57e95c698
|
Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring
|
2022-08-15 19:18:46 +02:00 |
|
Robin Müller
|
9d64b96e9a
|
update changelog
|
2022-08-15 15:02:39 +02:00 |
|
Robin Müller
|
8970a7379a
|
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
|
2022-08-12 12:21:50 +02:00 |
|
Robin Müller
|
05d4162f5b
|
Merge branch 'development' into v5.0.0
|
2022-07-25 14:35:36 +02:00 |
|
Robin Müller
|
e030878023
|
changelog
|
2022-07-25 14:33:10 +02:00 |
|
Robin Müller
|
9bbe1dc716
|
Merge branch 'development' into mueller/possible-ring-buffer-fix
|
2022-07-21 13:23:44 +02:00 |
|
Robin Müller
|
6f751c2cf9
|
Merge branch 'development' into v5.0.0
|
2022-07-18 15:12:21 +02:00 |
|
Robin Müller
|
91067cde98
|
typo
|
2022-07-18 15:00:40 +02:00 |
|
Robin Müller
|
428018e4f1
|
update changelog
|
2022-07-18 14:59:25 +02:00 |
|
Robin Müller
|
8b6dd3f868
|
add date to changelog
|
2022-07-18 14:49:27 +02:00 |
|
Robin Müller
|
4da18172b3
|
Merge branch 'development' into mueller/possible-ring-buffer-fix
|
2022-07-18 14:37:56 +02:00 |
|
Ulrich Mohr
|
2e42f53682
|
Merge pull request 'New PoolEntry constructor' (#651) from eive/fsfw:mueller/new-pool-entry-ctor into development
Reviewed-on: fsfw/fsfw#651
|
2022-07-13 17:43:56 +02:00 |
|
Robin Müller
|
0e49640306
|
update CHANGELOG
|
2022-07-08 17:59:43 +02:00 |
|
Robin Müller
|
0519083894
|
remove duplicate entries
|
2022-07-08 17:48:06 +02:00 |
|
Robin Müller
|
a4247cd723
|
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
|
2022-07-04 10:53:52 +02:00 |
|
Robin Müller
|
2ebefdffae
|
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix
|
2022-06-21 10:49:03 +02:00 |
|
Steffen Gaisser
|
732b615cb3
|
Merge branch 'development' into mueller/new-cicd-cmake-opts
|
2022-06-20 16:34:13 +02:00 |
|
Robin Müller
|
d47a908117
|
Merge branch 'development' into mueller/task-if-refactoring
|
2022-06-20 09:40:31 +02:00 |
|
Robin Müller
|
a3c0b441ec
|
update changelog
|
2022-06-08 12:12:33 +02:00 |
|
Robin Müller
|
3f9e459f48
|
update changelog
|
2022-06-08 12:12:09 +02:00 |
|
Robin Müller
|
98b711a872
|
update changelog
|
2022-06-08 12:12:09 +02:00 |
|
Robin Müller
|
4b323053ec
|
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
|
2022-05-16 15:27:58 +02:00 |
|
Robin Müller
|
d871f55a89
|
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix
|
2022-05-16 15:13:47 +02:00 |
|
Robin Müller
|
816550b69c
|
Merge remote-tracking branch 'upstream/development' into mueller/new-cicd-cmake-opts
|
2022-05-16 14:58:25 +02:00 |
|
Robin Müller
|
ef9d7aa7d3
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-16 14:42:23 +02:00 |
|
Robin Müller
|
8a12a5097e
|
Merge branch 'mueller/apply-afmt' into mueller/new-cicd-cmake-opts
|
2022-05-13 13:50:41 +02:00 |
|
Robin Müller
|
0375ee1881
|
update changelog
|
2022-05-13 13:46:54 +02:00 |
|
Robin Müller
|
2708b71d77
|
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts
|
2022-05-13 12:00:40 +02:00 |
|
Robin Müller
|
13a34cd677
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-13 11:58:41 +02:00 |
|
Robin Müller
|
ff40a71582
|
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix
|
2022-05-13 11:30:32 +02:00 |
|
Robin Müller
|
271057ca6b
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-05-13 11:28:54 +02:00 |
|
Robin Müller
|
fc2b709148
|
resolve merge conflict
|
2022-05-12 20:48:50 +02:00 |
|
Robin Müller
|
02473a0cd7
|
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive
|
2022-05-12 20:11:45 +02:00 |