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.

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

#2523 Reply formatting fix #2526

Merged
merged 16 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Auto approve
uses: hmarr/auto-approve-action@v3.2.1 # Custom action for auto approval already available on marketplace
uses: hmarr/auto-approve-action@v4 # Custom action for auto approval already available on marketplace
# Perform the auto approve action only when the PR is raised by dependabot
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
Expand Down
161 changes: 85 additions & 76 deletions Core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "0.0.1",
"description": "TypeScript core for FlowCrypt iOS internal use",
"dependencies": {
"@openpgp/web-stream-tools": "^0.0.13",
"@openpgp/web-stream-tools": "0.0.11-patch-0",
"encoding-japanese": "^2.0.0",
"openpgp": "5.11.0",
"openpgp": "5.11.1",
"sanitize-html": "^2.8.0",
"zxcvbn": "4.4.2"
},
Expand All @@ -19,7 +19,7 @@
"chai": "4.3.10",
"eslint-plugin-local-rules": "^2.0.0",
"typescript": "^5.3.3",
"webpack": "^5.72.0",
"webpack": "^5.90.3",
"webpack-cli": "5.1.4",
"webpack-node-externals": "3.0.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/realm/realm-cocoa",
"state" : {
"revision" : "eafdd3720a8cc750bdd38bf776082d2c8cf743fc",
"version" : "10.46.0"
"revision" : "55466ae0fb29c5f21866792f05c1fc0c590d7c29",
"version" : "10.47.0"
}
},
{
Expand Down Expand Up @@ -149,8 +149,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/scinfu/SwiftSoup.git",
"state" : {
"revision" : "f83c097597094a04124eb6e0d1e894d24129af87",
"version" : "2.7.0"
"revision" : "1d39e56d364cba79ce43b341f9661b534cccb18d",
"version" : "2.7.1"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion FlowCrypt/Controllers/Inbox/InboxViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ extension InboxViewController {
// MARK: - Action handlers
extension InboxViewController {
private func handleInfoTap() {
#warning("ToDo")
// todo - open compose screen with predefined [email protected] recipient
showToast("Email us at [email protected]")
}

Expand Down
Loading
Loading