 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 |