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

Back merge Staging Into DEV #4351

Closed
wants to merge 38 commits into from
Closed

Back merge Staging Into DEV #4351

wants to merge 38 commits into from

Commits on Oct 1, 2024

  1. [hotfix] 216567 deduplication key error when deduplicating records (#… 

    …4271)

* 2216567_Deduplication_Key_Error_when_deduplicating_records

* black

* remove distinct

* fix dedup logic, add ut

* lint

---------

Co-authored-by: marekbiczysko <[email protected]>
    @MarekBiczysko
    MarekBiczysko and marekbiczysko authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    d404219 View commit details
    Browse the repository at this point in the history

  2. skip trivy failure

    @wozniakpl
    wozniakpl committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    e2390f7 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. fix document status when copy population (#4291)

    @pavlo-mk
    pavlo-mk authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    483006d View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. block running simultaneously task with same data for enroll hhs

    @pkujawa
    pkujawa committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b9e36c2 View commit details
    Browse the repository at this point in the history

  2. reset first and last registration dates for copied repr

    @pkujawa
    pkujawa committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    421a6b1 View commit details
    Browse the repository at this point in the history

  3. fix test

    @pkujawa
    pkujawa committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    e2808b2 View commit details
    Browse the repository at this point in the history

  4. adjust additional tests

    @pkujawa
    pkujawa committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    7994109 View commit details
    Browse the repository at this point in the history

  5. fix test

    @pkujawa
    pkujawa committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    2ddabeb View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. hofix_rdi_merge_deduplication

    marekbiczysko committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    fe10104 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into hofix_rdi_merge_deduplication

    @MarekBiczysko
    MarekBiczysko authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    27dd6dd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4314 from unicef/hofix_rdi_merge_deduplication 

    hofix_rdi_merge_deduplication
    @domdinicola
    domdinicola authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d1d6736 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'staging' into not-allow-to-run-same-enroll-multiple-times

    @pkujawa
    pkujawa authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    966cc47 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' into not-allow-to-run-same-enroll-multiple-times

    @pkujawa
    pkujawa authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    57d8e0f View commit details
    Browse the repository at this point in the history

  3. remove dev code

    marekbiczysko committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    2c4dce7 View commit details
    Browse the repository at this point in the history

  4. fix rdi merge update collections

    marekbiczysko committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    d681e58 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into hofix_rdi_merge_deduplication

    @MarekBiczysko
    MarekBiczysko authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    24f6d1a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4308 from unicef/not-allow-to-run-same-enroll-mul… 

    …tiple-times

[217875] Block simultaneous task with same data for enroll hhs
    @pkujawa
    pkujawa authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    c96f0db View commit details
    Browse the repository at this point in the history

  7. Merge pull request #4324 from unicef/hofix_rdi_merge_deduplication 

    🔥Hotfix rdi merge deduplication
    @domdinicola
    domdinicola authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    aa150a7 View commit details
    Browse the repository at this point in the history

  8. update pg

    @domdinicola
    domdinicola committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    3aa050f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #4325 from unicef/cp 

    update pg
    @domdinicola
    domdinicola authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    6caa781 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. tweak admin

    @domdinicola
    domdinicola committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    66d37da View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4329 from unicef/admin_pp_del_root 

    tweak admin
    @domdinicola
    domdinicola authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    89be3d8 View commit details
    Browse the repository at this point in the history

  3. vision tweaks

    @domdinicola
    domdinicola committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    84c4d9c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4332 from unicef/vision 

    vision tweaks
    @domdinicola
    domdinicola authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    865307e View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. 217950_Payment_Module_Getting_Delivery_Mechanism_error_when_rejecting… 

    …_a_payment_plan_and_assigning_FSP
    marekbiczysko committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9b86316 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4338 from unicef/217950_Payment_Module_Getting_De… 

    …livery_Mechanism_error_when_rejecting_a_payment_plan_and_assigning_FSP

217950_Payment_Module_Getting_Delivery_Mechanism_error_when_rejecting…
    @domdinicola
    domdinicola authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e7cc5d5 View commit details
    Browse the repository at this point in the history

  3. vision tweaks

    @domdinicola
    domdinicola committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7d46efe View commit details
    Browse the repository at this point in the history

  4. vision tweaks

    @domdinicola
    domdinicola committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    eb67393 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4339 from unicef/vision 

    vision tweaks
    @domdinicola
    domdinicola authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0a86e53 View commit details
    Browse the repository at this point in the history

  6. fix exclude section ids

    Maciej Szewczyk committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    1d726b1 View commit details
    Browse the repository at this point in the history

  7. view biometrics

    Maciej Szewczyk committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ca435ec View commit details
    Browse the repository at this point in the history

  8. Merge branch 'staging' into fixes-stg

    @mmaciekk
    mmaciekk authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    30f61e2 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #4340 from unicef/fixes-stg 

    fixes stg
    @mmaciekk
    mmaciekk authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3908f65 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. dev_fix_rdi_merge_deduplication (#4323)

    @MarekBiczysko
    MarekBiczysko authored and marekbiczysko committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    6895771 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4344 from unicef/stg_fix_rdi_merge_deduplication 

    dev_fix_rdi_merge_deduplication (#4323)
    @domdinicola
    domdinicola authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    6fbfca3 View commit details
    Browse the repository at this point in the history

  3. conflicts

    @pavlo-mk
    pavlo-mk committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    d3af6ac View commit details
    Browse the repository at this point in the history

  4. conflicts

    @pavlo-mk
    pavlo-mk committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    3ab6b2a View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Merge pull request #4347 from unicef/back_merge_prodINTOstg 

    Back merge prod into stg
    @domdinicola
    domdinicola authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    c0fda46 View commit details
    Browse the repository at this point in the history