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.

Sign up for GitHub

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

Jump to bottom

replaced term tracker item with term tracker annotation #1850 #1922

Merged
merged 19 commits into from
Sep 17, 2024
Merged

replaced term tracker item with term tracker annotation #1850 #1922

merged 19 commits into from
Sep 17, 2024

Commits on Sep 16, 2024

  1. replaced term tracker item with term tracker annotation

    @madbkr
    madbkr committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    972f15c View commit details
    Browse the repository at this point in the history

  2. changelog.md and term tracker annotations added

    @madbkr
    madbkr committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    6847969 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/dev' into feature-1850-replaced-… 

    …term-tracker-item-with-term-tracker-annotation
    @madbkr
    madbkr committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    bf0c242 View commit details
    Browse the repository at this point in the history

  4. fix annotations of term tracker annotation #1850

    @stap-m
    stap-m committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    06ce703 View commit details
    Browse the repository at this point in the history

  5. Update src/ontology/edits/oeo-model.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    b32ddb2 View commit details
    Browse the repository at this point in the history

  6. Update src/ontology/edits/oeo-model.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    180d34b View commit details
    Browse the repository at this point in the history

  7. Update src/ontology/edits/oeo-physical.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    93695ea View commit details
    Browse the repository at this point in the history

  8. Update src/ontology/edits/oeo-shared.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    acc6787 View commit details
    Browse the repository at this point in the history

  9. Update src/ontology/edits/oeo-shared.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    ac14b3e View commit details
    Browse the repository at this point in the history

  10. Update src/ontology/edits/oeo-physical.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    439db08 View commit details
    Browse the repository at this point in the history

  11. Update src/ontology/edits/oeo-physical.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    f944f42 View commit details
    Browse the repository at this point in the history

  12. Update src/ontology/edits/oeo-physical.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    6cbabe1 View commit details
    Browse the repository at this point in the history

  13. Update src/ontology/edits/oeo-shared.omn

    @stap-m
    stap-m authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    da36f25 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Update CHANGELOG.md 

    Co-authored-by: l-emele <[email protected]>
    @stap-m @l-emele
    stap-m and l-emele authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    7e13440 View commit details
    Browse the repository at this point in the history

  2. Update src/ontology/edits/oeo-physical.omn 

    Co-authored-by: l-emele <[email protected]>
    @stap-m @l-emele
    stap-m and l-emele authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    4911de3 View commit details
    Browse the repository at this point in the history

  3. merge two term tracker annotations into one, biogasoline, #1922

    @stap-m
    stap-m committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    9d47340 View commit details
    Browse the repository at this point in the history

  4. correct term tracker annotations of term tracker annotation #1850

    @stap-m
    stap-m committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    2652bf2 View commit details
    Browse the repository at this point in the history

  5. solve conflicts

    @stap-m
    stap-m committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    bd61bc5 View commit details
    Browse the repository at this point in the history

  6. replaced term tracker item with term tracker annotation

    @madbkr
    madbkr committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    60fb1c9 View commit details
    Browse the repository at this point in the history