diff --git a/.github/workflows/auth-lint.yml b/.github/workflows/auth-lint.yml
index b3b302a32e..2362d2b344 100644
--- a/.github/workflows/auth-lint.yml
+++ b/.github/workflows/auth-lint.yml
@@ -1,15 +1,14 @@
name: "Lint (auth)"
on:
- # Run on every push to a branch other than main that changes auth/
- push:
- branches-ignore: [main]
+ # Run on every pull request (open or push to it) that changes auth/
+ pull_request:
paths:
- "auth/**"
- ".github/workflows/auth-lint.yml"
env:
- FLUTTER_VERSION: "3.24.0"
+ FLUTTER_VERSION: "3.24.1"
jobs:
lint:
diff --git a/.github/workflows/auth-release.yml b/.github/workflows/auth-release.yml
index ef7a3d9192..d67cf1c7e9 100644
--- a/.github/workflows/auth-release.yml
+++ b/.github/workflows/auth-release.yml
@@ -29,7 +29,7 @@ on:
- "auth-v*"
env:
- FLUTTER_VERSION: "3.24.0"
+ FLUTTER_VERSION: "3.24.1"
jobs:
build-ubuntu:
diff --git a/.github/workflows/desktop-lint.yml b/.github/workflows/desktop-lint.yml
index d1cfda884d..0c24a081ff 100644
--- a/.github/workflows/desktop-lint.yml
+++ b/.github/workflows/desktop-lint.yml
@@ -1,9 +1,8 @@
name: "Lint (desktop)"
on:
- # Run on every push to a branch other than main that changes desktop/
- push:
- branches-ignore: [main]
+ # Run on every pull request (open or push to it) that changes desktop/
+ pull_request:
paths:
- "desktop/**"
- ".github/workflows/desktop-lint.yml"
diff --git a/.github/workflows/docs-verify-build.yml b/.github/workflows/docs-verify-build.yml
index addb52a059..e07f9f973f 100644
--- a/.github/workflows/docs-verify-build.yml
+++ b/.github/workflows/docs-verify-build.yml
@@ -4,9 +4,8 @@ name: "Verify build (docs)"
# succeeding before we merge the PR into main.
on:
- # Run on every push to a branch other than main that changes docs/
- push:
- branches-ignore: [main]
+ # Run on every pull request (open or push to it) that changes docs/
+ pull_request:
paths:
- "docs/**"
- ".github/workflows/docs-verify-build.yml"
diff --git a/.github/workflows/infra-lint-staff.yml b/.github/workflows/infra-lint-staff.yml
index 5c2894281e..3f3612bd04 100644
--- a/.github/workflows/infra-lint-staff.yml
+++ b/.github/workflows/infra-lint-staff.yml
@@ -1,9 +1,8 @@
name: "Lint (staff)"
on:
- # Run on every push to a branch other than main that changes infra/staff/
- push:
- branches-ignore: [main]
+ # Run on every pull request (open or push to it) that changes infra/staff/
+ pull_request:
paths:
- "infra/staff/**"
- ".github/workflows/infra-deploy-staff.yml"
diff --git a/.github/workflows/mobile-crowdin-sync.yml b/.github/workflows/mobile-crowdin-sync.yml
index 5f8da62b4d..39062cd6f5 100644
--- a/.github/workflows/mobile-crowdin-sync.yml
+++ b/.github/workflows/mobile-crowdin-sync.yml
@@ -26,7 +26,6 @@ jobs:
download_translations: true
localization_branch_name: translations/mobile
create_pull_request: true
- skip_untranslated_strings: true
pull_request_title: "[mobile] New translations"
pull_request_body: "New translations from [Crowdin](https://crowdin.com/project/ente-photos-app)"
pull_request_base_branch_name: "main"
diff --git a/.github/workflows/mobile-internal-release.yml b/.github/workflows/mobile-internal-release.yml
index 2eb9979bf9..a05fdcc236 100644
--- a/.github/workflows/mobile-internal-release.yml
+++ b/.github/workflows/mobile-internal-release.yml
@@ -4,7 +4,7 @@ on:
workflow_dispatch: # Allow manually running the action
env:
- FLUTTER_VERSION: "3.22.2"
+ FLUTTER_VERSION: "3.24.1"
jobs:
build:
diff --git a/.github/workflows/mobile-lint.yml b/.github/workflows/mobile-lint.yml
index 59bfcbbf67..27a3303294 100644
--- a/.github/workflows/mobile-lint.yml
+++ b/.github/workflows/mobile-lint.yml
@@ -1,16 +1,15 @@
name: "Lint (mobile)"
on:
- # Run on every push to a branch other than main that changes mobile/
- push:
- branches-ignore: [main, f-droid]
+ # Run on every pull request (open or push to it) that changes mobile/
+ pull_request:
paths:
- "mobile/**"
- ".github/workflows/mobile-lint.yml"
env:
- FLUTTER_VERSION: "3.22.2"
+ FLUTTER_VERSION: "3.24.1"
jobs:
lint:
diff --git a/.github/workflows/mobile-release.yml b/.github/workflows/mobile-release.yml
index 363f232c80..e1d5998387 100644
--- a/.github/workflows/mobile-release.yml
+++ b/.github/workflows/mobile-release.yml
@@ -9,7 +9,7 @@ on:
- "photos-v*"
env:
- FLUTTER_VERSION: "3.22.2"
+ FLUTTER_VERSION: "3.24.1"
jobs:
build:
diff --git a/.github/workflows/server-lint.yml b/.github/workflows/server-lint.yml
index 3b0cbc855f..2f126899ff 100644
--- a/.github/workflows/server-lint.yml
+++ b/.github/workflows/server-lint.yml
@@ -1,9 +1,8 @@
name: "Lint (server)"
on:
- # Run on every push to a branch other than main that changes server/
- push:
- branches-ignore: [main]
+ # Run on every pull request (open or push to it) that changes server/
+ pull_request:
paths:
- "server/**"
- ".github/workflows/server-lint.yml"
diff --git a/.github/workflows/web-lint.yml b/.github/workflows/web-lint.yml
index 7f5d270029..c64463384c 100644
--- a/.github/workflows/web-lint.yml
+++ b/.github/workflows/web-lint.yml
@@ -1,9 +1,8 @@
name: "Lint (web)"
on:
- # Run on every push to a branch other than main that changes web/
- push:
- branches-ignore: [main]
+ # Run on every pull request (open or push to it) that changes web/
+ pull_request:
paths:
- "web/**"
- ".github/workflows/web-lint.yml"
diff --git a/auth/android/app/build.gradle b/auth/android/app/build.gradle
index a0179af5b4..d8ffec49e8 100644
--- a/auth/android/app/build.gradle
+++ b/auth/android/app/build.gradle
@@ -57,7 +57,7 @@ android {
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 21
- targetSdkVersion 33
+ targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/auth/android/app/src/main/play/listings/en-US/full_description.txt b/auth/android/app/src/main/play/listings/en-US/full-description.txt
similarity index 100%
rename from auth/android/app/src/main/play/listings/en-US/full_description.txt
rename to auth/android/app/src/main/play/listings/en-US/full-description.txt
diff --git a/auth/android/app/src/main/play/listings/en-US/short_description.txt b/auth/android/app/src/main/play/listings/en-US/short-description.txt
similarity index 65%
rename from auth/android/app/src/main/play/listings/en-US/short_description.txt
rename to auth/android/app/src/main/play/listings/en-US/short-description.txt
index 92b9c58f19..4e378984e4 100644
--- a/auth/android/app/src/main/play/listings/en-US/short_description.txt
+++ b/auth/android/app/src/main/play/listings/en-US/short-description.txt
@@ -1 +1 @@
-Auth is a FOSS authenticator app that provides end-to-end encrypted backups for your 2FA secrets.
\ No newline at end of file
+Auth is a FOSS authenticator app that provides end-to-end encrypted backups for your 2FA secrets.
diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index a04cb2b857..86d99cb933 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -17,6 +17,9 @@
"title": "airtm",
"hex": "000000"
},
+ {
+ "title": "Amazon"
+ },
{
"title": "Anycoin Direct",
"slug": "anycoindirect"
@@ -24,6 +27,27 @@
{
"title": "AscendEX"
},
+ {
+ "title": "Battle.net",
+ "slug": "battlenet",
+ "altNames": [
+ "Battle net",
+ "Blizzard"
+ ]
+ },
+ {
+ "title": "Bethesda",
+ "altNames": [
+ "Bethesda Softworks"
+ ]
+ },
+ {
+ "title": "BinanceUS",
+ "slug": "binance_us",
+ "altNames": [
+ "Binance US"
+ ]
+ },
{
"title": "Bitfinex"
},
@@ -31,12 +55,12 @@
"title": "bitget"
},
{
- "titile":"bitget wallet",
- "slug":"bitget_wallet"
+ "title": "bitget wallet",
+ "slug": "bitget_wallet"
},
{
"title": "Bitmart",
- "hex":"000000"
+ "hex": "000000"
},
{
"title": "BitMEX"
@@ -51,8 +75,7 @@
"title": "Bitstamp"
},
{
- "title": "Bitvavo",
- "hex": "0051FF"
+ "title": "Bitvavo"
},
{
"title": "Bitwarden"
@@ -70,27 +93,24 @@
"blockchain.com",
"blockchain.com Wallet",
"blockchain.com Exchange"
- ],
- "slug": "blockchain"
+ ]
},
{
"title": "BorgBase",
"altNames": [
"borg"
- ],
- "slug": "BorgBase"
+ ]
},
{
"title": "Booking",
- "slug": "booking",
- "altNames":[
+ "altNames": [
"Booking.com"
]
},
{
"title": "Brave Creators",
"slug": "brave_creators",
- "altNames":[
+ "altNames": [
"Brave",
"Brave Rewards",
"Brave Browser"
@@ -110,15 +130,11 @@
"slug": "cih",
"hex": "D14633"
},
- {
- "title": "Cloudflare"
- },
{
"title": "CloudAMQP"
},
{
- "title": "ConfigCat",
- "slug": "configcat"
+ "title": "Cloudflare"
},
{
"title": "CoinDCX"
@@ -128,8 +144,7 @@
},
{
"title": "Control D",
- "slug": "controld",
- "hex": "5FD800"
+ "slug": "controld"
},
{
"title": "Crowdpear"
@@ -139,7 +154,6 @@
"slug": "crypto",
"altNames": [
"crypto",
- "Crypto.com",
"Crypto com"
]
},
@@ -147,8 +161,7 @@
"title": "DCS",
"altNames": [
"Digital Combat Simulator"
- ],
- "slug": "dcs"
+ ]
},
{
"title": "DEGIRO"
@@ -173,16 +186,22 @@
"slug": "dusnet"
},
{
- "title":"ecitizen kenya",
- "slug":"ecitizen_kenya"
+ "title": "ecitizen kenya",
+ "slug": "ecitizen_kenya"
+ },
+ {
+ "title": "ecloud",
+ "altNames": [
+ "Murena"
+ ]
},
{
"title": "ente",
"hex": "1DB954"
},
{
- "title": "enom"
- },
+ "title": "enom"
+ },
{
"title": "Epic Games",
"slug": "epic_games",
@@ -218,10 +237,10 @@
},
{
"title": "Gosuslugi",
+ "slug": "Gosuslugi",
"altNames": [
"Госуслуги"
- ],
- "slug": "Gosuslugi"
+ ]
},
{
"title": "Habbo"
@@ -240,16 +259,13 @@
"title": "HuggingFace",
"altNames": [
"Hugging Face"
- ],
- "slug": "huggingface"
+ ]
},
{
- "title": "IceDrive",
- "slug": "Icedrive"
+ "title": "IceDrive"
},
{
- "titile": "Infomaniak",
- "slug": "infomaniak"
+ "title": "Infomaniak"
},
{
"title": "ING"
@@ -270,8 +286,7 @@
"hex": "000000"
},
{
- "title": "IVPN",
- "slug": "IVPN"
+ "title": "IVPN"
},
{
"title": "Jagex",
@@ -281,8 +296,7 @@
"title": "Kagi"
},
{
- "title": "Kick",
- "hex": "53FC19"
+ "title": "Kick"
},
{
"title": "Kite"
@@ -295,15 +309,13 @@
"color": "00CC00"
},
{
- "title": "Kraken",
- "hex": "5848D5"
+ "title": "Kraken"
},
{
"title": "Kronos"
},
{
- "title": "KuCoin",
- "hex": "01BC8D"
+ "title": "KuCoin"
},
{
"title": "La Poste",
@@ -333,7 +345,6 @@
"mathstodon",
"fosstodon"
],
- "slug": "mastodon",
"hex": "6364FF"
},
{
@@ -364,13 +375,6 @@
{
"title": "Mozilla"
},
- {
- "title": "Murena",
- "altNames": [
- "eCloud"
- ],
- "slug": "ecloud"
- },
{
"title": "MyFRITZ!Net",
"slug": "myfritz",
@@ -406,6 +410,12 @@
{
"title": "NextDNS"
},
+ {
+ "title": "Newton",
+ "altNames": [
+ "Newton Crypto"
+ ]
+ },
{
"title": "ngrok",
"hex": "858585"
@@ -420,8 +430,7 @@
"title": "Notion"
},
{
- "title": "NuCommunity",
- "slug": "nucommunity"
+ "title": "NuCommunity"
},
{
"title": "NVIDIA"
@@ -430,16 +439,17 @@
"title": "Odido"
},
{
- "titile": "OpenObserve",
+ "title": "OpenObserve",
"slug": "open_observe",
- "altNames":[
+ "altNames": [
"openobserve.ai",
"openobserve ai"
]
},
{
"title": "okx",
- "hex": "000000" },
+ "hex": "000000"
+ },
{
"title": "Parsec"
},
@@ -447,16 +457,13 @@
"title": "PayPal"
},
{
- "title": "pCloud",
- "slug": "pCloud"
+ "title": "pCloud"
},
{
- "title": "Peerberry",
- "hex": "03E5A5"
+ "title": "Peerberry"
},
{
- "title": "Pingvin Share",
- "hex": "485099"
+ "title": "Pingvin Share"
},
{
"title": "Plutus",
@@ -466,12 +473,10 @@
"title": "Poloniex"
},
{
- "title": "Porkbun",
- "hex": "F27777"
+ "title": "Porkbun"
},
{
- "title": "PostNL",
- "color": "EF8300"
+ "title": "PostNL"
},
{
"title": "Privacy Guides",
@@ -495,7 +500,6 @@
"title": "Registro br",
"slug": "registro_br",
"altNames": [
- "Registro br",
"registrobr",
"Registro.br"
]
@@ -507,13 +511,15 @@
"title": "Revolt",
"hex": "858585"
},
+ {
+ "title": "RippleMatch"
+ },
{
"title": "Rockstar Games",
"slug": "rockstar_games"
},
{
- "title": "RuneMate",
- "hex": "2ECC71"
+ "title": "RuneMate"
},
{
"title": "Rust Language Forum",
@@ -529,6 +535,9 @@
{
"title": "service-bw"
},
+ {
+ "title": "Shakepay"
+ },
{
"title": "SimpleLogin"
},
@@ -551,16 +560,14 @@
]
},
{
- "title": "SMTP2GO",
- "slug": "smtp2go"
+ "title": "SMTP2GO"
},
{
"title": "Snapchat"
},
{
"title": "Standard Notes",
- "slug": "standardnotes",
- "hex": "2173E6"
+ "slug": "standardnotes"
},
{
"title": "Surfshark"
@@ -570,9 +577,7 @@
"slug": "synology_dsm"
},
{
- "title": "TCPShield",
- "slug": "tcpshield",
- "hex": "FFFFFF"
+ "title": "TCPShield"
},
{
"title": "Techlore",
@@ -596,9 +601,7 @@
"title": "TorGuard"
},
{
- "title": "Trading 212",
- "slug": "trading212",
- "hex": "4BA4DE"
+ "title": "Trading 212"
},
{
"title": "TradingView"
@@ -635,13 +638,16 @@
"hex": "858585"
},
{
- "title": "Uphold",
- "slug": "uphold",
- "hex": "6FE68A"
+ "title": "Uphold"
},
{
- "titile": "Vikunja",
- "slug": "vikunja"
+ "title": "Upstox"
+ },
+ {
+ "title": "Vikunja"
+ },
+ {
+ "title": "Wealthfront"
},
{
"title": "Wealthsimple"
@@ -656,74 +662,30 @@
{
"title": "Wise"
},
- {
- "title": "WYZE",
- "slug": "wyze"
- },
{
"title": "WorkOS",
- "slug": "workos",
"altNames": [
"Work OS"
]
},
{
- "title": "X",
- "altNames": [
- "twitter"
- ],
- "slug": "x"
+ "title": "WYZE"
+ },
+ {
+ "title": "yahoo"
},
{
"title": "Yandex",
"altNames": [
"Ya",
"Яндекс"
- ],
- "slug": "Yandex"
- },
- {
- "title": "yahoo"
+ ]
},
{
"title": "YNAB",
"altNames": [
"You Need A Budget"
- ],
- "slug": "ynab",
- "hex": "3B5EDA"
- },
- {
- "title": "Shakepay",
- "slug": "shakepay"
- },
- {
- "title": "Newton",
- "altNames": ["Newton Crypto"],
- "slug": "newton"
- },
- {
- "title": "T-Mobile ID",
- "altNames": [
- "T-Mobile"
- ],
- "slug": "t-mobile"
- },
- {
- "title": "Wealthfront",
- "slug": "wealthfront"
- },
- {
- "title": "BinanceUS",
- "altNames": [
- "Binance US"
- ],
- "slug": "binance_us"
- },
- {
- "title": "Bethesda Softworks",
- "altNames": ["Bethesda"],
- "slug": "bethesda"
+ ]
}
]
-}
+}
\ No newline at end of file
diff --git a/auth/assets/custom-icons/icons/amazon.svg b/auth/assets/custom-icons/icons/amazon.svg
new file mode 100644
index 0000000000..5fb773c13f
--- /dev/null
+++ b/auth/assets/custom-icons/icons/amazon.svg
@@ -0,0 +1,6 @@
+
diff --git a/auth/assets/custom-icons/icons/battlenet.svg b/auth/assets/custom-icons/icons/battlenet.svg
new file mode 100644
index 0000000000..023e205622
--- /dev/null
+++ b/auth/assets/custom-icons/icons/battlenet.svg
@@ -0,0 +1,10 @@
+
diff --git a/auth/assets/custom-icons/icons/epic_games.svg b/auth/assets/custom-icons/icons/epic_games.svg
index b6685c9ac0..cd4d39738f 100644
--- a/auth/assets/custom-icons/icons/epic_games.svg
+++ b/auth/assets/custom-icons/icons/epic_games.svg
@@ -1,3 +1,5 @@
-