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 develop to main #445

Merged
merged 41 commits into from
Nov 24, 2023
Merged

Merge develop to main #445

merged 41 commits into from
Nov 24, 2023

Conversation

sanjay-k1910
Copy link
Contributor

What?

  • Conversion of IDs to UUIDs
  • Updated certificates UI
  • Updated UI and functionality in Bulk issuance
  • Implemented socket in bulk issuance and retry process

bhavanakarwade and others added 30 commits October 26, 2023 11:22
@bhavanakarwade
feat: conversion id into uuid
102c2b3 
Signed-off-by: bhavanakarwade <[email protected]>
@bhavanakarwade
feat: conversion of id's into uuid
3c1af34 
Signed-off-by: bhavanakarwade <[email protected]>
@bhavanakarwade
Merge branch 'develop' of https://github.com/credebl/studio into conv…
b99422b 
…ersion-id-into-uuid
@bhavanakarwade
Merge branch 'develop' of https://github.com/credebl/studio into conv…
86551fa 
…ersion-id-into-uuid
@bhavanakarwade
Merge branch 'develop' of https://github.com/credebl/studio into conv…
0b3cde4 
…ersion-id-into-uuid
@bhavanakarwade
resolved conficts
f393f78 
Signed-off-by: bhavanakarwade <[email protected]>
@bhavanakarwade
resolved conflicts
cd97faa 
Signed-off-by: bhavanakarwade <[email protected]>
@16-karan
fix: minor fixes
afc34c3 
Signed-off-by: karan <[email protected]>
@16-karan
Merge branch 'develop' of https://github.com/credebl/studio into fix-…
25a3295 
…bulk-issuance-changes
@MoulikaKulkarni
Merge branch 'develop' of https://github.com/credebl/studio into conv…
9a118c9 
…ersion-id-into-uuid

Signed-off-by: Moulika Kulkarni <[email protected]>
@16-karan
fix: minor changes
0e58e5c 
Signed-off-by: karan <[email protected]>
@16-karan
Merge branch 'develop' of https://github.com/credebl/studio into fix-…
5ea7ff4 
…bulk-issuance-changes

Signed-off-by: karan <[email protected]>
@pranalidhanavade
refactor:certificate meta tag title and description
909cce1 
Signed-off-by: pranalidhanavade <[email protected]>
@pranalidhanavade
refactor:certificate meta tag title and description
a197296 
Signed-off-by: pranalidhanavade <[email protected]>
@pranalidhanavade
Merge branch 'develop' of https://github.com/credebl/studio into cert…
86bd1c0 
…ificate-template
@16-karan
fix: socket and status for retry
273bd33 
Signed-off-by: karan <[email protected]>
@16-karan
refactor: refresh button added
de154ac 
Signed-off-by: karan <[email protected]>
@sanjay-k1910
Merge pull request #441 from credebl/certificate-template
353f36e 
refactor: meta title and description in Certificate template
@MoulikaKulkarni
fix:id-to-uuid-conversion
ef03e69 
Signed-off-by: Moulika Kulkarni <[email protected]>
@MoulikaKulkarni
Merge branch 'develop' of https://github.com/credebl/studio into conv…
5dde266 
…ersion-id-into-uuid
@nishad-ayanworks
Merge pull request #438 from credebl/fix-bulk-issuance-changes
f908fb3 
Fix bulk issuance changes
@sanjay-k1910
refactor: bulk issuance
542410f 
Signed-off-by: sanjay-k1910 <[email protected]>
@16-karan
change in message
6fb6809 
Signed-off-by: karan <[email protected]>
@sanjay-k1910
Merge pull request #442 from credebl/refactor-messages-issuance
845f3c5 
refactor: messages issuance
@sanjay-k1910
Merge branch 'develop' of https://github.com/credebl/studio into conv…
6db78ba 
…ersion-id-into-uuid
@16-karan
fix: minor changes in cred def id
9727739 
Signed-off-by: karan <[email protected]>
@sanjay-k1910
refactor: bulk-issuance pages, date-time conversion
c38b47e 
Signed-off-by: sanjay-k1910 <[email protected]>
@sanjay-k1910
Merge branch 'develop' of https://github.com/credebl/studio into refa…
4cf66dc 
…ctor-bulk-issuance

Signed-off-by: sanjay-k1910 <[email protected]>
@nishad-ayanworks
Merge pull request #443 from credebl/fix-issuance-minor-changes
b174138 
fix: issuance minor changes
@sanjay-k1910
Merge branch 'develop' of https://github.com/credebl/studio into refa…
b21a074 
…ctor-bulk-issuance

Signed-off-by: sanjay-k1910 <[email protected]>
sanjay-k1910 and others added 11 commits November 23, 2023 17:09
@sanjay-k1910
refactor: back button in bulk issuance
164df37 
Signed-off-by: sanjay-k1910 <[email protected]>
@sanjay-k1910
refactor: commented code removed
5826a2f 
Signed-off-by: sanjay-k1910 <[email protected]>
@nishad-ayanworks
Merge pull request #444 from credebl/refactor-bulk-issuance
282f173 
refactor: bulk issuance
@pranalidhanavade
Merge branch 'develop' of https://github.com/credebl/studio into conv…
3875740 
…ersion-id-into-uuid
@pranalidhanavade
refactor: bulk issuance socket messages, upload file name
067855c 
Signed-off-by: pranalidhanavade <[email protected]>
@sanjay-k1910
Merge branch 'develop' of https://github.com/credebl/studio into conv…
09388d6 
…ersion-id-into-uuid
@sanjay-k1910
Merge branch 'conversion-id-into-uuid' of https://github.com/credebl/…
7567f9a 
…studio into conversion-id-into-uuid
@sanjay-k1910
refactor: status capsule of datatables
af77768 
Signed-off-by: sanjay-k1910 <[email protected]>
@sanjay-k1910
refactor: ui changes
c33e044 
Signed-off-by: sanjay-k1910 <[email protected]>
@nishad-ayanworks
Merge pull request #413 from credebl/conversion-id-into-uuid
c2a9e14 
feat: conversion of id's into UUID
@sanjay-k1910
Merge branch 'develop' of https://github.com/credebl/studio into merg…
79c60ab 
…e-dev-to-prod-nov24
@sanjay-k1910 sanjay-k1910 self-assigned this Nov 23, 2023
@sonarqubecloud 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 8 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@sanjay-k1910 sanjay-k1910 changed the title Merge dev to prod Merge develop to prod Nov 23, 2023
@sanjay-k1910 sanjay-k1910 changed the title Merge develop to prod Merge develop to main Nov 23, 2023
nishad-ayanworks
nishad-ayanworks approved these changes Nov 24, 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 852a390 into main Nov 24, 2023
6 checks passed
@nishad-ayanworks nishad-ayanworks deleted the merge-dev-to-prod-nov24 branch December 6, 2023 06:15
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.
6 participants
@sanjay-k1910 @nishad-ayanworks @bhavanakarwade @16-karan @MoulikaKulkarni @pranalidhanavade