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

merge: dev to main #380

Merged
merged 405 commits into from
Oct 19, 2023
Merged

merge: dev to main #380

merged 405 commits into from
Oct 19, 2023

Conversation

sanjay-k1910
Copy link
Contributor

What?

  • Implemented Ecosystem and Endorsement feature
  • Resolved issues

sanjay-k1910 and others added 30 commits October 6, 2023 16:29
@sanjay-k1910
refactor: added condition for roles
25ed20e 
Signed-off-by: sanjay-k1910 <[email protected]>
@nishad-ayanworks
Merge pull request #316 from credebl/feat-ecosystem-dashboard
49bb30e 
feat: ecosystem dashboard
@sanjay-k1910
Merge branch 'develop' of https://github.com/credebl/studio into feat…
17dc1f2 
…-endorsement

Signed-off-by: sanjay-k1910 <[email protected]>
@16-karan
feat: ecosystem invitation
d9d28d4 
Signed-off-by: karan <[email protected]>
@16-karan
Merge branch 'develop' of https://github.com/credebl/studio into feat…
5d8e5ee 
…-ecosystem-invitation

Signed-off-by: karan <[email protected]>
@MoulikaKulkarni
feat: endorsement popups
a5ac739 
Signed-off-by: MoulikaKulkarni <[email protected]>
@MoulikaKulkarni
feat: endorsement popups
e3e943f 
Signed-off-by: MoulikaKulkarni <[email protected]>
@MoulikaKulkarni
feat: endorsement popups
42af753 
Signed-off-by: MoulikaKulkarni <[email protected]>
@MoulikaKulkarni
feat: endorsement popups
70c165e 
Signed-off-by: MoulikaKulkarni <[email protected]>
@sanjay-k1910
fix: dark mode issue and api endpoint for ecosystem
dfb8098 
Signed-off-by: sanjay-k1910 <[email protected]>
@16-karan
Merge pull request #319 from credebl/fix-dark-mode-issue-api-endpoint…
4908d31 
…-change

Fix: dark mode issue api endpoint change
@sanjay-k1910
fix: ecosystem issue
1955ec9 
Signed-off-by: sanjay-k1910 <[email protected]>
@16-karan
Merge pull request #320 from credebl/fix-ecosystem-issues
8919626 
fix: ecosystem response handling
@sanjay-k1910
Merge branch 'develop' of https://github.com/credebl/studio into feat…
28130c1 
…-endorsement
@sanjay-k1910
refactor: added endorsement request apis and implemented confirmpopup…
411599a 
… custom component

Signed-off-by: sanjay-k1910 <[email protected]>
@sanjay-k1910
Merge branch 'feat-endorsement' of https://github.com/credebl/studio …
5f5d25c 
…into ecosystem-endorsement-popups

Signed-off-by: sanjay-k1910 <[email protected]>
@sanjay-k1910
Merge pull request #318 from credebl/ecosystem-endorsement-popups
a20920a 
feat: Ecosystem endorsement popups
@16-karan
feat: ecosystem send invitation and sent invitations status
0e7acf6 
Signed-off-by: karan <[email protected]>
@16-karan
Merge branch 'develop' of https://github.com/credebl/studio into feat…
c3ca28d 
…-ecosystem-invitation

Signed-off-by: karan <[email protected]>
@16-karan
removed logs
9479133 
Signed-off-by: karan <[email protected]>
@16-karan
fix: changes and reduntent code
f39ded5 
Signed-off-by: karan <[email protected]>
@16-karan
fix: sonarlint issues
63fc982 
Signed-off-by: karan <[email protected]>
@16-karan
fix: sonarlint issues
f4e2f34 
Signed-off-by: karan <[email protected]>
@16-karan
fix: sonarlint issues
777e08a 
Signed-off-by: karan <[email protected]>
@16-karan
fix: changes in conditions
52104a0 
Signed-off-by: karan <[email protected]>
@MoulikaKulkarni
Merge branch 'develop' of https://github.com/credebl/studio into ecos…
cad1d12 
…ystem-endorsement-popups
@16-karan
resolved the review comments
64ff3e2 
Signed-off-by: karan <[email protected]>
@nishad-ayanworks
Merge pull request #321 from credebl/feat-ecosystem-invitation
357eae6 
feat: ecosystem invitation
@sanjay-k1910
refactor: create schema endorsement request API, endorsement card add…
e6c7d44 
…ed and updated sidebar code

