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

Resolve conflicts between testnet and develop branches #1325

Merged
merged 13 commits into from
Jul 3, 2023
Merged

Resolve conflicts between testnet and develop branches #1325

merged 13 commits into from
Jul 3, 2023

Commits on Jun 9, 2023

  1. Deploy to testnet (#1291) 

    Co-authored-by: Miles Zhang <[email protected]>
Co-authored-by: Chen Yu <[email protected]>
Co-authored-by: iamyates <[email protected]>
Co-authored-by: ShiningRay <[email protected]>
Co-authored-by: 代码之力 <[email protected]>
Co-authored-by: NanZhang <[email protected]>
fix memory leak in udt transaction count (#1302)
fix: update cota sync data (#1303)
fix: rectify the cout error in the progress bar (#1304)
    @github-actions @zmcNotafraid
    @Keith-CY @iamyates @ShiningRay @rabbitz
    7 people authored Jun 9, 2023
    Configuration menu
    Copy the full SHA
    9a5dad8 View commit details
    Browse the repository at this point in the history

  2. add tx_committed filter for transaction list

    @ShiningRay
    ShiningRay committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    dd0f77d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1306 from ShiningRay/fix/tx_committed_filter 

    add tx_committed filter for transaction list
    @ShiningRay
    ShiningRay authored Jun 9, 2023
    Configuration menu
    Copy the full SHA
    8b76cc7 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2023

  1. Optimize block query performance (#1307)

    @ShiningRay
    ShiningRay authored Jun 11, 2023
    Configuration menu
    Copy the full SHA
    e4dad7c View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. fix: cell output cota info

    @rabbitz
    rabbitz committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    d0d160d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1312 from rabbitz/hotfix/cell_output_cota_info 

    fix: cell output cota info
    @rabbitz
    rabbitz authored Jun 13, 2023
    Configuration menu
    Copy the full SHA
    4f7b852 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2023

  1. remove duplicated ckb transactions

    @ShiningRay
    ShiningRay committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    89cfe25 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1316 from ShiningRay/fix/dup_pending_tx 

    Fix transaction is always shown as pending
    @Keith-CY
    Keith-CY authored Jun 18, 2023
    Configuration menu
    Copy the full SHA
    7c8b7b7 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. fix: block transactions sort order by id asc

    @rabbitz
    rabbitz committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    e56a8e1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1317 from rabbitz/fix/block_transactions_default_… 

    …sort

fix: block transactions sort order by id asc
    @rabbitz
    rabbitz authored Jun 19, 2023
    Configuration menu
    Copy the full SHA
    480824a View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Merge branch 'testnet' into resolve-conflicts

    @Keith-CY
    Keith-CY committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    ca06d56 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into resolve-conflicts

    @Keith-CY
    Keith-CY committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    6677b6c View commit details
    Browse the repository at this point in the history

  3. Update app/models/cell_output.rb

    @Keith-CY
    Keith-CY authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    0558b78 View commit details
    Browse the repository at this point in the history