Skip to content

Commit 692f4d5

Browse files
committed
Merge branch 'main' into fix/unreported-expenses-list
2 parents 7517650 + f1046c4 commit 692f4d5

491 files changed

Lines changed: 7320 additions & 2881 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/remote-build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Remote Build Android
33
on:
44
workflow_dispatch:
55
push:
6-
branches-ignore: [staging, production]
6+
branches-ignore: [staging, production, cherry-pick-*]
77
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
88

99
concurrency:

.github/workflows/remote-build-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Remote Build iOS
33
on:
44
workflow_dispatch:
55
push:
6-
branches-ignore: [staging, production]
6+
branches-ignore: [staging, production, cherry-pick-*]
77
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
88

99
concurrency:

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009019905
118-
versionName "9.1.99-5"
117+
versionCode 1009020001
118+
versionName "9.2.0-1"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

assets/images/product-illustrations/todd-in-car.svg

Lines changed: 292 additions & 0 deletions
Loading

docs/Hidden/Manually-submit-reports-for-approval.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
title: Manually submit reports for approval
33
description: Submit a report before the submission date
44
---
5-
<div id="new-expensify" markdown="1">
65

76
By default, reports are automatically submitted for approval every Sunday. However, if it is ready for early submission, you can manually submit your report for approval.
87

@@ -40,4 +39,3 @@ The reimbursement options depend on the workspace’s settings.
4039
- You can receive reimbursements with your Expensify Wallet or outside of Expensify.
4140
{% include faq-end.md %}
4241

43-
</div>

docs/Hidden/Upgrade-to-a-Collect-Plan.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
title: Upgrade from a Free plan to Collect
33
description: You've been automatically upgraded to a Collect plan
44
---
5-
<div id="new-expensify" markdown="1">
65

76
All customers on a Free plan have been automatically upgraded to a Collect plan!
87

@@ -49,5 +48,3 @@ The discount will be reflected on your monthly Expensify bill as a “Workspace
4948
You can reach your Setup Specialist by opening your workspace’s #admins room in your chat inbox and sending a message.
5049

5150
{% include faq-end.md %}
52-
53-
</div>

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Add-Personal-Australian-Bank-Account.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ title: Add a Personal Australian Bank Account
33
description: Receive AUD reimbursements from an Australian employer by adding your banking information
44
keywords: [Expensify Classic, Australian bank account]
55
---
6-
<div id="expensify-classic" markdown="1">
76

87
Australian employees can connect a personal deposit-only bank account to receive reimbursements for their expense reports.
98

@@ -43,4 +42,3 @@ Your bank can provide this information. Contact them to confirm your **Bank User
4342
## Can I add multiple bank accounts?
4443
No, you can only add one deposit-only bank account per workspace for reimbursements.
4544

46-
</div>

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-Bank-Account.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ description: Receive reimbursements for expense reports submitted to your employ
44
keyword: [Expensify Classic, deposit account, reimbursement account]
55
---
66

7-
<div id="expensify-classic" markdown="1">
87

98
Employees can connect a personal deposit-only bank account to receive reimbursements for their expense reports.
109

@@ -83,4 +82,3 @@ The Clearing Code is made up of both the **Bank Code** and the **Branch Code** t
8382
- **Standard Chartered** — Bank Code: 9496. Branch Code: `0` + first 2 digits of Account No. Account No: full 10 digits.
8483
Example: `1803645852` → Branch Code `018`, Clearing Code `9496018`, Account No `1803645852`.
8584

86-
</div>

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ title: Connect U.S. business bank account
33
description: Learn how to connect a deposit-only or verified business bank account to Expensify for payments and reimbursements.
44
keywords: [Expensify Classic, business bank account, verified business bank account, send reimbursement, disconnect bank account]
55
---
6-
<div id="expensify-classic" markdown="1">
76

87
You can connect a **business deposit-only account** (receives payments only) or a **verified business account** (sends and receives payments):
98

@@ -185,4 +184,3 @@ If you're unable to delete your bank account, update the settlement account for
185184

186185
If your business falls into one of these categories, you won’t be able to connect a business bank account to process reimbursements.
187186

188-
</div>

0 commit comments

Comments
 (0)