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

Staging with peoples enh #3853

Merged
merged 62 commits into from
May 10, 2024
Merged

Staging with peoples enh #3853

merged 62 commits into from
May 10, 2024

Commits on Apr 23, 2024

  1. payment module people changes

    Maciej Szewczyk committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    009ab57 View commit details
    Browse the repository at this point in the history

  2. fix build issues

    Maciej Szewczyk committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    164315a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into payment-module-people

    @mmaciekk
    mmaciekk authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    f140dcc View commit details
    Browse the repository at this point in the history

  4. AB#197170 People people

    @johniak
    johniak committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    8e7abfb View commit details
    Browse the repository at this point in the history

  5. Merge branch 'payment-module-people' of github.com:unicef/hct-mis int… 

    …o payment-module-people
    @johniak
    johniak committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    972acf6 View commit details
    Browse the repository at this point in the history

  6. finish all payment module people changes

    Maciej Szewczyk committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    3fdf903 View commit details
    Browse the repository at this point in the history

  7. fix lint issues

    Maciej Szewczyk committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1fd6a73 View commit details
    Browse the repository at this point in the history

  8. eslint issues

    Maciej Szewczyk committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    3adbbdf View commit details
    Browse the repository at this point in the history

  9. snapshots

    Maciej Szewczyk committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    10eead5 View commit details
    Browse the repository at this point in the history

  10. schnaps

    Maciej Szewczyk committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    0b0727f View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. upd template

    @pavlo-mk
    pavlo-mk committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    773c1bc View commit details
    Browse the repository at this point in the history

  2. small fixes

    @pavlo-mk
    pavlo-mk committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c9ef78e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into payment-module-people

    @pavlo-mk
    pavlo-mk authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    5b6ff08 View commit details
    Browse the repository at this point in the history

  4. resolve conflicts

    @pavlo-mk
    pavlo-mk committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    6a208b6 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/payment-module-people' into paym… 

    …ent-module-people
    @pavlo-mk
    pavlo-mk committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    b7824d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. add new tests

    @pavlo-mk
    pavlo-mk committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    1738445 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin' into payment-module-people

    Maciej Szewczyk committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    cc300aa View commit details
    Browse the repository at this point in the history

  3. add test

    @pavlo-mk
    pavlo-mk committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    aa2fc72 View commit details
    Browse the repository at this point in the history

  4. merge develop

    @pavlo-mk
    pavlo-mk committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    d2d5f49 View commit details
    Browse the repository at this point in the history

  5. adjust progrgram list

    @johniak
    johniak committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    283575c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'payment-module-people' of github.com:unicef/hct-mis int… 

    …o payment-module-people
    @johniak
    johniak committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    79064f0 View commit details
    Browse the repository at this point in the history

  7. Changes for people

    @patryk-dabrowski
    patryk-dabrowski committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    1a7b364 View commit details
    Browse the repository at this point in the history

  8. upd test

    @pavlo-mk
    pavlo-mk committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    7944827 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/payment-module-people' into paym… 

    …ent-module-people
    @pavlo-mk
    pavlo-mk committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    fa0383a View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. upd tests

    @pavlo-mk
    pavlo-mk committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    387cf86 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:unicef/hct-mis into payment-modu… 

    …le-people
    @patryk-dabrowski
    patryk-dabrowski committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a644092 View commit details
    Browse the repository at this point in the history

  3. Fix snapshots

    @patryk-dabrowski
    patryk-dabrowski committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    548ff38 View commit details
    Browse the repository at this point in the history

  4. Fix format

    @patryk-dabrowski
    patryk-dabrowski committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7dbb650 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Targeting for people adjutsments

    @johniak
    johniak committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    7ed28a0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'payment-module-people' of github.com:unicef/hct-mis int… 

    …o payment-module-people
    @johniak
    johniak committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    bf79c86 View commit details
    Browse the repository at this point in the history

  3. People frontend alignment

    @patryk-dabrowski
    patryk-dabrowski committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    9f7a1a2 View commit details
    Browse the repository at this point in the history

  4. Fix eslint

    @patryk-dabrowski
    patryk-dabrowski committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    651bb04 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into payment-module-people

    @patryk-dabrowski
    patryk-dabrowski authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    b90a4b4 View commit details
    Browse the repository at this point in the history

  6. Fix build

    @patryk-dabrowski
    patryk-dabrowski committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    f61325f View commit details
    Browse the repository at this point in the history

  7. target population for people

    @johniak
    johniak committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    f7f7424 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Merge branch 'payment-module-people' of github.com:unicef/hct-mis int… 

    …o payment-module-people

