From 511fea63f7c16f67b04e70374040999b93169359 Mon Sep 17 00:00:00 2001
From: James Estevez <jestevez@salesforce.com>
Date: Fri, 2 Apr 2021 10:35:00 -0700
Subject: [PATCH 1/4] Github Actions workaround after repository rename (#103)

---
 .github/workflows/label_audit.yml | 2 +-
 requirements.txt                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/label_audit.yml b/.github/workflows/label_audit.yml
index fea983e..faecae8 100644
--- a/.github/workflows/label_audit.yml
+++ b/.github/workflows/label_audit.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: venv
-          key: ${{ runner.os }}-${{ steps.python-version.outputs.ver }}-${{ hashFiles('requirements.txt') }}
+          key: ${{ runner.os }}-${{ steps.python-version.outputs.ver }}_${{ hashFiles('requirements.txt') }}
       - name: Install Packages
         run: |
           python3 -m venv venv
diff --git a/requirements.txt b/requirements.txt
index 20ee5a1..706dd3c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 beautifulsoup4==4.8.1
 esprima==4.0.1
-soupsieve==1.9.5
 click==7.1.1
+soupsieve==1.9.5

From b8b78e949632908203aca9da587f4d8845b71756 Mon Sep 17 00:00:00 2001
From: David Reed <d.reed@salesforce.com>
Date: Mon, 12 Apr 2021 18:30:27 -0600
Subject: [PATCH 2/4] Add dependency resolutions

---
 cumulusci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cumulusci.yml b/cumulusci.yml
index 6fa511d..56ff276 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -7,6 +7,8 @@ project:
         api_version: "48.0"
     git:
         repo_url: https://github.com/SalesforceFoundation/OutboundFundsModule
+    dependency_resolutions:
+        preproduction: include_beta
 
 sources:
     bridge:

From 9146215791687a425bf6250aad3f88ea89b0e034 Mon Sep 17 00:00:00 2001
From: wcorkill <wcorkill@michiganfoundations.org>
Date: Fri, 14 May 2021 13:17:10 -0400
Subject: [PATCH 3/4] Adding Funding Program Awards Report

---
 ...Funding_Program_Awards_3Hk.report-meta.xml | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 force-app/main/default/reports/NPSP_Outbound_Fund_Reports/Funding_Program_Awards_3Hk.report-meta.xml

diff --git a/force-app/main/default/reports/NPSP_Outbound_Fund_Reports/Funding_Program_Awards_3Hk.report-meta.xml b/force-app/main/default/reports/NPSP_Outbound_Fund_Reports/Funding_Program_Awards_3Hk.report-meta.xml
new file mode 100644
index 0000000..cdb28a0
--- /dev/null
+++ b/force-app/main/default/reports/NPSP_Outbound_Fund_Reports/Funding_Program_Awards_3Hk.report-meta.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Report xmlns="http://soap.sforce.com/2006/04/metadata">
+    <columns>
+        <field>CUST_NAME</field>
+    </columns>
+    <columns>
+        <aggregateTypes>Sum</aggregateTypes>
+        <field>Funding_Request__c.Requested_Amount__c</field>
+    </columns>
+    <columns>
+        <aggregateTypes>Sum</aggregateTypes>
+        <field>Funding_Request__c.Awarded_Amount__c</field>
+    </columns>
+    <description>Ability to see the awarded funding requests and how much was requested and awarded for specific Funding Programs.</description>
+    <format>Summary</format>
+    <groupingsDown>
+        <dateGranularity>Day</dateGranularity>
+        <field>FK_NAME</field>
+        <sortOrder>Asc</sortOrder>
+    </groupingsDown>
+    <name>Funding Program Awards</name>
+    <params>
+        <name>co</name>
+        <value>1</value>
+    </params>
+    <reportType>CustomEntity$Funding_Request__c@Funding_Request__c.FundingProgram__c</reportType>
+    <scope>organization</scope>
+    <showDetails>false</showDetails>
+    <showGrandTotal>true</showGrandTotal>
+    <showSubTotals>true</showSubTotals>
+    <timeFrameFilter>
+        <dateColumn>Funding_Request__c.Application_Date__c</dateColumn>
+        <interval>INTERVAL_CUSTOM</interval>
+    </timeFrameFilter>
+</Report>

From dd5094f53c04e413e61bbc7eacecf5961f6dae3f Mon Sep 17 00:00:00 2001
From: David Glick <david@glicksoftware.com>
Date: Fri, 14 May 2021 15:16:19 -0400
Subject: [PATCH 4/4] Reset cumulusci.yml

---
 cumulusci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cumulusci.yml b/cumulusci.yml
index 56ff276..6fa511d 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -7,8 +7,6 @@ project:
         api_version: "48.0"
     git:
         repo_url: https://github.com/SalesforceFoundation/OutboundFundsModule
-    dependency_resolutions:
-        preproduction: include_beta
 
 sources:
     bridge: