Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge ducts #817

Closed
wants to merge 138 commits into from
Closed

Merge ducts #817

wants to merge 138 commits into from

Commits on Feb 18, 2020

  1. Merge pull request #626 from DLR-SL/develop

    merge develop into master
    MarAlder authored Feb 18, 2020
    Configuration menu
    Copy the full SHA
    8777316 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2021

  1. Configuration menu
    Copy the full SHA
    bfa7c91 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Merge branch 'develop'

    MarAlder committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    bebd689 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2021

  1. Configuration menu
    Copy the full SHA
    6925b19 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ed5d9d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. Configuration menu
    Copy the full SHA
    6f31bd6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b7595c8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    23dce08 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. Configuration menu
    Copy the full SHA
    07b8b9c View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. update latest powerBreakdown from Exact project; modify Avacon breakd…

    …own to be consistent with Exact
    MarAlder committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    e757adc View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2021

  1. Configuration menu
    Copy the full SHA
    10c3c72 View commit details
    Browse the repository at this point in the history
  2. fix typo (#721, #732)

    MarAlder committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    a9a651a View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2021

  1. Configuration menu
    Copy the full SHA
    37030c6 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2021

  1. make latitude and longitude optional; uID of powerBreakdownCase optio…

    …nal; added ata chapters
    MarAlder committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    0b9c5d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2022

  1. update release information

    MarAlder committed Mar 4, 2022
    Configuration menu
    Copy the full SHA
    498d727 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. update power breakdown

    MarAlder committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    a3f3b0c View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Configuration menu
    Copy the full SHA
    fc56afd View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2022

  1. Configuration menu
    Copy the full SHA
    89e4e3e View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. Configuration menu
    Copy the full SHA
    c557bfb View commit details
    Browse the repository at this point in the history
  2. use all for specification

    MarAlder committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    1425532 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8f3ddff View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2022

  1. beautify for 3.4 release

    MarAlder committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    cd48bca View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c84bb2d View commit details
    Browse the repository at this point in the history
  3. fix doc typo

    MarAlder committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    fe12c2d View commit details
    Browse the repository at this point in the history
  4. Merge pull request #773 from DLR-SL/develop

    merge develop into master for 3.4 release
    MarAlder authored Apr 20, 2022
    Configuration menu
    Copy the full SHA
    dcd3767 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2022

  1. schema/cpacs_schema.xsd

    MarAlder committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    305c944 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. Configuration menu
    Copy the full SHA
    f003bc2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8719882 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    10cf039 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Configuration menu
    Copy the full SHA
    006beca View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Configuration menu
    Copy the full SHA
    33bfffd View commit details
    Browse the repository at this point in the history
  2. delete old script versions

    MarAlder committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    42b2dc8 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2022

  1. Configuration menu
    Copy the full SHA
    0b40001 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. Fix typos

    Found via `codespell -q 3 -S *.svg -L globaly,te,warmup,wont`
    luzpaz committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    28d3a3e View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Configuration menu
    Copy the full SHA
    1f9c9d3 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2022

  1. Follow-up fixes

    luzpaz committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    b4cfb15 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. remove regex

    MarAlder committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    b80446b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #794 from luzpaz/typos

    Fix typos
    MarAlder authored Nov 11, 2022
    Configuration menu
    Copy the full SHA
    cb76729 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    03e2baa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4a66b32 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Configuration menu
    Copy the full SHA
    a984bd3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #801 from DLR-SL/versioning

    Versioning
    MarAlder authored Nov 17, 2022
    Configuration menu
    Copy the full SHA
    b6b0169 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cd3efa4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2386484 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #802 from DLR-SL/massBreakdown

    Merge #776 and #771 into develop.
    MarAlder authored Nov 17, 2022
    Configuration menu
    Copy the full SHA
    2945c03 View commit details
    Browse the repository at this point in the history
  6. resolve merge conflicts by cleaning development schema, keeping valid…

    … example files from develop
    MarAlder committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    866be8e View commit details
    Browse the repository at this point in the history
  7. Merge pull request #803 from DLR-SL/syntax_cleanup

    Syntax cleanup
    MarAlder authored Nov 17, 2022
    Configuration menu
    Copy the full SHA
    ff33c61 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. Configuration menu
    Copy the full SHA
    a3a6b6c View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. Configuration menu
    Copy the full SHA
    c5af531 View commit details
    Browse the repository at this point in the history
  2. indentation to spaces

    MarAlder committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    2d65442 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. Configuration menu
    Copy the full SHA
    6f6d3c9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fc626d7 View commit details
    Browse the repository at this point in the history
  3. resolve merge conflicts

    MarAlder committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    20b4dca View commit details
    Browse the repository at this point in the history
  4. solve merge conflicts

    MarAlder committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    a0c94d7 View commit details
    Browse the repository at this point in the history
  5. add systemArchitecture

    MarAlder committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    5ff44d6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    219d48f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bb2b62c View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Configuration menu
    Copy the full SHA
    f5424a2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9c9f705 View commit details
    Browse the repository at this point in the history
  3. add powerBreakdown example

    MarAlder committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    cc6a8b8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3711d7a View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2022

  1. Configuration menu
    Copy the full SHA
    6c9052f View commit details
    Browse the repository at this point in the history
  2. fix schema test

    MarAlder committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    4b14104 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e0901e4 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. Configuration menu
    Copy the full SHA
    e1ca646 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. Configuration menu
    Copy the full SHA
    faa2404 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2022

  1. fix indent for simpleTypes

    MarAlder committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    cac087e View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2022

  1. Configuration menu
    Copy the full SHA
    29a2578 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    eb77e24 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. Configuration menu
    Copy the full SHA
    d667628 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    30a14a5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4085ca7 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. some renaming

    MarAlder committed May 25, 2023
    Configuration menu
    Copy the full SHA
    ce852a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Configuration menu
    Copy the full SHA
    aacb550 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Configuration menu
    Copy the full SHA
    229a31d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dbae468 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    791495d View commit details
    Browse the repository at this point in the history
  4. rename batteryUIDs

    MarAlder committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    86dd9a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Configuration menu
    Copy the full SHA
    975ebb0 View commit details
    Browse the repository at this point in the history
  2. add indents

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    964bc06 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6df811d View commit details
    Browse the repository at this point in the history
  4. Merge pull request #815 from DLR-SL/systems

    Systems
    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    a7c3515 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    45ce150 View commit details
    Browse the repository at this point in the history
  6. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    32a7ce8 View commit details
    Browse the repository at this point in the history
  7. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    ec33642 View commit details
    Browse the repository at this point in the history
  8. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    6ec4083 View commit details
    Browse the repository at this point in the history
  9. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    462496e View commit details
    Browse the repository at this point in the history
  10. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    6eb242e View commit details
    Browse the repository at this point in the history
  11. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    cdbebbc View commit details
    Browse the repository at this point in the history
  12. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    956021c View commit details
    Browse the repository at this point in the history
  13. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    7c96a95 View commit details
    Browse the repository at this point in the history
  14. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    26dfba7 View commit details
    Browse the repository at this point in the history
  15. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    0b14bb2 View commit details
    Browse the repository at this point in the history
  16. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    f50927f View commit details
    Browse the repository at this point in the history
  17. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    84bca4e View commit details
    Browse the repository at this point in the history
  18. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    efaf2c0 View commit details
    Browse the repository at this point in the history
  19. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    af2d72c View commit details
    Browse the repository at this point in the history
  20. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    6de3d35 View commit details
    Browse the repository at this point in the history
  21. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    1e0ec29 View commit details
    Browse the repository at this point in the history
  22. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    847ff1e View commit details
    Browse the repository at this point in the history
  23. Update run_tests.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    06ee4ca View commit details
    Browse the repository at this point in the history
  24. fix typo

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    89dee7c View commit details
    Browse the repository at this point in the history
  25. resolve merge conflict

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    6050dd8 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    a0b2b06 View commit details
    Browse the repository at this point in the history
  27. Merge pull request #816 from DLR-SL/cryogenicFuelTanks

    Cryogenic fuel tanks
    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    473627d View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    50879f2 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    abb1348 View commit details
    Browse the repository at this point in the history
  30. update doc config

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    9d6bd10 View commit details
    Browse the repository at this point in the history
  31. add htmlDoc to appveyor

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    a4640fd View commit details
    Browse the repository at this point in the history
  32. fix appveyor

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    722493e View commit details
    Browse the repository at this point in the history
  33. fix appveyor

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    64bdda2 View commit details
    Browse the repository at this point in the history
  34. fix appveyor

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    e3c04bb View commit details
    Browse the repository at this point in the history
  35. fix appveyor

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    f6bbdb7 View commit details
    Browse the repository at this point in the history
  36. Create build_docs.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    6fa3646 View commit details
    Browse the repository at this point in the history
  37. Update build_docs.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    cdf2c17 View commit details
    Browse the repository at this point in the history
  38. Update build_docs.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    c89c5c9 View commit details
    Browse the repository at this point in the history
  39. add pages deploy

    MarAlder committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    41084f4 View commit details
    Browse the repository at this point in the history
  40. Update build_docs.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    174bb3d View commit details
    Browse the repository at this point in the history
  41. Update build_docs.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    0042585 View commit details
    Browse the repository at this point in the history
  42. Update build_docs.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    149288a View commit details
    Browse the repository at this point in the history
  43. Update build_docs.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    2fd397d View commit details
    Browse the repository at this point in the history
  44. Update build_docs.yml

    MarAlder authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    2ffe48a View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. Update run_tests.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    ef25daa View commit details
    Browse the repository at this point in the history
  2. Update build_docs.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    d6e7b48 View commit details
    Browse the repository at this point in the history
  3. Update build_docs.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    b19c192 View commit details
    Browse the repository at this point in the history
  4. Update build_docs.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    12bdeb1 View commit details
    Browse the repository at this point in the history
  5. Update build_docs.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    4c52fc1 View commit details
    Browse the repository at this point in the history
  6. Update build_docs.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    52102c6 View commit details
    Browse the repository at this point in the history
  7. Update build_docs.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    12ca98b View commit details
    Browse the repository at this point in the history
  8. Update build_docs.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    9317d03 View commit details
    Browse the repository at this point in the history
  9. Update build_docs.yml

    MarAlder authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    efc33e4 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Update build_docs.yml

    MarAlder authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    c1612ae View commit details
    Browse the repository at this point in the history
  2. Update build_docs.yml

    MarAlder authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    f58d523 View commit details
    Browse the repository at this point in the history
  3. Update build_docs.yml

    MarAlder authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    e0b3a93 View commit details
    Browse the repository at this point in the history
  4. Update build_docs.yml

    MarAlder authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    4d0f0f9 View commit details
    Browse the repository at this point in the history
  5. Update build_docs.yml

    MarAlder authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    2dce89d View commit details
    Browse the repository at this point in the history
  6. update schema version

    MarAlder committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    6335580 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Update readme.md

    MarAlder authored Aug 7, 2023
    Configuration menu
    Copy the full SHA
    bb5c6d0 View commit details
    Browse the repository at this point in the history