Skip to content

Conversation

myfocus
Copy link
Contributor

@myfocus myfocus commented Apr 3, 2020

No description provided.

myfocus and others added 13 commits March 30, 2020 10:42
…scan-0325

# Conflicts:
#	build/asset-manifest.json
#	build/index.html
#	build/index.html.gz
#	build/precache-manifest.19e4456deda09b3a7ecb3a6bf6170efe.js
#	build/precache-manifest.3485484d597e5b90a1e2805a41829683.js
#	build/service-worker.js
#	build/static/js/1.6010721b.chunk.js
#	build/static/js/74.70bba39e.chunk.js.LICENSE
#	build/static/js/74.b22ea573.chunk.js
#	build/static/js/74.b22ea573.chunk.js.LICENSE
#	build/static/js/74.deb73b8e.chunk.js.LICENSE
#	build/static/js/75.4df979c5.chunk.js
#	build/static/js/75.4df979c5.chunk.js.LICENSE
#	build/static/js/75.4df979c5.chunk.js.gz
#	build/static/js/75.727775ab.chunk.js.LICENSE
#	build/static/js/75.fbfd079b.chunk.js.LICENSE
#	build/static/js/About.1bf6e048.chunk.js
#	build/static/js/About.1bf6e048.chunk.js.gz
#	build/static/js/Account.77a565c3.chunk.js
#	build/static/js/Account.77a565c3.chunk.js.gz
#	build/static/js/Accounts.386a0a6b.chunk.js
#	build/static/js/Accounts.386a0a6b.chunk.js.gz
#	build/static/js/AddSignatureModal.ddd1f16b.chunk.js
#	build/static/js/AddSignatureModal.ddd1f16b.chunk.js.gz
#	build/static/js/Address.43bf0c4a.chunk.js.LICENSE
#	build/static/js/Address.da6b140f.chunk.js.LICENSE
#	build/static/js/Address.deacfd56.chunk.js
#	build/static/js/Address.deacfd56.chunk.js.LICENSE
#	build/static/js/Address.deacfd56.chunk.js.gz
#	build/static/js/BTTSupplyTemp.41792268.chunk.js
#	build/static/js/BTTSupplyTemp.41792268.chunk.js.gz
#	build/static/js/Block.b2fcfd5b.chunk.js
#	build/static/js/Block.b2fcfd5b.chunk.js.gz
#	build/static/js/Blocks.4b7beb25.chunk.js
#	build/static/js/Blocks.4b7beb25.chunk.js.gz
#	build/static/js/Charts.0c86855a.chunk.js
#	build/static/js/Charts.0c86855a.chunk.js.LICENSE
#	build/static/js/Charts.0c86855a.chunk.js.gz
#	build/static/js/Charts.d5c5b182.chunk.js.LICENSE
#	build/static/js/Charts.ff886533.chunk.js.LICENSE
#	build/static/js/Committee.f706da85.chunk.js
#	build/static/js/Committee.f706da85.chunk.js.gz
#	build/static/js/ContractCompiler.b6695c23.chunk.js.LICENSE
#	build/static/js/ContractCompiler.b9577ffc.chunk.js
#	build/static/js/ContractCompiler.b9577ffc.chunk.js.LICENSE
#	build/static/js/ContractCompiler.d79f95f0.chunk.js.LICENSE
#	build/static/js/ContractSourceCode.727177ff.chunk.js
#	build/static/js/ContractSourceCode.727177ff.chunk.js.gz
#	build/static/js/ContractTrans.1cbb0df1.chunk.js
#	build/static/js/ContractTrans.1cbb0df1.chunk.js.gz
#	build/static/js/Contracts.c76e7f98.chunk.js
#	build/static/js/Contracts.c76e7f98.chunk.js.gz
#	build/static/js/CopyrightAsync.36900ebc.chunk.js
#	build/static/js/CopyrightAsync.36900ebc.chunk.js.gz
#	build/static/js/DemoAsync.8bed1857.chunk.js
#	build/static/js/DemoAsync.8bed1857.chunk.js.gz
#	build/static/js/ErrorAsync.d410e31b.chunk.js
#	build/static/js/ErrorAsync.d410e31b.chunk.js.gz
#	build/static/js/Exchange20.3ac25ec2.chunk.js.LICENSE
#	build/static/js/Exchange20.63f3fdbb.chunk.js.LICENSE
#	build/static/js/Exchange20.e5b162bd.chunk.js
#	build/static/js/Exchange20.e5b162bd.chunk.js.LICENSE
#	build/static/js/Exchange20.e5b162bd.chunk.js.gz
#	build/static/js/Exchangetrc.07f56c98.chunk.js.LICENSE
#	build/static/js/Exchangetrc.1ac332b9.chunk.js
#	build/static/js/Exchangetrc.1ac332b9.chunk.js.LICENSE
#	build/static/js/Exchangetrc.1ac332b9.chunk.js.gz
#	build/static/js/Exchangetrc.d22aeaf4.chunk.js.LICENSE
#	build/static/js/FaqAsync.ed7637d9.chunk.js
#	build/static/js/FaqAsync.ed7637d9.chunk.js.gz
#	build/static/js/Foundation.e00ee73a.chunk.js
#	build/static/js/Foundation.e00ee73a.chunk.js.gz
#	build/static/js/Home.6247ffd4.chunk.js.LICENSE
#	build/static/js/Home.8ad19160.chunk.js
#	build/static/js/Home.8ad19160.chunk.js.LICENSE
#	build/static/js/Home.8ad19160.chunk.js.gz
#	build/static/js/Home.d7adaa46.chunk.js.LICENSE
#	build/static/js/LedgerHelp.ef8b6d70.chunk.js
#	build/static/js/LedgerHelp.ef8b6d70.chunk.js.gz
#	build/static/js/Live.1c933a90.chunk.js
#	build/static/js/Live.1c933a90.chunk.js.gz
#	build/static/js/MarketCreate.7a20c9b8.chunk.js
#	build/static/js/MarketCreate.7a20c9b8.chunk.js.LICENSE
#	build/static/js/MarketCreate.ae1e668b.chunk.js.LICENSE
#	build/static/js/MarketCreate.afaa48dc.chunk.js.LICENSE
#	build/static/js/Markets.352069d0.chunk.js.LICENSE
#	build/static/js/Markets.39090fc2.chunk.js
#	build/static/js/Markets.39090fc2.chunk.js.LICENSE
#	build/static/js/Markets.39090fc2.chunk.js.gz
#	build/static/js/Markets.64a365d4.chunk.js.LICENSE
#	build/static/js/MyProposals.b83acff5.chunk.js
#	build/static/js/MyToken.983f017e.chunk.js
#	build/static/js/MyToken.983f017e.chunk.js.gz
#	build/static/js/NodeMap.03a1b179.chunk.js
#	build/static/js/NodeMap.03a1b179.chunk.js.gz
#	build/static/js/NodeTester.99ba07cf.chunk.js
#	build/static/js/NodeTester.99ba07cf.chunk.js.gz
#	build/static/js/Nodes.7b48d669.chunk.js
#	build/static/js/Nodes.7b48d669.chunk.js.gz
#	build/static/js/Notice.11da577e.chunk.js
#	build/static/js/Notice.11da577e.chunk.js.gz
#	build/static/js/ParticipateProposals.d70c67c3.chunk.js
#	build/static/js/ParticipateProposals.d70c67c3.chunk.js.gz
#	build/static/js/ProposalDetail.9ebc2cae.chunk.js
#	build/static/js/ProposalDetail.9ebc2cae.chunk.js.gz
#	build/static/js/Proposals.717d1b0c.chunk.js
#	build/static/js/Proposals.717d1b0c.chunk.js.gz
#	build/static/js/ProposalsCreate.18b1dc86.chunk.js.LICENSE
#	build/static/js/ProposalsCreate.8ae69471.chunk.js.LICENSE
#	build/static/js/ProposalsCreate.b77a877d.chunk.js
#	build/static/js/ProposalsCreate.b77a877d.chunk.js.LICENSE
#	build/static/js/Recaptcha.3b67ffb7.chunk.js
#	build/static/js/Recaptcha.3b67ffb7.chunk.js.gz
#	build/static/js/Representative.d406c4e4.chunk.js
#	build/static/js/Representative.d406c4e4.chunk.js.gz
#	build/static/js/Representatives.d5fd8dfe.chunk.js
#	build/static/js/Representatives.d5fd8dfe.chunk.js.gz
#	build/static/js/SingleStats.ada176fd.chunk.js.LICENSE
#	build/static/js/SingleStats.b2ed218a.chunk.js.LICENSE
#	build/static/js/SingleStats.b7232d57.chunk.js
#	build/static/js/SingleStats.b7232d57.chunk.js.LICENSE
#	build/static/js/SingleStats.b7232d57.chunk.js.gz
#	build/static/js/SmartContract.56124728.chunk.js.LICENSE
#	build/static/js/SmartContract.92ead0fc.chunk.js
#	build/static/js/SmartContract.92ead0fc.chunk.js.LICENSE
#	build/static/js/SmartContract.e3272fea.chunk.js.LICENSE
#	build/static/js/Stats.348ca4a1.chunk.js
#	build/static/js/Stats.348ca4a1.chunk.js.gz
#	build/static/js/System.a59fdbf7.chunk.js
#	build/static/js/System.a59fdbf7.chunk.js.gz
#	build/static/js/TRONRating.fe934081.chunk.js
#	build/static/js/TRONRating.fe934081.chunk.js.gz
#	build/static/js/Token20Detail.319e446c.chunk.js
#	build/static/js/Token20Detail.319e446c.chunk.js.LICENSE
#	build/static/js/Token20Detail.62349e9f.chunk.js.LICENSE
#	build/static/js/Token20Detail.ec8a7bee.chunk.js.LICENSE
#	build/static/js/TokenDetail.01912bf1.chunk.js.LICENSE
#	build/static/js/TokenDetail.3d4a2a0d.chunk.js
#	build/static/js/TokenDetail.3d4a2a0d.chunk.js.LICENSE
#	build/static/js/TokenDetail.3d4a2a0d.chunk.js.gz
#	build/static/js/TokenDetail.498ae2c1.chunk.js.LICENSE
#	build/static/js/TokenList.b69c521a.chunk.js
#	build/static/js/TokenList.b69c521a.chunk.js.gz
#	build/static/js/TokenListAll.d53ee7d0.chunk.js
#	build/static/js/TokenListAll.d53ee7d0.chunk.js.gz
#	build/static/js/TokenListTRC20.890e2676.chunk.js
#	build/static/js/TokenListTRC20.890e2676.chunk.js.gz
#	build/static/js/TokenOverview.8dcafbc8.chunk.js
#	build/static/js/TokenOverview.8dcafbc8.chunk.js.gz
#	build/static/js/TokensCreate.4d456f3c.chunk.js.LICENSE
#	build/static/js/TokensCreate.b6e3f487.chunk.js.LICENSE
#	build/static/js/TokensCreate.b88f4e4a.chunk.js
#	build/static/js/TokensCreate.b88f4e4a.chunk.js.LICENSE
#	build/static/js/Transaction.01f906c2.chunk.js
#	build/static/js/TransactionViewer.77c808b0.chunk.js
#	build/static/js/TransactionViewer.77c808b0.chunk.js.gz
#	build/static/js/Transactions.8c80dd41.chunk.js
#	build/static/js/Transactions.8c80dd41.chunk.js.gz
#	build/static/js/Transfers.6e705305.chunk.js
#	build/static/js/Transfers.6e705305.chunk.js.gz
#	build/static/js/TronConvertTool.29bfe6f9.chunk.js
#	build/static/js/TronConvertTool.29bfe6f9.chunk.js.gz
#	build/static/js/VerifyContractCode.1f70d105.chunk.js.LICENSE
#	build/static/js/VerifyContractCode.49c409ec.chunk.js.LICENSE
#	build/static/js/VerifyContractCode.cfef46ac.chunk.js.LICENSE
#	build/static/js/VoteLive.fa620ded.chunk.js
#	build/static/js/VoteLive.fa620ded.chunk.js.gz
#	build/static/js/VoteOverview.f313da50.chunk.js
#	build/static/js/VoteOverview.f313da50.chunk.js.gz
#	build/static/js/WalletWizard.c6b490ea.chunk.js
#	build/static/js/WalletWizard.c6b490ea.chunk.js.gz
#	build/static/js/domloadsh.37d6f608.chunk.js
#	build/static/js/domloadsh.37d6f608.chunk.js.LICENSE
#	build/static/js/domloadsh.37d6f608.chunk.js.gz
#	build/static/js/domloadsh.a1c23a6b.chunk.js.LICENSE
#	build/static/js/domloadsh.e23aca72.chunk.js.LICENSE
#	build/static/js/main.bf7611d5.chunk.js
#	build/static/js/runtime~main.f3ca4544.js
#	config/env.js
#	src/constants.js
#	yarn.lock
Support Ledger to initiate proposals and vote on proposals
@bbsyaya bbsyaya merged commit 178266e into master Apr 3, 2020
@myfocus myfocus changed the title Support Ledger to initiate proposals and vote on proposals Support Ledger to initiate proposals and vote proposals Apr 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants