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

release(1.6.0-RC6): merge release into main #211

Merged
merged 37 commits into from
Aug 16, 2023
Merged

release(1.6.0-RC6): merge release into main #211

merged 37 commits into from
Aug 16, 2023

Conversation

evegufy
Copy link
Contributor

@evegufy evegufy commented Aug 11, 2023

Description

Merge release branch for v1.6.0-RC6 into main

Why

to wrap up release process

Issue

N/A

Checklist

  • I have performed a self-review of my own code

nidhigarg-bmw and others added 30 commits July 26, 2023 15:50
@nidhigarg-bmw
feat(card responsive): made card responsive in usermanagemtn (#171)
db0d0c7
@manojava-gk
bugfix(config): change app management page role (#169)
fdf184c
@nidhigarg-bmw
feat(ssi credential): add status for pending state only (#168)
f1075ce
@manojava-gk
updates(connector): update content and help link (#162)
a455745
@nidhigarg-bmw
"chore(version): increase shated component version" (#173)
c00dd12
@manojava-gk
update(content): overlay (#174)
3d1040f
@Phil91
release: bump version for v1.6.0-RC4 (#176)
4658e8a
@nidhigarg-bmw
bugfix(admin credentials): added roles for admin credential (#177)
cb5620a
@Phil91
release: update changelog for v1.6.0-RC4
d544827
@nidhigarg-bmw
fix(admin credential): role change (#180)
f876ecc
@nidhigarg-bmw
fix(certificate): error message (#172)
666a0d6
@manojava-gk
updates(notification): add credential approval, credential reject and…
14edcde 
… subscription url msgs (#175)
@lavanya-bmw
fix(description): fixed page break issue when api response don't have…
ce4aa7d 
… value for each language (#184)
@lavanya-bmw
update(app and service release): updated color for asterik (#185)
f901264
@manojava-gk
bugfix(notification): fix go to use case link issue (#186)
8b741a3
@nidhigarg-bmw
feat(technical integration): ui enhancement (#189)
1070a8d
@lavanya-bmw
update(style): updated UI (#161)
4bbcea9
@nidhigarg-bmw
feat(ssi credential): added filters (#181)
ee5b9d2
@manojava-gk
bugfix(connectors): do not allow confirm without customer link (#187)
999760a
@nidhigarg-bmw
fix(app activation): overlay fix (#191)
8299bee
@nidhigarg-bmw
feat(technical integration): remove unused code (#190)
2b0204e
@nidhigarg-bmw
fix(app marketplace): transaltion and image loading fix (#192)
18447d9
@nidhigarg-bmw
feat(technical user): add hyphen if no description (#193)
c07e39d
@lavanya-bmw
fix(app release process): fixed console errors (#194)
7187394
@Phil91 @jjeroch
release: update changelog for v1.6.0-RC5 (#195)
eede97c 
* update change log for v1.6.0-RC5
* bump version for v1.6.0-RC5

---------

Co-authored-by: jjeroch <[email protected]>
Reviewed-By: Martin Rohrmeier <[email protected]>
@nidhigarg-bmw
fix(card): card clickable bug (#199)
cef72f7
@nidhigarg-bmw
fix(ssi credntial): fix filters (#200)
bbc465c
@manojava-gk
bugfix(service card): do not allow to erase (#201)
c992cba
@nidhigarg-bmw
feat(service account): add lang support in api call (#202)
53dc7f5
@nidhigarg-bmw
fix(service detail): ui fixe (#204)
2471836
nidhigarg-bmw and others added 7 commits August 10, 2023 03:00
@nidhigarg-bmw
fix(sonar bugs): fix sonar bugs (#205)
37d9a80
@oyo
bugfix(deps): fix dependabot findings (#207)
cf6fbb1
@jjeroch
chore: change locale files (#206)
9f6de9b 
Locales updated for app/service release process
why:
Placeholder have been set while the development process was ongoing, those placeholders getting now step-by-step replaced with more meaningful explanations (such as page descriptions)
@evegufy
release(1.6.0-RC6): update changelog
4ef467a 
Squashed commit of the following:

commit 70c0a71
Author: jjeroch <[email protected]>
Date:   Fri Aug 11 06:26:00 2023 +0200

    Update CHANGELOG.md

commit 5a96adb
Author: jjeroch <[email protected]>
Date:   Fri Aug 11 06:25:39 2023 +0200

    release/ChangeLog_1.6.0 RC-6
@evegufy
release(1.6.0-RC6): bump version
1c87686
@evegufy
Merge branch 'release/v1.6.0-RC6' into merge-v1.6.0-RC6-in-main
505dfd8
@evegufy
chore: update dependencies file
241aea3
@sonarcloud
Copy link

sonarcloud bot commented Aug 11, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@evegufy
Copy link
Contributor Author

evegufy commented Aug 11, 2023 •
edited
Loading

@oyo @nidhigarg-bmw @jjeroch could you please review this PR?
Due to the fact that the last release branches were squash merged into main and dev by mistake and I had to solve some conflicts, I want to make sure that everything in this PR is as expected.

@oyo Please don't merge this PR, I'll do that myself.

cc: @Phil91

nidhigarg-bmw
nidhigarg-bmw approved these changes Aug 14, 2023
View reviewed changes
Copy link
Contributor

@nidhigarg-bmw nidhigarg-bmw left a comment

Choose a reason for hiding this comment

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

lftm

@evegufy
Copy link
Contributor Author

evegufy commented Aug 16, 2023

@jjeroch I was just mentioning you at this pr for this 9f6de9b changes, I just checked, they should be fine.

So, I'm going ahead with the merge.

@evegufy evegufy merged commit bdf4a48 into main Aug 16, 2023
5 checks passed
@evegufy evegufy deleted the merge-v1.6.0-RC6-in-main branch August 16, 2023 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nidhigarg-bmw nidhigarg-bmw nidhigarg-bmw approved these changes

@Phil91 Phil91 Phil91 approved these changes

@oyo oyo oyo approved these changes

@jjeroch jjeroch Awaiting requested review from jjeroch

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

Successfully merging this pull request may close these issues.
7 participants
@evegufy @oyo @Phil91 @nidhigarg-bmw @manojava-gk @lavanya-bmw @jjeroch