Skip to content

Commit

Permalink
Merge branch 'main' into autolock_options
Browse files Browse the repository at this point in the history
  • Loading branch information
ashilkn committed Jul 20, 2024
2 parents e5a5d9c + 1cf2b24 commit 73b57ff
Show file tree
Hide file tree
Showing 407 changed files with 20,875 additions and 9,981 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/web-crowdin-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [main]
paths:
# Run workflow when web's en-US/translation.json is changed
- "web/packages/next/locales/en-US/translation.json"
- "web/packages/base/locales/en-US/translation.json"
# Or the workflow itself is changed
- ".github/workflows/web-crowdin.yml"
schedule:
Expand Down
30 changes: 0 additions & 30 deletions auth/assets/ca/lets-encrypt-r3.pem

This file was deleted.

41 changes: 33 additions & 8 deletions auth/assets/custom-icons/_data/custom-icons.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"icons": [
{ "title": "1xBet",
"altNames": ["1x", "1x bet", "1x-bet"
]
},
{ "title": "1xBet",
"altNames": ["1x", "1x bet", "1x-bet"
]
},
{
"title": "3Commas"
},
Expand All @@ -14,6 +14,10 @@
{
"title": "Airtable"
},
{
"title": "airtm",
"hex": "000000"
},
{
"title": "Anycoin Direct",
"slug": "anycoindirect"
Expand Down Expand Up @@ -116,6 +120,9 @@
{
"title": "DEGIRO"
},
{
"title": "deriv"
},
{
"title": "DirectAdmin"
},
Expand Down Expand Up @@ -195,6 +202,10 @@
{
"title": "ING"
},
{
"title": "Instant Gaming",
"slug": "instant_gaming"
},
{
"title": "Instagram"
},
Expand Down Expand Up @@ -290,6 +301,13 @@
{
"title": "Mintos"
},
{
"title": "Mistral",
"altNames": [
"Mistral AI",
"MistralAI"
]
},
{
"title": "Mozilla"
},
Expand Down Expand Up @@ -334,8 +352,8 @@
{
"title": "Odido"
},
{ "title": "okx",
"hex": "858585" },
{ "title": "okx",
"hex": "858585" },
{
"title": "Parsec"
},
Expand Down Expand Up @@ -465,6 +483,13 @@
"Techlore Forums"
]
},
{
"title": "Teleport",
"altNames": [
"Gravitational Teleport",
"GoTeleport"
]
},
{
"title": "Termius",
"hex": "858585"
Expand Down Expand Up @@ -553,8 +578,8 @@
],
"slug": "Yandex"
},
{ "title": "yahoo" },
{
{ "title": "yahoo" },

{
"title": "YNAB",
"altNames": [
Expand Down
1 change: 1 addition & 0 deletions auth/assets/custom-icons/icons/airtm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 1 addition & 18 deletions auth/assets/custom-icons/icons/bitget.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions auth/assets/custom-icons/icons/deriv.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions auth/assets/custom-icons/icons/instant_gaming.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions auth/assets/custom-icons/icons/mistral.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions auth/assets/custom-icons/icons/teleport.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion auth/assets/custom-icons/icons/yahoo.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 73b57ff

Please sign in to comment.