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

Sync #896

Merged
merged 79 commits into from
Apr 25, 2024
Merged

Sync #896

merged 79 commits into from
Apr 25, 2024

Conversation

ds-mwesener
Copy link
Contributor

Description

Changed

Pre-review checks

Please ensure to do as many of the following checks as possible, before asking for committer review:

ds-lcapellino and others added 30 commits April 17, 2024 07:36
@ds-lcapellino
bug: #828 fix duplicate entries in traction battery code table
8f439f9
@ds-mmaul
feature(inbox): 617 add table settings to inbox table
2ff0242
@ds-mwesener
feat(notification): 844 added correct behaviour of bpn selection.
38a3da9
@ds-mwesener
feat(notification): 844 adapt security utils to not throw an nullpoin…
7791ad8 
…ter exception on missing affectedParts. Therefore it will now throw a 400 bad request.
@ds-mwesener
feat(notification): 844 adapt security utils to not throw an nullpoin…
10c23f5 
…ter exception on missing affectedParts. Therefore it will now throw a 400 bad request.
@ds-mwesener
feat(notification): 844 adapt security utils to not throw an nullpoin…
15ca867 
…ter exception on missing affectedParts. Therefore it will now throw a 400 bad request.
@ds-lcapellino
Merge branch 'main' into bug/828-fix-tractionbattery-code-duplicates
7d07cac
@ds-lcapellino
bug: #828 fix duplications in traction_battery_code_subcomponent table
754da3e
@ds-lcapellino
bug: #828 remove database query logging
68e3df2
@ds-lcapellino
bug: #828 fix duplications in traction_battery_code_subcomponent table
29473ba
@ds-mwesener
feat(notification): 844 adapt security utils to not throw an nullpoin…
f925c38 
…ter exception on missing affectedParts. Therefore it will now throw a 400 bad request.
@ds-mmaul
feature(inbox): 617 redesign of inbox table
5ba1539
@ds-mmaul
chore(dashboard): 726 added pre authorize annotation to dashboard con…
3a76732 
…troller
@ds-mmaul
Merge pull request #1188 from catenax-ng/chore/726-add-preauthorize-t…
bc4fecd 
…o-dashboard-controller

chore(dashboard): 726 added pre authorize annotation to dashboard con…
@ds-mwesener
Merge pull request #1186 from catenax-ng/bug/828-fix-tractionbattery-…
67369cf 
…code-duplicates

Bug/828 fix tractionbattery code duplicates
@ds-mwesener
Merge branch 'refs/heads/main' into feature/844-validation-edit-creat…
453a1bb 
…e-notifications

# Conflicts:
#	CHANGELOG.md
#	tx-backend/src/main/resources/application.yml
@ds-mwesener
feat(e2e-test): 843 refactored e2e tests to reuse methods for notific…
b41590f 
…ations. Additionally added edit notification method for testing.
@ds-lcapellino
bug: #828 fix flyway scripts
8ecbd05
@ds-mwesener
Merge pull request #1185 from catenax-ng/feature/844-validation-edit-…
5760158 
…create-notifications

Feature/844 validation edit create notifications
@ds-mwesener
Merge pull request #1189 from catenax-ng/bug/828-fix-tractionbattery-…
a67f48f 
…code-duplicates

bug: #828 fix flyway scripts
@ds-lcapellino
bug: #828 fix flyway scripts
21a6ba7
@ds-mwesener
feat(e2e-test): 843 refactored e2e tests to reuse methods for notific…
e34698f 
…ations. Additionally added edit notification method for testing.
@ds-mwesener
Merge branch 'refs/heads/main' into feature/843-edit-notification-e2e…
8416ce3 
…-tests

# Conflicts:
#	CHANGELOG.md
@ds-mwesener
Merge pull request #1191 from catenax-ng/bug/828-fix-tractionbattery-…
c8821a8 
…code-duplicates

