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

🚨 Release merge conflicts #8922

Merged
merged 95 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
236e5d0
Merge branch 'hotfix'
live-github-bot[bot] Nov 15, 2024
1349589
Merge branch 'release'
live-github-bot[bot] Nov 21, 2024
931d91c
Merge branch 'release'
live-github-bot[bot] Nov 29, 2024
4102eda
chore(prerelease) update cryptoassets
live-github-bot[bot] Dec 2, 2024
6effad6
chore(prerelease): :rocket: entering prerelease mode
live-github-bot[bot] Dec 2, 2024
73b1e60
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.0), L…
live-github-bot[bot] Dec 2, 2024
7c88668
fix: add custom ptx handlers to handlers memo
kallen-ledger Dec 3, 2024
3a69f70
Merge pull request #8574 from LedgerHQ/fix/LIVE-15117-release
kallen-ledger Dec 3, 2024
ea3a175
fix: add ledger validator on mantra (#8580)
Canestin Dec 3, 2024
d88683c
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.1), L…
live-github-bot[bot] Dec 3, 2024
64ed0a4
feat(llm): 🗒️ log content card impression when 50% of the card is sho…
thesan Dec 3, 2024
f775634
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.1), L…
live-github-bot[bot] Dec 3, 2024
87d298c
Merge pull request #8581 from LedgerHQ/fix/LIVE-15154 (#8586)
themooneer Dec 4, 2024
b6c8ff1
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.2), L…
live-github-bot[bot] Dec 4, 2024
40509e4
bugfix: add mev protection on swap (#8596)
Canestin Dec 4, 2024
563c4f0
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.3), L…
live-github-bot[bot] Dec 4, 2024
61aedb7
Bugfix/revert and tsd 4337 unexpected major service overuse release (…
mcayuelas-ledger Dec 4, 2024
a28784d
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.4), L…
live-github-bot[bot] Dec 4, 2024
ffc2445
:bug: (llm) margin issue on my ledger screen (#8606)
LucasWerey Dec 5, 2024
a68c16b
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.4), L…
live-github-bot[bot] Dec 5, 2024
3a9758f
fix(lld): use a debounce on memotag field
KVNLS Dec 5, 2024
a5832e8
Merge pull request #8628 from LedgerHQ/fix/release-live-15143
KVNLS Dec 6, 2024
ac7bf12
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.5), L…
live-github-bot[bot] Dec 6, 2024
16a4794
fix(llm): 🐛 release fix long Memo Tag issue on Stacks (#8624)
thesan Dec 6, 2024
26e91b7
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.6), L…
live-github-bot[bot] Dec 6, 2024
cd51725
ci: rename "test web tools" to "build web tools"
angusbayley Dec 5, 2024
177265d
fix(llm): 🐛 debounce memo tag changes (#8632)
thesan Dec 6, 2024
70ee295
fix(llm): 🐛 fix long Memo Tag issue on Cardano (#8608)
thesan Dec 6, 2024
c68f3ec
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.6), L…
live-github-bot[bot] Dec 9, 2024
672c52d
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.6), L…
live-github-bot[bot] Dec 9, 2024
8851e59
fix(llm): correct memo/tag drawer copy
thesan Dec 9, 2024
8685099
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.6), L…
live-github-bot[bot] Dec 9, 2024
ca80ed8
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
b79c58c
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
32d0213
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
75c3e32
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
710238a
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
ceacd05
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
ee6380d
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
de0bb76
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
afb16e9
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
3a5400f
File apps/ledger-live-desktop/static/i18n/en/app.json was translated …
ldg-smartling-sa Dec 10, 2024
844fb8e
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
baab2e6
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
1200514
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
df745a1
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
d2a442e
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
4010d68
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
75b2bc0
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
a2b9eb8
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
5a167d6
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
f2e438a
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Dec 10, 2024
e7008f4
fix: update de on llm & lld
KVNLS Dec 10, 2024
daf5ee9
Merge pull request #8651 from LedgerHQ/smartling-translations-2024121…
KVNLS Dec 10, 2024
31764d0
fix(llm): prevent debounce causing memo change miss
thesan Dec 10, 2024
e723113
Revert "fix(lld): use a debounce on memotag field"
KVNLS Dec 10, 2024
f5021bf
Merge pull request #8664 from LedgerHQ/fix/revert-live-15143
KVNLS Dec 10, 2024
c9d5272
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.6), L…
live-github-bot[bot] Dec 10, 2024
8b3479a
chore(prerelease): :rocket: release prerelease [LLD(2.94.0-next.6), L…
live-github-bot[bot] Dec 10, 2024
f62003c
Update RELEASE_NOTES.md
desirendr Dec 12, 2024
715a369
chore(release): :rocket: prepare release [skip ci]
live-github-bot[bot] Dec 12, 2024
e84dc0c
Merge branch 'release'
live-github-bot[bot] Dec 12, 2024
ec55651
chore(prerelease) update cryptoassets
live-github-bot[bot] Jan 7, 2025
6927877
chore(prerelease): :rocket: entering prerelease mode
live-github-bot[bot] Jan 7, 2025
33374f1
chore(prerelease): :rocket: release prerelease [LLD(2.95.0-next.0), L…
live-github-bot[bot] Jan 7, 2025
2f95c55
fix: llm perf issue on iOS due to Braze usage
KVNLS Jan 9, 2025
10b4eec
Merge pull request #8856 from LedgerHQ/fix/release-live-15674
KVNLS Jan 9, 2025
2465fff
chore(prerelease): :rocket: release prerelease [LLD(2.95.0-next.0), L…
live-github-bot[bot] Jan 9, 2025
a0dc7cf
bugfix: QR code scanning was failing to retrieve recipient's address …
mcayuelas-ledger Jan 10, 2025
259cfa0
chore(prerelease): :rocket: release prerelease [LLD(2.95.0-next.0), L…
live-github-bot[bot] Jan 10, 2025
b3f621e
fix(llm): remove mobileCardsSelector from useBrazeContentCard
thesan Jan 10, 2025
8c2eae5
Merge pull request #8870 from LedgerHQ/fix/llm-braze-perfs
thesan Jan 10, 2025
e8fe64f
chore: add changeset for #8870
thesan Jan 10, 2025
7170a3b
Merge pull request #8873 from LedgerHQ/chore/llm-braze-perfs-changeset
thesan Jan 10, 2025
a0cb0f9
chore(prerelease): :rocket: release prerelease [LLD(2.95.0-next.0), L…
live-github-bot[bot] Jan 10, 2025
6d050fd
Fix/revert llm (#8884)
CremaFR Jan 13, 2025
824ac09
chore(prerelease): :rocket: release prerelease [LLD(2.95.0-next.1), L…
live-github-bot[bot] Jan 13, 2025
6411811
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
12c153c
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
64b5fb0
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
89c5911
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
8621b1c
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
7365e43
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
5b67d49
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
110eb41
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
1f460df
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
384c3ba
File apps/ledger-live-mobile/src/locales/en/common.json was translate…
ldg-smartling-sa Jan 14, 2025
10d3a2a
Merge pull request #8890 from LedgerHQ/smartling-translations-2025011…
desirendr Jan 14, 2025
3d1196b
🔀 (conflicts): merge main into release to fix conflicts from previous…
valpinkman Jan 14, 2025
4976742
🔀 (conflicts): rollback files wrong taken
jiyuzhuang Jan 14, 2025
fbce1ff
update market page search linux
Wozacosta Jan 15, 2025
9e56edd
update screenshot manually
jiyuzhuang Jan 15, 2025
c66510e
chore(release): :rocket: prepare release [skip ci]
live-github-bot[bot] Jan 16, 2025
6be628a
Merge branch 'develop' into support/release-merge-conflicts
jiyuzhuang Jan 16, 2025
6e29214
update sortbymarketcap.test.ts.snap
Wozacosta Jan 16, 2025
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
5 changes: 0 additions & 5 deletions .changeset/afraid-actors-fry.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/angry-rats-kick.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/blue-rice-behave.md

This file was deleted.

27 changes: 0 additions & 27 deletions .changeset/calm-coins-buy.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/calm-waves-battle.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/chatty-shirts-tickle.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/chilled-coats-drive.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/curvy-hornets-wink.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/curvy-ladybugs-collect.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/curvy-parents-push.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/cyan-rabbits-return.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/famous-mirrors-carry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fifty-toes-sit.md

This file was deleted.

10 changes: 0 additions & 10 deletions .changeset/forty-turtles-mix.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fresh-needles-push.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fresh-rabbits-do.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/friendly-carrots-yawn.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/funny-trains-speak.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/fuzzy-forks-draw.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/giant-jobs-whisper.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/great-baboons-enjoy.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/grumpy-pets-allow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/heavy-worms-retire.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/honest-badgers-develop.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hungry-ravens-beg.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/large-glasses-relate.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/large-otters-refuse.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/loud-masks-relate.md

This file was deleted.

14 changes: 0 additions & 14 deletions .changeset/loud-spiders-fail.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/metal-foxes-do.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/moody-mugs-grin.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/moody-oranges-reply.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/nine-pots-happen.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nine-toes-worry.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/ninety-scissors-grow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/perfect-schools-pretend.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/pink-bats-attack.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/plenty-beds-chew.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/pretty-hairs-laugh.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/purple-beers-report.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/quick-frogs-develop.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/real-eagles-scream.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/real-suits-repair.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/red-roses-try.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rotten-lamps-care.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/seven-rocks-dream.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/shy-penguins-itch.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silent-boats-wash.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/small-jokes-work.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/smart-olives-learn.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/sour-kings-sneeze.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/spicy-rabbits-divide.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/stale-guests-drum.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/stale-penguins-tap.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/stupid-hotels-laugh.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/stupid-starfishes-hammer.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/swift-cherries-hammer.md

This file was deleted.

Loading
Loading