Skip to content

Commit

Permalink
Merge branch 'main' into clip_face_integration
Browse files Browse the repository at this point in the history
  • Loading branch information
ua741 committed Aug 13, 2024
2 parents a0d33ec + 2274be9 commit 3f9d8ea
Show file tree
Hide file tree
Showing 261 changed files with 6,341 additions and 2,640 deletions.
2 changes: 1 addition & 1 deletion auth/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application android:name="${applicationName}"
android:label="Auth"
android:label="Ente Auth"
android:icon="@mipmap/launcher_icon"
android:usesCleartextTraffic="true"
android:requestLegacyExternalStorage="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ file, that adheres to the above format.

SUPPORT

If you need help, please reach out to [email protected], and a human will get in touch with you.
If you need help, please visit @ https://github.com/ente-io/ente/discussions/new?category=q-a, and someone will get in touch with you.
If you have feature requests, please create an issue @ https://github.com/ente-io/ente
80 changes: 76 additions & 4 deletions auth/assets/custom-icons/_data/custom-icons.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
{
"title": "BitMEX"
},
{
"title": "BitOasis"
},
{
"title": "BitSkins"
},
Expand All @@ -60,16 +63,37 @@
"Bloom Host Billing"
]
},
{
"title": "Blockchain",
"altNames": [
"blockchain.com",
"blockchain.com Wallet",
"blockchain.com Exchange"
],
"slug": "blockchain"
},
{
"title": "BorgBase",
"altNames": [
"borg"
],
"slug": "BorgBase"
},
{
"title": "Booking",
"slug": "booking",
"altNames":[
"Booking.com"
]
},
{
"title": "Brave Creators",
"slug": "brave_creators"
"slug": "brave_creators",
"altNames":[
"Brave",
"Brave Rewards",
"Brave Browser"
]
},
{
"title": "Bybit"
Expand Down Expand Up @@ -110,7 +134,13 @@
"title": "Crowdpear"
},
{
"title": "crypto"
"title": "Crypto.com",
"slug": "crypto",
"altNames": [
"crypto",
"Crypto.com",
"Crypto com"
]
},
{
"title": "DCS",
Expand Down Expand Up @@ -149,6 +179,10 @@
"title": "ente",
"hex": "1DB954"
},
{
"title": "enom"
},

{
"title": "Epic Games",
"slug": "epic_games",
Expand Down Expand Up @@ -205,6 +239,10 @@
"title": "IceDrive",
"slug": "Icedrive"
},
{
"titile": "Infomaniak",
"slug": "infomaniak"
},
{
"title": "ING"
},
Expand All @@ -219,8 +257,9 @@
"title": "INWX"
},
{
"title": "Itch.io",
"slug": "itch_io"
"title": "Itch",
"slug": "itch_io",
"hex": "e7685e"
},
{
"title": "IVPN",
Expand Down Expand Up @@ -358,6 +397,14 @@
{
"title": "Odido"
},
{
"titile": "OpenObserve",
"slug": "open_observe",
"altNames":[
"openobserve.ai",
"openobserve ai"
]
},
{ "title": "okx",
"hex": "000000" },
{
Expand Down Expand Up @@ -462,6 +509,18 @@
{
"title": "Skinport"
},
{
"title": "SMSPool",
"slug": "sms_pool_net",
"altNames": [
"smspool.net",
"smspool net"
]
},
{
"title": "SMTP2GO",
"slug": "smtp2go"
},
{
"title": "Snapchat"
},
Expand Down Expand Up @@ -548,6 +607,10 @@
"slug": "uphold",
"hex": "6FE68A"
},
{
"titile": "Vikunja",
"slug": "vikunja"
},
{
"title": "WHMCS"
},
Expand Down Expand Up @@ -593,6 +656,15 @@
],
"slug": "ynab",
"hex": "3B5EDA"
},
{
"title": "Shakepay",
"slug": "shakepay"
},
{
"title": "Newton",
"altNames": ["Newton Crypto"],
"slug": "newton"
}
]
}
10 changes: 10 additions & 0 deletions auth/assets/custom-icons/icons/Enom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions auth/assets/custom-icons/icons/bitoasis.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions auth/assets/custom-icons/icons/blockchain.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions auth/assets/custom-icons/icons/booking.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions auth/assets/custom-icons/icons/infomaniak.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions auth/assets/custom-icons/icons/newton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions auth/assets/custom-icons/icons/open_observe.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions auth/assets/custom-icons/icons/shakepay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3f9d8ea

Please sign in to comment.