bug: #828 fix flyway scripts
@ds-mmaul
Merge branch 'refs/heads/main' into feature/617-2-redesign-of-inbox-t…
b76a7ea 
…able
@ds-mwesener
Merge branch 'refs/heads/main' into feature/843-edit-notification-e2e…
f4c2ae1 
…-tests
@ds-lcapellino
bug: #828 fix flyway scripts
88681e9
@ds-mwesener
Merge pull request #1192 from catenax-ng/bug/828-fix-tractionbattery-…
41f0a96 
…code-duplicates

bug: #828 fix flyway scripts
@ds-mwesener
feat(e2e-test): 843 added edit notification test.
30ed9d0
@ds-mwesener
feat(e2e-test): 843 added edit notification test.
a58a2ec
ds-mmaul and others added 28 commits April 22, 2024 11:16
@ds-mmaul
feature(inbox): 617 reduce duplication
7f47e1b
@ds-lcapellino
Merge pull request #1196 from catenax-ng/chore/security-minister
b62c69f 
chore(dependencies): XXX Updated spring boot
@ds-lcapellino @github-actions
Update Dependencies Backend Action
1e3bb79
@ds-mwesener
Merge pull request #1198 from catenax-ng/action/dependencies
4b7ccb9 
Update Dependencies Backend
@ds-mwesener
Merge branch 'refs/heads/main' into feature/617-2-redesign-of-inbox-t…
608fd0f 
…able
@ds-mwesener
chore(dependencies): XXX Updated
75f7dc1
@ds-mmaul
feature(inbox): 617 reduce duplication
c9069f4
@ds-mmaul
Merge remote-tracking branch 'origin/feature/617-2-redesign-of-inbox-…
9bd61f7 
…table' into feature/617-2-redesign-of-inbox-table
@ds-mmaul
feature(inbox): 617 reduce duplication
7273169
@ds-mwesener
chore(github actions): xxx workflow dispatch on frontend test action.
8a3b206
@ds-mmaul
Merge branch 'main' into feature/617-2-redesign-of-inbox-table
f2edcd0
@ds-mmaul
chore(dashboard): 726 added test
904981e
@ds-mmaul
Merge pull request #1200 from catenax-ng/chore/726-add-preauthorize-t…
929d13d 
…o-dashboard-controller

chore(dashboard): 726 added test
@ds-mmaul
feature(inbox): 617 added tests
cfc6fd7
@ds-mmaul
feature(inbox): 617 added tests
c12a297
@ds-mmaul
feature(inbox): 617 added user manual documentation
8534e1f
@ds-mmaul
Merge branch 'refs/heads/main' into feature/617-2-redesign-of-inbox-t…
0b869db 
…able
@ds-mmaul
feature(inbox): 617 remove unused function
024402a
@ds-mmaul
feature(inbox): 617 remove code issues
069f777
@ds-mwesener
chore(github actions): github actions
1c07034
@ds-mwesener
Merge pull request #1201 from catenax-ng/feature/617-2-redesign-of-in…
a8ca2fc 
…box-table

Feature/617 2 redesign of inbox table
@ds-mmaul
feature(inbox): 617 added switch logic for blank notification creation
a000771
@ds-mwesener
chore(error-messages): 844 notification api error messages
a749543
@ds-mwesener
chore(error-messages): 844 notification api error messages
e0fd238
@ds-mmaul
Merge pull request #1202 from catenax-ng/feature/617-2-redesign-of-in…
4cd6dd1 
…box-table

feature(inbox): 617 added switch logic for blank notification creation
@ds-mwesener
chore(error-messages): 844 notification api error messages
9d62b8b
@ds-mmaul
Merge pull request #1203 from catenax-ng/chore/844-validation-bpn
2ba6253 
Chore/844 validation bpn
@ds-mwesener
chore(error-messages): 844 notification api error messages
f3ca3a5
ds-mmaul
ds-mmaul approved these changes Apr 25, 2024
View reviewed changes
Copy link
Contributor

@ds-mmaul ds-mmaul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ds-mwesener ds-mwesener merged commit 3cebb5e into eclipse-tractusx:main Apr 25, 2024
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ds-mmaul ds-mmaul ds-mmaul approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ds-mwesener @ds-mmaul @ds-lcapellino