# Conflicts:
#	frontend/src/components/paymentmodule/PaymentPlanDetails/FspSection/__snapshots__/FspSection.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/ImportXlsxPaymentPlanPaymentList/__snapshots__/ImportXlsxPaymentPlanPaymentList.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/ImportXlsxPaymentPlanPaymentListPerFsp/__snapshots__/ImportXlsxPaymentPlanPaymentListPerFsp.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/AcceptedPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/InApprovalPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/InReviewPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/LockedPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/OpenPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/__snapshots__/ApprovePaymentPlan.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/__snapshots__/AuthorizePaymentPlan.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/__snapshots__/MarkAsReleasedPaymentPlan.test.tsx.snap
#	frontend/src/components/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/__snapshots__/PaymentPlanDetailsHeader.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/FspSection/__snapshots__/FspSection.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/ImportXlsxPaymentPlanPaymentList/__snapshots__/ImportXlsxPaymentPlanPaymentList.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/ImportXlsxPaymentPlanPaymentListPerFsp/__snapshots__/ImportXlsxPaymentPlanPaymentListPerFsp.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/AcceptedPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/InApprovalPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/InAuthorizationPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/InReviewPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/LockedPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/HeaderButtons/__snapshots__/OpenPaymentPlanHeaderButtons.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/__snapshots__/ApprovePaymentPlan.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/__snapshots__/AuthorizePaymentPlan.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/__snapshots__/MarkAsReleasedPaymentPlan.test.tsx.snap
#	frontend/src/components/paymentmodulepeople/PaymentPlanDetails/PaymentPlanDetailsHeader/__snapshots__/PaymentPlanDetailsHeader.test.tsx.snap
    @johniak
    johniak committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    aa70caf View commit details
    Browse the repository at this point in the history

  2. fix for criteria

    @johniak
    johniak committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    321c875 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Selenium tests for targeting for people

    @johniak
    johniak committed May 7, 2024
    Configuration menu
    Copy the full SHA
    95ebf91 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. targeting selenium tests

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    f1e4188 View commit details
    Browse the repository at this point in the history

  2. fix compose selenium

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    c58356d View commit details
    Browse the repository at this point in the history

  3. code style improvement

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    d7eaf42 View commit details
    Browse the repository at this point in the history

  4. reset default timeout to ealier value

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    13b86f2 View commit details
    Browse the repository at this point in the history

  5. snapshot updated

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    d51ce30 View commit details
    Browse the repository at this point in the history

  6. fixed some tests

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    7cf4324 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into payment-module-people 

    # Conflicts:
#	backend/selenium_tests/conftest.py
#	compose.selenium.yml
#	frontend/src/components/targeting/TargetingCriteria/TargetingCriteria.tsx
    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    52472f1 View commit details
    Browse the repository at this point in the history

  8. added changes on Targeting page

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    0758264 View commit details
    Browse the repository at this point in the history

  9. reformat with black

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    3252e10 View commit details
    Browse the repository at this point in the history

  10. increase coverage

    @johniak
    johniak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    73fb3f1 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. more code cov

    @johniak
    johniak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    1dabc27 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into payment-module-people 

    # Conflicts:
#	frontend/src/containers/tables/UsersTable/__snapshots__/UsersTable.test.tsx.snap
    @johniak
    johniak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    364397c View commit details
    Browse the repository at this point in the history

  3. added more tests

    @johniak
    johniak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    4fd7075 View commit details
    Browse the repository at this point in the history

  4. snapshot update

    @johniak
    johniak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    561b84a View commit details
    Browse the repository at this point in the history

  5. snap fixed

    @johniak
    johniak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    efba0ba View commit details
    Browse the repository at this point in the history

  6. fix coverage and added more tests

    @johniak
    johniak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    08ca51d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into payment-module-people

    @mmaciekk
    mmaciekk authored May 9, 2024
    Configuration menu
    Copy the full SHA
    6ca37fa View commit details
    Browse the repository at this point in the history

  8. fix lint issues

    Maciej Szewczyk committed May 9, 2024
    Configuration menu
    Copy the full SHA
    919e91e View commit details
    Browse the repository at this point in the history

  9. update snapshots

    Maciej Szewczyk committed May 9, 2024
    Configuration menu
    Copy the full SHA
    3fd2958 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge pull request #3852 from unicef/staging 

    [Merge] Staging->Develop
    @patryk-dabrowski
    patryk-dabrowski authored May 10, 2024
    Configuration menu
    Copy the full SHA
    341ed6a View commit details
    Browse the repository at this point in the history

  2. some volumes adjutsments

    @johniak
    johniak committed May 10, 2024
    Configuration menu
    Copy the full SHA
    761c8b8 View commit details
    Browse the repository at this point in the history

  3. skipped unstable tests

    @johniak
    johniak committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d141dd8 View commit details
    Browse the repository at this point in the history

  4. typo

    @johniak
    johniak committed May 10, 2024
    Configuration menu
    Copy the full SHA
    b8b3d85 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3809 from unicef/payment-module-people 

    [197724 ]-People module enhancements
    @johniak
    johniak authored May 10, 2024
    Configuration menu
    Copy the full SHA
    1949fda View commit details
    Browse the repository at this point in the history