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: Receive funds to implicit account address #8260

Merged
merged 23 commits into from
Mar 28, 2024
Merged

fix: Receive funds to implicit account address #8260

merged 23 commits into from
Mar 28, 2024

Commits on Mar 22, 2024

  1. feat: Sync SDK types

    @marc2332
    marc2332 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    e73bd56 View commit details
    Browse the repository at this point in the history

  2. feat: stop generating txs out of outputs

    @marc2332
    marc2332 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    4d28457 View commit details
    Browse the repository at this point in the history

  3. fix: tx history: include account output in average txs

    @cpl121
    cpl121 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    71f88e7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop-iota2.0' into feat/sync-sdk-types

    @cpl121
    cpl121 authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    eb19a90 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feat/sync-sdk-types' into feat/stop-generating-txs-out-… 

    …of-outputs
    @cpl121
    cpl121 authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    a850bb8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feat/stop-generating-txs-out-of-outputs' into fix/tx-hi… 

    …story-include-account-output-in-avg-txs
    @cpl121
    cpl121 authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    3cedefe View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. fix: Fix incorrect timestamp in Incoming txs

    @marc2332
    marc2332 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    e499fa4 View commit details
    Browse the repository at this point in the history

  2. fix: Receive funds to implicit account address

    @marc2332
    marc2332 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    4098672 View commit details
    Browse the repository at this point in the history

  3. Merge branches 'fix/tx-history-include-account-output-in-avg-txs' and… 

    … 'develop-iota2.0' of github.com:iotaledger/firefly into fix/tx-history-include-account-output-in-avg-txs
    @cpl121
    cpl121 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    07cf0a4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop-iota2.0' into fix/tx-history-include-account-ou… 

    …tput-in-avg-txs
    @cpl121
    cpl121 authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    c3f486e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'fix/tx-history-include-account-output-in-avg-txs' into … 

    …fix/incorrect-timestamp-incoming-txs
    @cpl121
    cpl121 authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    a501aa2 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'fix/incorrect-timestamp-incoming-txs' into fix/receive-… 

    …funds-to-implicit-account-address
    @cpl121
    cpl121 authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    ea52b1c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop-iota2.0' into fix/tx-history-include-account-ou… 

    …tput-in-avg-txs
    @cpl121
    cpl121 authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    de89392 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'fix/tx-history-include-account-output-in-avg-txs' into … 

    …fix/incorrect-timestamp-incoming-txs
    @cpl121
    cpl121 authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    278543c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'fix/incorrect-timestamp-incoming-txs' into fix/receive-… 

    …funds-to-implicit-account-address
    @cpl121
    cpl121 authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    f3f4e32 View commit details
    Browse the repository at this point in the history

  10. Merge branches 'fix/incorrect-timestamp-incoming-txs' and 'develop-io… 

    …ta2.0' of github.com:iotaledger/firefly into fix/incorrect-timestamp-incoming-txs
    @cpl121
    cpl121 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    e07821c View commit details
    Browse the repository at this point in the history

  11. Merge branch 'fix/incorrect-timestamp-incoming-txs' into fix/receive-… 

    …funds-to-implicit-account-address
    @cpl121
    cpl121 authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    c1d22a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Merge branch 'develop-iota2.0' into fix/incorrect-timestamp-incoming-txs

    @cpl121
    cpl121 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    541013a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix/incorrect-timestamp-incoming-txs' into fix/receive-… 

    …funds-to-implicit-account-address
    @cpl121
    cpl121 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    8d3126b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop-iota2.0' into fix/receive-funds-to-implicit-acc… 

    …ount-address
    @cpl121
    cpl121 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    b2ecdce View commit details
    Browse the repository at this point in the history

  4. feat: add mana to txs in tx activities and activity details (#8263) 

    Co-authored-by: Marc Espin <[email protected]>
Co-authored-by: Begoña Álvarez de la Cruz <[email protected]>
    @cpl121 @marc2332 @begonaalvarezd
    3 people authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    e9e832b View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Revert "feat: add mana to txs in tx activities and activity details (#… 

    …8263)" (#8277)

This reverts commit e9e832b.
    @marc2332
    marc2332 authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    a067fc1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop-iota2.0' into fix/receive-funds-to-implicit-acc… 

    …ount-address
    @begonaalvarezd
    begonaalvarezd authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    3fa985c View commit details
    Browse the repository at this point in the history