Skip to content

Commit

Permalink
Merge branch 'main' into docs/change-timezone-open-meetings
Browse files Browse the repository at this point in the history
  • Loading branch information
stephanbcbauer authored Dec 10, 2024
2 parents 54ae301 + 34ac25a commit 5f4aa99
Show file tree
Hide file tree
Showing 860 changed files with 36,454 additions and 17,509 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/trufflehog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
with:
path: ./ # Scan the entire repository
base: "${{ github.event.repository.default_branch }}" # Set base branch for comparison (pull requests)
extra_args: --filter-entropy=4 --results=verified,unknown --debug
extra_args: --filter-entropy=4 --results=verified,unknown --debug --only-verified

- name: Scan Results Status
if: steps.trufflehog.outcome == 'failure'
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Eclipse-tractusx website
# Eclipse Tractus-X website

This website is built using [Docusaurus 2](https://docusaurus.io/), a modern static website generator.

Expand Down Expand Up @@ -27,14 +27,14 @@ You can also run the linting step manually by running `npm run lint-doc` or `npm

## 3rd Party dependency checks

This repository enforces licence compatibility checks on all Pull Requests. This is demanded by [TRG 7.04](https://eclipse-tractusx.github.io/docs/release/trg-7/trg-7-04#checking-libraries-using-the-eclipse-dash-license-tool).
This repository enforces license compatibility checks on all Pull Requests. This is demanded by [TRG 7.04](https://eclipse-tractusx.github.io/docs/release/trg-7/trg-7-04#checking-libraries-using-the-eclipse-dash-license-tool).
Follow these steps if your PR's workflow fails on the action `3rd Party dependency check (Eclipse Dash)`:

1. Make sure the error-message is not `[main] ERROR Error response from XYZ HTTP 524` or anything else pointing to
failures in remote services. If that happens, try again tomorrow. If not, continue.
2. Have java installed. Check by executing `java --version` in your bash terminal. For Windows Powershell or command
prompt, this and the following commands may look different but should follow the same structure.
3. Download the jar of the dash licence tool's latest release (for instance [distributed via eclipse](https://repo.eclipse.org/content/repositories/dash-licenses/org/eclipse/dash/org.eclipse.dash.licenses/)).
3. Download the jar of the dash license tool's latest release (for instance [distributed via eclipse](https://repo.eclipse.org/content/repositories/dash-licenses/org/eclipse/dash/org.eclipse.dash.licenses/)).
4. Move the file into the top level folder of this repository. Do not add it to git or commit it.
5. Navigate your terminal to the top level folder of this project (eclipse-tractusx.github.io).
6. Execute `java -jar ./org.eclipse.dash.licenses-1.1.0.jar package-lock.json -project automotive.tractusx -summary ./DEPENDENCIES`
Expand Down
12 changes: 12 additions & 0 deletions community/open-meetings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,15 @@ All the times are shown in:
/>

## One-time meetings

<MeetingInfo title="Portal - Presentation R24.12 and Open Meeting"
schedule="12. Dec 2024 from 01:30 pm to 02:30 pm"
description="Presentation Release 24.12 and coordination of feature refinement and development for portal product."
contact="[email protected]"
sessionLink="https://teams.microsoft.com/l/meetup-join/19%3ameeting_YmIyYjgwOTQtZjI1Ny00YmM0LTlmOWQtODRjZWFmZWM1Y2E3%40thread.v2/0?context=%7b%22Tid%22%3a%221ad22c6d-2f08-4f05-a0ba-e17f6ce88380%22%2c%22Oid%22%3a%22a8b7a5ee-66ff-4695-afa2-08f893d8aaf6%22%7d"
additionalLinks={
[
{title: 'Portal Matrix Chat', url: 'https://chat.eclipse.org/#/room/#tractusx-portal:matrix.eclipse.org'},
]
}
/>
537 changes: 291 additions & 246 deletions docs-kits/kits/Circularity_KIT/page-adoption-view.md

Large diffs are not rendered by default.

361 changes: 89 additions & 272 deletions docs-kits/kits/Circularity_KIT/page-glossary.md

Large diffs are not rendered by default.

14 changes: 12 additions & 2 deletions docs-kits/kits/Circularity_KIT/page_changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: "Circularity KIT"
sidebar_position: 1
---

![Circulairty kit banner](/img/kit-icons/circularity-kit-icon.svg)
![Circularity kit banner](/img/kit-icons/circularity-kit-icon.svg)
All notable changes to this Kit will be documented in this file.

## [1.3.0] - 17.09.2024
Expand All @@ -18,7 +18,17 @@ All notable changes to this Kit will be documented in this file.

### Added

- add Informational Requirements at End of Life
- add new figures
- add license files for new figures

### Changed

- change structure of the contents. Same content chapters are in different order
- change wording

### Removed

- ./.

## [1.1.0] - 15.05.2024

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## NOTICE

This work is licensed under the [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/legalcode).

- Copyright (c) 2023 BMW AG
- Copyright (c) 2023 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. (represented by Fraunhofer IPK)
- Copyright (c) 2023 BASF SE
- Copyright (c) 2023 SAP Deutschland SE & Co.KG
- Copyright (c) 2023 T-Systems International GmbH
- Copyright (c) 2023 LRP Auto-Recycling Leipzig GmbH
- Copyright (c) 2023 Robert Bosch GmbH
- Copyright (c) 2023 tec4U-Ingenieurgesellschaft mbH
- Copyright (c) 2023 Contributors to the Eclipse Foundation
- Source URL: https://github.com/eclipse-tractusx/eclipse-tractusx.github.io/tree/main/docs-kits/kits/Circularity_KIT/resources/adoption-view
Loading

0 comments on commit 5f4aa99

Please sign in to comment.