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

Upstream Repo sync #51

Merged
merged 42 commits into from
Dec 11, 2023
Merged

Upstream Repo sync #51

merged 42 commits into from
Dec 11, 2023

Commits on Jul 7, 2023

  1. API cleanup

    @Anjana2310
    Anjana2310 committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    1b2be33 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. API clean up

    @Anjana2310
    Anjana2310 committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    2029a5f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/Anjana2310/HWC-API into … 

    …develop
    @Anjana2310
    Anjana2310 committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    f10bdd6 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Merge branch 'PSMRI:develop' into develop

    @Anjana2310
    Anjana2310 authored Aug 11, 2023
    Configuration menu
    Copy the full SHA
    27676d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge branch 'PSMRI:develop' into develop

    @Anjana2310
    Anjana2310 authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    74203ef View commit details
    Browse the repository at this point in the history

  2. Renaming controller classes

    @Anjana2310
    Anjana2310 committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    dabc3e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Merge branch 'PSMRI:develop' into develop

    @Anjana2310
    Anjana2310 authored Sep 11, 2023
    Configuration menu
    Copy the full SHA
    d2ec60a View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. removing unwanted file

    @Anjana2310
    Anjana2310 committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    d3b17b4 View commit details
    Browse the repository at this point in the history

  2. Removing unwanted file (PSMRI#61) 

    * API cleanup

* API clean up

* Renaming controller classes

* removing unwanted file
    @Anjana2310
    Anjana2310 authored Sep 13, 2023
    Configuration menu
    Copy the full SHA
    89581e9 View commit details
    Browse the repository at this point in the history

  3. workflow changes (PSMRI#62) 

    * Update and rename sast-and-package-prod.yml to package-prod.yml

* Update package-prod.yml

* Update package-prod.yml

* Update and rename sast-and-package.yml to test-package.yml

* Update test-package.yml

* Update and rename test-package.yml to package-test.yml

* Update package-test.yml

* Update package-prod.yml

* Update package-test.yml

* Create codeql.yml

* Update codeql.yml

* Update codeql.yml

* Update codeql.yml

* Update codeql.yml

* Update and rename package-test.yml to package.yml

* Update codeql.yml

* Update package.yml

* Update package-prod.yml

* Update package-prod.yml

* Rename codeql.yml to sast.yml

---------

Co-authored-by: Anjana KJ <[email protected]>
    @Vidyaaa24 @Anjana2310
    Vidyaaa24 and Anjana2310 authored Sep 13, 2023
    Configuration menu
    Copy the full SHA
    c5411e2 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. workflow changes (PSMRI#63) 

    * Update sast.yml

* Delete .github/workflows directory

* Create sast.yml

* Add files via upload
    @Vidyaaa24
    Vidyaaa24 authored Sep 14, 2023
    Configuration menu
    Copy the full SHA
    9fa025c View commit details
    Browse the repository at this point in the history

  2. Revert "workflow changes (PSMRI#63)" (PSMRI#65) 

    This reverts commit 9fa025c.
    @Anjana2310
    Anjana2310 authored Sep 14, 2023
    Configuration menu
    Copy the full SHA
    8f236e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Merge branch 'PSMRI:develop' into develop

    @Anjana2310
    Anjana2310 authored Sep 15, 2023
    Configuration menu
    Copy the full SHA
    bf50355 View commit details
    Browse the repository at this point in the history

  2. Delete .github/workflows/sast.yml (PSMRI#66) 

    Deleted sast.yml
    @swetatech24
    swetatech24 authored Sep 15, 2023
    Configuration menu
    Copy the full SHA
    b486cbb View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @Vidyaaa24
    Vidyaaa24 authored Sep 15, 2023
    Configuration menu
    Copy the full SHA
    23617b7 View commit details
    Browse the repository at this point in the history

  4. Create sast.yml

    @Vidyaaa24
    Vidyaaa24 authored Sep 15, 2023
    Configuration menu
    Copy the full SHA
    29d5b69 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'PSMRI:develop' into develop

    @Anjana2310
    Anjana2310 authored Sep 15, 2023
    Configuration menu
    Copy the full SHA
    cbd48c1 View commit details
    Browse the repository at this point in the history

  6. Modified common_local

    @Anjana2310
    Anjana2310 committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    e78c9d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Pull Request template

    @Anjana2310
    Anjana2310 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    8fccf8c View commit details
    Browse the repository at this point in the history

  2. Placeholders added in properties file

    @Anjana2310
    Anjana2310 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    b5975a2 View commit details
    Browse the repository at this point in the history

  3. Delete src/main/environment/common_local.properties

    @Anjana2310
    Anjana2310 authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    2e5af21 View commit details
    Browse the repository at this point in the history

  4. Added type of change

    @Anjana2310
    Anjana2310 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    baa9e5f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/Anjana2310/HWC-API into … 

    …develop
    @Anjana2310
    Anjana2310 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    a6f740f View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Merge pull request PSMRI#67 from Anjana2310/develop 

    Added Pull Request template, added placeholders in properties file
    @drtechie
    drtechie authored Oct 5, 2023
    Configuration menu
    Copy the full SHA
    d738ab0 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. New Serviceline API modified, UPTSU API changes

    IN40068837 authored and IN40068837 committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    3a6e21d View commit details
    Browse the repository at this point in the history

  2. Create CI properties, add maven resources plugin to replace env values ( 

    PSMRI#68)
    @drtechie
    drtechie authored Oct 6, 2023
    Configuration menu
    Copy the full SHA
    19e9ce3 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. New serviceline api modified

    IN40068837 authored and IN40068837 committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    9006507 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into develop

    @ravishanigarapu
    ravishanigarapu authored Oct 11, 2023
    Configuration menu
    Copy the full SHA
    15278c7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request PSMRI#70 from indraniBan/develop 

    New Serviceline API modified, UPTSU API changes
    @ravishanigarapu
    ravishanigarapu authored Oct 11, 2023
    Configuration menu
    Copy the full SHA
    1269f0a View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. location mapping changes

    @ravishanigarapu
    ravishanigarapu committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    c26ff83 View commit details
    Browse the repository at this point in the history

  2. Merge pull request PSMRI#77 from ravishanigarapu/develop 

    location mapping changes
    @devikasuresh20
    devikasuresh20 authored Oct 20, 2023
    Configuration menu
    Copy the full SHA
    621e1bf View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. empty change (PSMRI#79) 

    Co-authored-by: KA40094929 <[email protected]>
    @helenKaryamsetty
    helenKaryamsetty and KA40094929 authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    ba0c43e View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. http insecure changes

    Burdhi. Shivani authored and Burdhi. Shivani committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    7424f27 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Multiple Benificiary visit-api modified for all visit category (PSMRI#78 

    )

* Multiple Benificiary visit-api modified for all visit category

* Multiple Ben Visit Api code Modified

* TestNcdCareController error resolved

* WASA point- Swagger documentation disclosure

---------

Co-authored-by: IN40068837 <[email protected]>
    @indraniBan
    indraniBan and IN40068837 authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    8cc8d79 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into develop

    @ravishanigarapu
    ravishanigarapu authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    01b08e1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request PSMRI#80 from bshivani7/develop 

    http insecure changes
    @ravishanigarapu
    ravishanigarapu authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    4280748 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. casesheet print data issue fixed

    appuser committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    0a86b08 View commit details
    Browse the repository at this point in the history

  2. Merge pull request PSMRI#81 from ravishanigarapu/develop 

    casesheet print data issue fixed
    @helenKaryamsetty
    helenKaryamsetty authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    220c408 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. new serviceline changes

    appuser committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    ca4e24c View commit details
    Browse the repository at this point in the history

  2. Merge pull request PSMRI#82 from ravishanigarapu/develop 

    new serviceline changes
    @helenKaryamsetty
    helenKaryamsetty authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    eded26b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into upstream_sync 

    # Conflicts:
#	src/main/environment/common_dev.properties
#	src/main/environment/common_local.properties
#	src/main/environment/common_test.properties
#	src/main/environment/common_uat.properties
#	src/main/java/com/iemr/hwc/controller/location/LocationController.java
#	src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java
#	src/main/java/com/iemr/hwc/repo/location/V_getVanLocDetailsRepo.java
#	src/main/java/com/iemr/hwc/repo/nurse/BenVisitDetailRepo.java
#	src/main/java/com/iemr/hwc/service/location/LocationServiceImpl.java
    @shreypatidar-beehyv
    shreypatidar-beehyv committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    a89b754 View commit details
    Browse the repository at this point in the history

  4. Added Identity-API url to get count of beneficiaries in all the prope… 

    …rties files.
    @shreypatidar-beehyv
    shreypatidar-beehyv committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    3efd333 View commit details
    Browse the repository at this point in the history