Code

Back merge STG > DEV#4518

Code

Merged

pavlo-mk merged 29 commits intodevelopunicef/hope:developfrom stg_into_developunicef/hope:stg_into_developCopy head branch name to clipboardDec 23, 2024

+368-541

Commits

Commits on Dec 3, 2024

• skip unstable

  pavlo-mk

  committed
  5c0132b

  Copy full SHA for 5c0132b

• Merge pull request #4502 from unicef/skip-unstable-e2e

  Show description for 9175069
  johniak

  authored
  9175069

  Copy full SHA for 9175069

Commits on Dec 4, 2024

• Merge pull request #4503 from unicef/develop

  Show description for 3b1746e
  domdinicola

  authored
  3b1746e

  Copy full SHA for 3b1746e

• STG // Fix RDI import dmd json field (#4504)

  Show description for 4bc612a
  pavlo-mk

  authored
  4bc612a

  Copy full SHA for 4bc612a

Commits on Dec 5, 2024

• remove generateroles from upgrade, update generateroles based on admin history for these roles

  pkujawa

  committed
  4ac5566

  Copy full SHA for 4ac5566

• Merge branch 'staging' into permissions-reset-after-upgrade

  pkujawa

  authored
  2328af6

  Copy full SHA for 2328af6

• Merge pull request #4506 from unicef/permissions-reset-after-upgrade

  Show description for bc03fd0
  domdinicola

  authored
  bc03fd0

  Copy full SHA for bc03fd0

Commits on Dec 6, 2024

• [STG] Payment Plan export xlsx: added FSP template doc types list (#4508)

  Show description for eb08987
  pavlo-mk

  authored
  eb08987

  Copy full SHA for eb08987

Commits on Dec 9, 2024

• Dashboard fix

  srugano

  committed
  78f7caa

  Copy full SHA for 78f7caa

• 215787_drop_cash_assist_migration_script_fix (#4509)

  MarekBiczysko

  authored
  093aaaf

  Copy full SHA for 093aaaf

• Merge branch 'staging' into dashboard_fix1

  srugano

  authored
  4287227

  Copy full SHA for 4287227

• Merge pull request #4510 from unicef/dashboard_fix1

  Show description for da78ba7
  srugano

  authored
  da78ba7

  Copy full SHA for da78ba7

• Merge pull request #4512 from unicef/staging

  Show description for be85651
  johniak

  authored
  be85651

  Copy full SHA for be85651

Commits on Dec 10, 2024

• 2226242_Payment_verification_page_not_accessible (#4514)

  MarekBiczysko

  authored
  9d77170

  Copy full SHA for 9d77170

• rollback generateroles to upgrade, skip updating existing roles

  pkujawa

  committed
  43d0927

  Copy full SHA for 43d0927

Commits on Dec 11, 2024

• Back merge PROD > STG (#4516)

  Show description for 5b15e07
  

  3 peopleauthored
  5b15e07

  Copy full SHA for 5b15e07

• Merge branch 'staging' into generateroles_handle_2

  pkujawa

  authored
  3228cd2

  Copy full SHA for 3228cd2

• add correct permission for cycles page

  

  Maciej Szewczyk

  committed
  03bf48e

  Copy full SHA for 03bf48e

• Merge pull request #4515 from unicef/generateroles_handle_2

  Show description for 6c66922
  pkujawa

  authored
  6c66922

  Copy full SHA for 6c66922

• fe fix

  pavlo-mk

  committed
  3b1e1cd

  Copy full SHA for 3b1e1cd

• just new line

  pavlo-mk

  committed
  1f9dc4e

  Copy full SHA for 1f9dc4e

Commits on Dec 12, 2024

• Merge pull request #4520 from unicef/fix-perm-cycles

  Show description for f466892
  johniak

  authored
  f466892

  Copy full SHA for f466892

• back merge

  pavlo-mk

  committed
  ac4bc8f

  Copy full SHA for ac4bc8f

• Merge pull request #4523 from unicef/prod_back_merge

  Show description for 24b64d6
  johniak

  authored
  24b64d6

  Copy full SHA for 24b64d6

Commits on Dec 23, 2024

• Master into stg (#4534)

  Show description for 5b27458
  

  3 peopleauthored
  5b27458

  Copy full SHA for 5b27458

• conflicts

  pavlo-mk

  committed
  c32b034

  Copy full SHA for c32b034

• Merge branch 'develop' into stg_into_develop

  pavlo-mk

  authored
  6883189

  Copy full SHA for 6883189

• fix test & migration

  pavlo-mk

  committed
  92c37ba

  Copy full SHA for 92c37ba

• Merge remote-tracking branch 'origin/stg_into_develop' into stg_into_develop

  pavlo-mk

  committed
  369ab67

  Copy full SHA for 369ab67