Signed-off-by: sanjay-k1910 <[email protected]>
@sanjay-k1910
Merge branch 'develop' of https://github.com/credebl/studio into feat…
8905112 
…-endorsement

Signed-off-by: sanjay-k1910 <[email protected]>
16-karan and others added 21 commits October 19, 2023 13:50
@16-karan
Merge branch 'develop' of https://github.com/credebl/studio into refa…
2db0b24 
…ctor-dasboard-memberlist
@sanjay-k1910
refactor: restrict user to send invitation to self
58177be 
Signed-off-by: sanjay-k1910 <[email protected]>
@nishad-ayanworks
Merge pull request #367 from credebl/refactor-dasboard-memberlist
5e281fb 
refactor: dashboard and member list
@nishad-ayanworks
Merge pull request #372 from credebl/fix-pre-prod-issues
4d1e591 
Fix: pre prod issues
@16-karan
refactor: dashboard allowed for member
bcc87e5 
Signed-off-by: karan <[email protected]>
@sanjay-k1910
Merge pull request #373 from credebl/refactor-dashboard
b3d2b33 
refactor: dashboard allowed for member
@MoulikaKulkarni
fix: verification-details-popup
124a722 
Signed-off-by: Moulika Kulkarni <[email protected]>
@MoulikaKulkarni
Merge branch 'develop' of https://github.com/credebl/studio into veri…
1eaacbf 
…fication-popup
@16-karan
fix: send invitation field reset on action
3641314 
Signed-off-by: karan <[email protected]>
@sanjay-k1910
Merge pull request #375 from credebl/fix-send-invitation-model
da39050 
Fix: send invitation form reset
@sanjay-k1910
Merge pull request #374 from credebl/verification-popup
6c99176 
fix:Verification popup
@16-karan
refactor: memberlist field added org did and self status
b157154 
Signed-off-by: karan <[email protected]>
@16-karan
refactor: endorsment and schema
5894dc5 
Signed-off-by: karan <[email protected]>
@16-karan
Merge branch 'develop' of https://github.com/credebl/studio into refa…
97d3d01 
…ctor-memberlist
@pranalidhanavade
fix:blue-blink-issue-on-endorsement-schema-card
474f54d 
Signed-off-by: pranalidhanavade <[email protected]>
@pranalidhanavade
Merge branch 'develop' of https://github.com/credebl/studio into endo…
4fb8e6b 
…rsement-card-css-issue

Signed-off-by: pranalidhanavade <[email protected]>
@sanjay-k1910
Merge pull request #376 from credebl/refactor-memberlist
2ace7b4 
refactor : memberlist and schema
@pranalidhanavade
Merge branch 'develop' of https://github.com/credebl/studio into endo…
902a373 
…rsement-card-css-issue
@pranalidhanavade
refactor:endorsement card blue blink issue
b495b57 
Signed-off-by: pranalidhanavade <[email protected]>
@pranalidhanavade
refactor:endorsement card issue
ef8894f 
Signed-off-by: pranalidhanavade <[email protected]>
@sanjay-k1910
Merge pull request #377 from credebl/endorsement-card-css-issue
0c28f64 
fix:Endorsement card css issue
@sanjay-k1910 sanjay-k1910 self-assigned this Oct 19, 2023
@sonarqubecloud
Copy link

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 238 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

nishad-ayanworks
nishad-ayanworks approved these changes Oct 19, 2023
View reviewed changes
Copy link
Contributor

@nishad-ayanworks nishad-ayanworks left a comment

Choose a reason for hiding this comment

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

LG

@nishad-ayanworks nishad-ayanworks merged commit 61a7e6a into main Oct 19, 2023
4 checks passed
@16-karan 16-karan deleted the fix-prod-dev-merge branch November 3, 2023 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nishad-ayanworks nishad-ayanworks nishad-ayanworks approved these changes

Assignees

@sanjay-k1910 sanjay-k1910

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@sanjay-k1910 @nishad-ayanworks @16-karan @MoulikaKulkarni @pranalidhanavade @bhavanakarwade @tipusinghaw