Dev#5

Merged

zhaohong merged 178 commits intomasterfrom

Mar 22, 2018

Commits on Mar 19, 2018

add timestamp to transaction protocol.
zhaohong
committed
add method
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
Merge branch 'dev' of https://github.com/tronprotocol/wallet-cli into dev
yangchang
committed
add method
yangchang
committed
add method
yangchang
committed
add method
yangchang
committed
modify computeAddress
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
add setTimestap
zergweak
committed
password is base64 String
zergweak
committed
feature: add api and contract.
CodeNinjaEvan
committed
Merge pull request #7 from tronprotocol/feature/add_api
sasaxie
authored
add discover message
sasaxie
committed

Commits on Mar 20, 2018

Commits on Mar 21, 2018

merage api.proto
zergweak
committed
modify ParticipateAssetIssue
zergweak
committed
add js getSignedTransactionHexString method and update proto
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
Merge branch 'dev' of https://github.com/tronprotocol/wallet-cli into dev
xiechang33
committed
add change getBalance to GetAcconts.
CodeNinjaEvan
committed
add queryAccount
zergweak
committed
add js getSignedTransactionHexString method and update proto
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
remove
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
Merge pull request #14 from tronprotocol/feature/add_api
CodeNinjaEvan
authored
remove useless method
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
change getBalance to getAccount
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
remove useless method
yangchang
committed
transfer method
xiechang33
committed
transfer method
xiechang33
committed
Merge remote-tracking branch 'origin/dev' into dev
xiechang33
committed
remove useless method
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
remove useless method
yangchang
committed
remove useless method
yangchang
committed
add catch exception
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
remove useless method
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
remove useless method
yangchang
committed
transfer method
xiechang33
committed
Merge remote-tracking branch 'origin/dev' into dev
xiechang33
committed
update queryAccount
renchengchang
committed
remove useless method
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
remove useless method
yangchang
committed
remove useless method
yangchang
committed
transfer method
xiechang33
committed
transfer method
xiechang33
committed
move p2p message
sasaxie
committed
fix some bug
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
add GetAssetIssueByAccount.
CodeNinjaEvan
committed
remove useless method
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
rm ParticipateAssetIssueController.java
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
merage proto
zergweak
committed
Merge pull request #15 from tronprotocol/feature/add_api
CodeNinjaEvan
authored
merage api.proto
zergweak
committed
add getAssetIssueByAccount
zergweak
committed
remove useless method
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
remove useless method
yangchang
committed
update createVoteWitnessToView from
renchengchang
committed
feature: add web folder Static.
CodeNinjaEvan
committed
Merge remote-tracking branch 'origin/dev' into dev
CodeNinjaEvan
committed
feature: add web project.
CodeNinjaEvan
committed
feature: add tron-protoc.js.
CodeNinjaEvan
committed
remove useless method
yangchang
committed
add README
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
modify instructions for command
zergweak
committed
modify instructions for command
zergweak
committed

Commits on Mar 22, 2018

修改web目录
徐文杰
committed
remove useless method
yangchang
committed
update VoteWitnessController
renchengchang
committed
merge
徐文杰
committed
Merge branch 'dev' of https://github.com/tronprotocol/wallet-cli into dev
yangchang
committed
remove useless method
yangchang
committed
adjust dir
renchengchang
committed
remove useless method
yangchang
committed
目录结构修改
徐文杰
committed
adjust css path
renchengchang
committed
modify css and js path
renchengchang
committed
remove useless method
yangchang
committed
remove useless method
yangchang
committed
modify build.gradle
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
adjust css and js path
renchengchang
committed
remove useless method
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
remove useless method
yangchang
committed
modify Prompt for command
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
modify crypto.js 00 change to 0
zergweak
committed
remove base64Decode and base64Encode
zergweak
committed
remove useless method and javascript
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
解决冲突
徐文杰
committed
remove useless method and javascript
yangchang
committed
Merge branch 'dev' of https://github.com/tronprotocol/wallet-cli into dev
徐文杰
committed
remove useless method and javascript
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
update count.html
renchengchang
committed
update count.html
renchengchang
committed
remove useless method and javascript
yangchang
committed
Merge remote-tracking branch 'origin/dev' into dev
yangchang
committed
remove useless method and javascript
yangchang
committed
merage
zergweak
committed
Merge remote-tracking branch 'origin/dev' into dev
zergweak
committed
Update README.md
zergweak
authored
Update README.md
zergweak
authored
Update README.md
zergweak
authored
change pages
allbycode
committed
add codes
allbycode
committed
fix
allbycode
committed