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.

Sign up for GitHub

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

Jump to bottom

Fix/resolve merge issue #7

Merged
merged 53 commits into from
Jun 5, 2024
Merged

Fix/resolve merge issue #7

merged 53 commits into from
Jun 5, 2024

Conversation

Z4karia
Copy link

@Z4karia Z4karia commented May 31, 2024

Checklist

  • App update process has been followed
  • Target branch is develop
  • Application version has been bumped

Z4karia added 30 commits December 21, 2023 15:46
@Z4karia
updated sdk
88a70af
@Z4karia
angle deposit implementation + tests
cb4af12
@Z4karia
angle withdraw implementation + tests
66e48cc
@Z4karia
lido requestWithdrawal implementation + tests
dcfea80
@Z4karia
lido claimWithdrawals implementation + tests
df9336d
@Z4karia
vic vote implementation + tests
82391d1
@Z4karia
vic resign implementation + tests
5ae9b94
@Z4karia
vic resign update snapshots
54fca20
@Z4karia
vic unvote implementation & tests + update snapshots vic resign
bc575f8
@Z4karia
vic withdraw implementation & tests
c84d338
@Z4karia
lint fix
ffd2fab
@Z4karia
Update DEBUG flag and disable some debug features
bdae726
@Z4karia
Update test snapshots for vic vote
273aa7b
@Z4karia
Add ledger_app.toml configuration file
9da1ea3
@Z4karia
Update token symbol
48906c4
@Z4karia
Update README
c43ba8e
@Z4karia
Merge pull request #19 from blooo-io/feat/LDG-407-tomo-vic-staking-wi…
e0d936e 
…thdraw

Feat/ldg 407 tomo vic staking withdraw
@Z4karia
Update plugin framework
8595014
@Z4karia
Add stax 64px icon
ea38e12
@Z4karia
Merge pull request #20 from blooo-io/refactor/LDG-411update-plugin-fr…
a0a628d 
…amework

Update plugin framework
@Z4karia
docs: add documentation
914eab4
@Z4karia
style: fix lint error
74c7081
@Z4karia
Merge pull request #21 from blooo-io/docs/LDG-412-add-documentation
ed43245 
docs: add documentation
@Z4karia
remove conflicting methods
177f4a3
@Z4karia
update vic snapshots
bc706fc
@Z4karia
removed contracts of conflicting methods from mapping
646124a
@Z4karia
update contract count
8e2a01d
@Z4karia
bump app version
850ab20
@Z4karia
update sdk
de9b121
@Z4karia
update tomochain tests
a5c7f4a
Z4karia and others added 23 commits March 28, 2024 14:16
@Z4karia
synchronize with Ledger changes
d39231f
@Z4karia
remove unused glyphs
718281f
@Z4karia
Merge pull request #22 from blooo-io/remove-conflicting-methods
7e87399 
Remove conflicting methods
@Z4karia
remove unused abis
5a2619b
@Z4karia
Merge pull request #25 from blooo-io/remove-conflicting-methods
d07c467 
remove unused abis
@Z4karia
fix code buffer overflow
e64e4f4
@Z4karia
fix potential null pointer dereferences
8d0dd53
@Z4karia
Merge branch 'develop' into fix/04-04-24-security-
f0b76b0 
audit
@Z4karia
bump app version
f327a9b
@Z4karia
lint fix
5346e78
@Z4karia
fix function definition
e011a53
@Z4karia
fix return type
a92d12e
@Z4karia
Merge pull request #29 from blooo-io/fix/04-04-24-security-audit
2fa3ad1 
Fix/04 04 24 security audit
@Z4karia
fix possible null pointer dereferences
bf8555c
@Z4karia
lint fix
f60f5d3
@Z4karia
Merge pull request #30 from blooo-io/fix/04-04-24-security-2
31528f4 
fix possible null pointer dereferences
@Z4karia
Merge remote-tracking branch 'ledger/develop' into fix/resolve-merge-…
17d08de 
…issue
@Z4karia
update sdk
3626abe
@Z4karia
fix build issues + lint
9b1e707
@Z4karia
ci: recurse submodules when cloning app-eth
18d7af4
@Z4karia
fix function types
845482a
@Z4karia
fix ui function calls
41a43ab
@Z4karia
chore: update app version to 1.2.2
fcb6058
@apaillier-ledger apaillier-ledger merged commit 9d4e49c into LedgerHQ:develop Jun 5, 2024
29 checks passed
@GuilaneDen GuilaneDen deleted the fix/resolve-merge-issue branch January 2, 2025 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apaillier-ledger apaillier-ledger apaillier-ledger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Z4karia @apaillier-ledger