Commit Graph

5586 Commits

Author SHA1 Message Date
Robin Müller 2316728d74 Merge branch 'development' into mueller/dhb-countdown-bug 2022-10-04 10:53:26 +02:00
Robin Müller 6f562e5f3e
missing retval conv 2022-10-04 10:25:58 +02:00
Ulrich Mohr 176f243194 Merge pull request 'Switch to new documentation server' (#694) from mohr/documentation_ci into development
Reviewed-on: fsfw/fsfw#694
2022-09-30 15:05:16 +02:00
Ulrich Mohr d964fa2107 Merge branch 'development' into mohr/documentation_ci 2022-09-30 14:50:20 +02:00
Ulrich Mohr 7b5ae6a445 done? 2022-09-30 14:40:59 +02:00
Ulrich Mohr 8e362a000c Revert "one last check"
This reverts commit 7877776e24.
2022-09-30 14:36:25 +02:00
Ulrich Mohr 7877776e24 one last check 2022-09-30 14:34:25 +02:00
Robin Müller 3de0ae5a48 DHB bug 2022-09-29 17:22:44 +02:00
Robin Müller b9d0ff8fb7
DHB bug 2022-09-29 17:20:18 +02:00
Robin Müller 227535c461
formatting and smaller stuff 2022-09-29 16:46:55 +02:00
Robin Müller c47bed0760 small important bugfix for DLE parser 2022-09-28 17:04:11 +02:00
Robin Müller 9927dbb2e4 Merge branch 'windows-tweaks' into develop 2022-09-28 10:06:08 +02:00
Robin Müller 14a48fe41d
better comment 2022-09-28 09:56:20 +02:00
Robin Müller c932e51818 Merge branch 'windows-tweaks' into develop 2022-09-28 00:03:51 +02:00
Robin Müller 2ca8d72e83
another small windows tweak 2022-09-28 00:03:12 +02:00
Robin Müller 03e1a93250
last windows tweak 2022-09-27 23:57:58 +02:00
Robin Müller 6d2f44a432
tweaks to make windows build again 2022-09-27 21:46:11 +02:00
Steffen Gaisser 95ac53c417 Merge branch 'development' into mueller/smaller-tweaks 2022-09-26 14:40:29 +02:00
Steffen Gaisser 62f638a3d2 Merge pull request 'doc corrections' (#687) from mueller/doc-corrections into development
Reviewed-on: fsfw/fsfw#687
2022-09-26 14:38:39 +02:00
Steffen Gaisser bd64591f30 Merge branch 'development' into mueller/smaller-tweaks 2022-09-26 14:34:38 +02:00
Steffen Gaisser e6a877f048 Merge branch 'development' into mueller/doc-corrections 2022-09-26 14:26:48 +02:00
Steffen Gaisser ea8c557ee8 Merge pull request 'better error printout' (#686) from eive/fsfw:mueller/local-pool-obj-base-better-warning into development
Reviewed-on: fsfw/fsfw#686
2022-09-26 14:26:20 +02:00
Steffen Gaisser 0bdd780f82 Merge branch 'development' into mueller/doc-corrections 2022-09-26 14:17:24 +02:00
Steffen Gaisser 9ec397c8b7 Merge branch 'development' into mueller/local-pool-obj-base-better-warning 2022-09-26 14:17:19 +02:00
Robin Müller c54d9d7ba6
add some tests 2022-09-26 14:15:11 +02:00
Steffen Gaisser 30c03c110c Merge pull request 'include correction' (#683) from mueller/service-interface-include-correction into development
Reviewed-on: fsfw/fsfw#683
2022-09-26 14:14:57 +02:00
Steffen Gaisser 69f1be263a Merge branch 'development' into mueller/local-pool-obj-base-better-warning 2022-09-26 14:10:21 +02:00
Robin Müller c7b5309dcb Merge branch 'development' into mueller/service-interface-include-correction 2022-09-26 14:08:38 +02:00
Ulrich Mohr 775d5632de update to ssh connection to doc server 2022-09-23 20:26:45 +02:00
Ulrich Mohr 4f3361eb2b another ci check 2022-09-23 18:33:47 +02:00
Ulrich Mohr 9e6c1d60e5 another ci check 2022-09-23 17:54:41 +02:00
Ulrich Mohr 12d0c23c13 Revert "testing deployment of documentation"
This reverts commit 5488ee715f.
2022-09-23 17:31:17 +02:00
Ulrich Mohr 5c3bb13834 Revert "testing deployment of both development and master doc"
This reverts commit c0000a8635.
2022-09-23 17:31:07 +02:00
Ulrich Mohr 292fe3e5e4 forgot epilog file 2022-09-23 17:11:57 +02:00
Ulrich Mohr 33530f2819 adding Impressum and Datenschutz to lcov output 2022-09-23 17:04:35 +02:00
Ulrich Mohr c0000a8635 testing deployment of both development and master doc 2022-09-23 14:14:10 +02:00
Ulrich Mohr 5488ee715f testing deployment of documentation 2022-09-23 14:07:12 +02:00
Ulrich Mohr 0fea22d031 switching to rsync and deploying to web documentation 2022-09-23 14:06:28 +02:00
Ulrich Mohr 3b8ca09299 prepared docker for documentation rsync 2022-09-23 13:46:03 +02:00
Ulrich Mohr 9a2146fa2d added impressum and datenschutz in sphinx documentation 2022-09-23 11:36:29 +02:00
Robin Müller 808e3e0462
remove unused variable 2022-09-16 18:54:48 +02:00
Robin Müller 558550ecb9 Merge branch 'development' into mueller/smaller-tweaks 2022-09-16 18:37:39 +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 b4b11ebd3b fixes and tweaks 2022-09-16 18:20:42 +02:00
Robin Müller c5b24f2516
fixes and tweaks 2022-09-16 18:08:20 +02:00
Robin Müller bdbe0cc9da pass message queue externally 2022-09-16 16:28:41 +02:00
Robin Müller e2c1158337
pass message queue externally 2022-09-16 16:27:57 +02:00
Robin Müller 95aac7dc8d Merge pull request 'CFDP FSFW Integration' (#111) from cfdp-integration into develop
Reviewed-on: #111
2022-09-16 11:11:20 +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