left merge changes from Develop to master merge#43
Merged
ravishanigarapu merged 66 commits intomasterfrom Dec 14, 2023
Merged
Conversation
* Create README.md Added new readme.md file * Update README.md
* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues * pom.xml cleanup
* Create CONTRIBUTING.md * Create CODE_OF_CONDUCT.md * Create COPYING * Update README.md
* modified .gitignore file * Delete target directory * Update .gitignore * Delete logs directory
Co-authored-by: Anjana K J <an356996@wipro.com>
* code smell fix * code smell fixes * Sonarqube reported code smell fix * done correction for application.properties
* Swagger changes * Swagger changes
* Create sast-and-package-prod.yml * Update sast-and-package-prod.yml
code smell fixes
Added environment variable
* Added environment variable * Added password changes
* Passing environment variable * Passing environment variable
* Update sast-and-package-prod.yml * Update sast-and-package.yml
* CreatedDate filed for Identity * removed uncommented code
* CreatedDate filed for Identity * removed uncommented code * deleting DB config * Send SMS Null ID Issue
update changes
Updated Workflows which triggers on Pull Request and push events for develop branch
edit api changes
Implementing Basic reverse sync operation
Conflict resolution
Search Patients API - FHIR resource
Co-authored-by: Devika <de40034072@wipro.com>
…nd added admin_local to git ignore (#33)
Co-authored-by: Burdhi. Shivani <BU40088124@wipro.com>
* Merge branch 'master' of https://github.com/helenKaryamsetty/Identity-API * Delete src/main/java/com/iemr/common/identity/utils/CryptoUtil.java --------- Co-authored-by: KA40094929 <KA40094929@L-158018332.wipro.com> Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
* Develop branch merge to master (#5) * Readme file added (#1) * Create README.md Added new readme.md file * Update README.md * Removed unnecessary dependencies from pom.xml (#2) * Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues * pom.xml cleanup * updated code-of-conduct, copying, contributing, readme (#3) * Create CONTRIBUTING.md * Create CODE_OF_CONDUCT.md * Create COPYING * Update README.md * modified .gitignore file (#4) * modified .gitignore file * Delete target directory * Update .gitignore * Delete logs directory --------- Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com> Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com> Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com> * Feature/dev tomaster (#36) * Readme file added (#1) * Create README.md Added new readme.md file * Update README.md * Removed unnecessary dependencies from pom.xml (#2) * Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues * pom.xml cleanup * updated code-of-conduct, copying, contributing, readme (#3) * Create CONTRIBUTING.md * Create CODE_OF_CONDUCT.md * Create COPYING * Update README.md * modified .gitignore file (#4) * modified .gitignore file * Delete target directory * Update .gitignore * Delete logs directory * code smell fixes (#6) * Added copyright text (#7) Co-authored-by: Anjana K J <an356996@wipro.com> * code smell fix (#8) * code smell fix * code smell fixes * Sonarqube reported code smell fix * done correction for application.properties * Swagger changes (#9) * Swagger changes * Swagger changes * Code smell fix (#10) * code smell fixes (#11) * Create sast-and-package-prod.yml (#12) * Create sast-and-package-prod.yml * Update sast-and-package-prod.yml * Code smell changes (#13) * Update README.md * code smell fixes * Added environment variable * Added password changes & edit environment variable (#16) * Added environment variable * Added password changes * Passing environment variable * Passing environment variable (#17) * Passing environment variable * Passing environment variable (#19) * Passing environment variable (#20) * Passing environment variable * Passing environment variable * Workflow change (#21) * Update sast-and-package-prod.yml * Update sast-and-package.yml * CreatedDate filed for Identity (#22) * CreatedDate filed for Identity * removed uncommented code * Send SMS null Id issue (#23) * CreatedDate filed for Identity * removed uncommented code * deleting DB config * Send SMS Null ID Issue * mmu cr changes * update changes * changes mmu cr * Update sast-and-package-prod.yml (#26) * edit api changes * Identity API cleanup and password masking * Updated the language option for codeql and added maven test * Added CodeQl tool to do static code analysis on pull request * Implementing Basic reverse sync operation * Fix issue on controller * Updated the language option for codeql and added maven test * Added CodeQl tool to do static code analysis on pull request * Implementing Basic reverse sync operation * Fix issue on controller * Identity API cleanup and password masking * edit api changes * change made in description of identity controller (#30) * Multiple beneficiaries sync issue changes for FLW (#31) Co-authored-by: Devika <de40034072@wipro.com> * Delete .github/workflows/sast-and-package-prod.yml * Delete .github/workflows/sast-and-package.yml * Create package-prod.yml * Create package.yml * Create sast.yml * Use a logger to log this exception (#32) * Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (#33) --------- Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com> Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com> Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com> Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com> Co-authored-by: Anjana K J <an356996@wipro.com> Co-authored-by: Harimohan Rajamohanan <30436665+harimohanr@users.noreply.github.com> Co-authored-by: swetatech24 <sweta.prakash@wipro.com> Co-authored-by: Anjana <anjana.j28@wipro.com> Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com> Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com> Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com> Co-authored-by: Sunil GV <sunil.g@beehyv.com> Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com> Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com> Co-authored-by: Devika <de40034072@wipro.com> * Resolved a merge conflict --------- Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com> Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com> Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com> Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com> Co-authored-by: Anjana K J <an356996@wipro.com> Co-authored-by: swetatech24 <sweta.prakash@wipro.com> Co-authored-by: Anjana <anjana.j28@wipro.com> Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com> Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com> Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com> Co-authored-by: Sunil GV <sunil.g@beehyv.com> Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com> Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com> Co-authored-by: Devika <de40034072@wipro.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
Type of change
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
Checklist: