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.

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

Push code from develop to master #652

Merged
merged 505 commits into from
Nov 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
505 commits
Select commit Hold shift + click to select a range
3bf066e
finish gov cli
MrXJC Nov 9, 2018
45d1333
IRISHUB-687: iservice to service
chengwenxi Nov 9, 2018
76b9b1a
finish gov rest
MrXJC Nov 9, 2018
6958181
fix iservice for v0.26
chengwenxi Nov 9, 2018
6bae59d
Merge pull request #550 from chengwenxi/feature/deps-0.26.0
Nov 9, 2018
0a3f4c9
Pass compiler
Nov 9, 2018
efb3916
runable iris prototype
Nov 9, 2018
37423c9
Fix default genesis state for stake and slashing
Nov 9, 2018
e26f565
Update cosmos-sdk dependency
Nov 9, 2018
2e01b67
Merge pull request #552 from HaoyangLiu/feature/deps-0.26.0
Nov 9, 2018
09b8663
fix stake cli
MrXJC Nov 9, 2018
94c6dc9
Add prefix define for all binary
Nov 9, 2018
13ceb5b
Merge pull request #554 from HaoyangLiu/feature/deps-0.26.0
Nov 9, 2018
0f671b9
finish stake.go slashing.go distribution.go
MrXJC Nov 9, 2018
39e368b
Merge branch 'feature/deps-0.26.0' of https://github.com/irisnet/iris…
MrXJC Nov 9, 2018
4ae58bc
fix the upgrade and iservice cli
MrXJC Nov 9, 2018
cecfa18
Merge pull request #555 from MrXJC/jiacheng/deps2
Nov 9, 2018
eb05a9c
Fix all rest api
MrXJC Nov 9, 2018
3354164
Merge pull request #557 from MrXJC/jiacheng/deps2
Nov 9, 2018
a63890d
IRISHUB-693: Add key subcommand mnemonic and new
MrXJC Nov 9, 2018
6b364b4
IRISHUB-699: fix binding update check
chengwenxi Nov 9, 2018
00f5e1f
Refactor docs
zhangyelong Nov 11, 2018
c211e8e
Move keys docs to cli-client
zhangyelong Nov 11, 2018
0f203d6
Merge pull request #560 from zhangyelong/feature/docs
zhangyelong Nov 11, 2018
8bd01e8
Merge pull request #561 from irisnet/feature/deps-0.26.0
Nov 11, 2018
b032474
IRISHUB-699: refactor service
chengwenxi Nov 12, 2018
8d511b4
Merge pull request #559 from MrXJC/jiacheng/deps2
Nov 12, 2018
2c74a3a
IRISHUB-702: fix testnet issue and refactor mnemonic.go and new.go
Nov 12, 2018
4b2a6e4
Change common.go to utils.go
Nov 12, 2018
9a9bc53
Merge pull request #572 from HaoyangLiu/feature/deps-0.26.0
Nov 12, 2018
f084186
IRISHUB-699: update user guide
chengwenxi Nov 12, 2018
5c27c0f
Refactor keys modules, add seed and recover rest api, keep consistent…
Nov 12, 2018
b094543
Refactor tendermint api, remove hard code http error code
Nov 12, 2018
9f45023
IRISHUB-699: Add service name check
chengwenxi Nov 12, 2018
e8b39ec
Refactor keys api and normalize rest response
Nov 12, 2018
fb3dd77
Add chain-id option for testnet
Nov 12, 2018
202ce1d
IRISHUB-688: fix simulation breaks when deps sdk v0.26.0
Nov 12, 2018
acdbca7
Merge pull request #574 from HaoyangLiu/feature/deps-0.26.0
Nov 12, 2018
be7e511
Merge pull request #575 from kaifei-bianjie/feature/deps-0.26.0
Nov 12, 2018
e9033a1
IRISHUB-689: fix monitor breaks when deps sdk v0.26.0
Nov 12, 2018
c9d97f2
IRISHUB-699: code clean
chengwenxi Nov 12, 2018
fd7fcb5
IRISHUB-689: build and install irismon
Nov 12, 2018
c3ac56f
fix the cli_test except for distribution and upgrade
MrXJC Nov 12, 2018
69643a3
Merge branch 'feature/deps-0.26.0' of https://github.com/irisnet/iris…
MrXJC Nov 12, 2018
4e3c9cc
Merge pull request #576 from kaifei-bianjie/feature/deps-0.26.0
Nov 13, 2018
6131f23
Merge pull request #578 from MrXJC/jiacheng/deps2
Nov 13, 2018
4f8059f
Fix distribution cli test
Nov 13, 2018
7542c1f
Fix the upgrade examples
MrXJC Nov 13, 2018
c5a25ad
IRISHUB-699: fix enable err msg
chengwenxi Nov 13, 2018
115a104
Merge pull request #579 from HaoyangLiu/feature/deps-0.26.0
Nov 13, 2018
f5c2843
Merge pull request #580 from irisnet/feature/deps-0.26.0
Nov 13, 2018
6bc1db7
IRISHUB-699: fix command service bind example
chengwenxi Nov 13, 2018
b3413c4
Add testnet_start and testnet_stop in makefile to help start multi-no…
Nov 13, 2018
1ba4301
Merge pull request #581 from HaoyangLiu/feature/deps-0.26.0
Nov 13, 2018
64dd0a6
Merge pull request #582 from irisnet/feature/deps-0.26.0
Nov 13, 2018
4f2c7d6
fix the upgrade cli_test
MrXJC Nov 13, 2018
911a933
Merge pull request #583 from MrXJC/jiacheng/deps2
Nov 13, 2018
99bb5b1
Merge pull request #584 from irisnet/feature/deps-0.26.0
Nov 13, 2018
c20d1c9
Set the maximum of the participation
MrXJC Nov 13, 2018
23728bc
update sdk to v0.26
chengwenxi Nov 13, 2018
9ca3d68
Fix bug in mac OS
Nov 13, 2018
047bc19
Merge pull request #586 from HaoyangLiu/feature/deps-0.26.0
Nov 13, 2018
170aeda
merge with branch `develop`
chengwenxi Nov 13, 2018
f89cf60
Merge pull request #587 from chengwenxi/feature/iservice
Nov 13, 2018
43af10f
make the participation can be changed
MrXJC Nov 13, 2018
e8a7f58
go fmt
MrXJC Nov 13, 2018
69ce8f5
Merge pull request #585 from MrXJC/jiacheng/deps2
Nov 13, 2018
2c9b040
Add Faucet account
Nov 13, 2018
a23349b
Merge pull request #590 from HaoyangLiu/feature/deps-0.26.0
Nov 13, 2018
e83dff5
Merge pull request #591 from irisnet/feature/deps-0.26.0
Nov 13, 2018
9d7788b
fix the upgrade unit_test
MrXJC Nov 13, 2018
c53b824
Update English doc for record module
yunkunrao Nov 13, 2018
ad55c23
Merge pull request #592 from MrXJC/jiacheng/deps2
Nov 13, 2018
97c9dae
IRISHUB-654:Change proposalID to proposal-id
MrXJC Nov 13, 2018
d0c865e
Refresh English doc for record module
yunkunrao Nov 13, 2018
3bb5c28
Fix replay issue
Nov 13, 2018
6722440
Add replay log
Nov 14, 2018
80946d1
move irisapp.replay to Replay
MrXJC Nov 14, 2018
d36178e
Merge pull request #10 from MrXJC/jiacheng/develop
Nov 14, 2018
8321fe9
Go fmt file
Nov 14, 2018
eb92b33
Merge pull request #596 from HaoyangLiu/develop
Nov 14, 2018
ac8d239
Merge pull request #598 from MrXJC/jiacheng/deps2
Nov 14, 2018
29b0298
Merge pull request #593 from wancloud-cosmos/yunkun-docs
Nov 14, 2018
8bbcbad
CI Test
zhangyelong Nov 14, 2018
45aa847
DEVOPS-281 CI Test
zhangyelong Nov 14, 2018
2103293
IRISHUB-713: fix irisdebug for sdk0.26
chengwenxi Nov 14, 2018
326f26b
Merge pull request #600 from chengwenxi/develop
Nov 14, 2018
9219ff3
IRISHUB-697: return error when coin amount is invalid
Nov 14, 2018
ef4a5e5
Merge pull request #601 from HaoyangLiu/develop
Nov 14, 2018
ca8e408
IRISHUB-696: fix bugs in variable to string
Nov 14, 2018
cdd4465
Remove json in reponse http
Nov 14, 2018
69aa314
Change reponse to json pattern
Nov 14, 2018
fd8bda3
Change statue to syncing
Nov 14, 2018
3f5e916
Merge pull request #602 from HaoyangLiu/develop
Nov 14, 2018
f0af61f
move irisapp.replay to Replay
MrXJC Nov 14, 2018
5920db4
Merge branch 'develop' of https://github.com/irisnet/irishub into jia…
MrXJC Nov 14, 2018
887c8a1
Merge pull request #604 from MrXJC/jiacheng/develop
Nov 14, 2018
cfa71df
IRISHUB-601: print new line
Nov 14, 2018
a439330
IRISHUB-605: add example command
Nov 14, 2018
991cb04
correct spell error: depositer to depositor
Nov 14, 2018
deda227
Rename docs/modules/record -> docs/cli-client/record
yunkunrao Nov 14, 2018
8ff75d6
Merge pull request #606 from HaoyangLiu/develop
Nov 14, 2018
1a4e510
Update Chinese doc for record module
yunkunrao Nov 14, 2018
d772a1d
Recover docs/modules/record/README.md
yunkunrao Nov 14, 2018
f1bce19
Merge branch 'origin/feature/docs' into yunkun-docs
yunkunrao Nov 14, 2018
4f3e24a
IRISHUB-676:doc of IRIS Monitor
Nov 15, 2018
f55a660
Update record doc
yunkunrao Nov 15, 2018
dfa4932
Separate the upgrade cli_test from cli_test
MrXJC Nov 15, 2018
ae8129e
Merge branch 'develop' of https://github.com/irisnet/irishub into jia…
MrXJC Nov 15, 2018
2f270c3
Merge pull request #610 from MrXJC/jiacheng/develop
Nov 15, 2018
0ff0102
IRISHUB-676:doc of IRIS Monitor
Nov 15, 2018
3cdad78
IRISHUB-676:update doc of IRIS Monitor
Nov 15, 2018
f01b97d
IRISHUB-676:update doc of IRIS Monitor again
Nov 15, 2018
0a02fcc
Fix missing clictx init for request
Nov 15, 2018
6ee29bb
Merge pull request #611 from HaoyangLiu/develop
Nov 15, 2018
763b609
Update docs/modules/record/README.md
yunkunrao Nov 15, 2018
2996ec1
Refactor the irisnet docs
MrXJC Nov 15, 2018
1473e9f
Merge pull request #607 from wancloud-cosmos/yunkun-docs
Nov 15, 2018
53067b8
Merge branch 'feature/docs' of https://github.com/irisnet/irishub int…
MrXJC Nov 15, 2018
9d9a570
Move modules/record to Features/record
MrXJC Nov 15, 2018
cea77e6
fix service param write in genesis.json
chengwenxi Nov 15, 2018
e556cfe
fix swagger
chengwenxi Nov 15, 2018
e547ec0
Merge pull request #613 from chengwenxi/develop
Nov 15, 2018
f097e72
Refactor irisnet docs -zh
MrXJC Nov 15, 2018
a3d0ef3
Merge pull request #612 from MrXJC/jiacheng/docs
Nov 15, 2018
d26b3e6
Add docs for distribution and mint
Nov 15, 2018
91fa473
WIP : Add English stake doc
yunkunrao Nov 15, 2018
d39b366
Merge branch 'feature/docs' of https://github.com/irisnet/irishub int…
Nov 15, 2018
d0990c0
revert config.js
Nov 15, 2018
20f00aa
Merge pull request #609 from kaifei-bianjie/feature/docs
Nov 15, 2018
881b04a
Fix the participation bug
MrXJC Nov 15, 2018
e72cff7
Merge pull request #618 from MrXJC/jiacheng/develop
Nov 15, 2018
d5e6495
Add lcd docs
Nov 15, 2018
eec8006
Add miss api broadcast and add page&size for tx search
Nov 15, 2018
745ce3c
keys module docs
trevorfu Nov 15, 2018
f0cefe1
gov module docs
trevorfu Nov 15, 2018
ff13a21
Merge pull request #619 from HaoyangLiu/develop
Nov 15, 2018
d148031
Fix the system voting power bug
MrXJC Nov 16, 2018
fa66fd1
Merge branch 'develop' of https://github.com/irisnet/irishub into jia…
MrXJC Nov 16, 2018
c08b23a
Fix the tx_search bug
MrXJC Nov 16, 2018
07cb064
keys module docs
trevorfu Nov 16, 2018
a403727
IDEA conf ignore
trevorfu Nov 16, 2018
f3cd48a
Fix the bank lcd bug
MrXJC Nov 16, 2018
cc65133
removed intro dirs
Nov 16, 2018
7c09bed
Update irislcd docs
Nov 16, 2018
be88800
Merge pull request #622 from MrXJC/jiacheng/develop
Nov 16, 2018
a5a7bde
Add English doc for stake module.
yunkunrao Nov 16, 2018
a8a855b
Merge branch 'origin/feature/docs' into yunkun-docs
yunkunrao Nov 16, 2018
dc03e27
gov module docs
trevorfu Nov 16, 2018
56f4613
Move software/basic_concepts to features
MrXJC Nov 16, 2018
32757ba
Move software/basic_concepts to features -zh
MrXJC Nov 16, 2018
7cd04ba
Merge pull request #624 from MrXJC/jiacheng/docs
Nov 16, 2018
d0b9dd6
gov module docs - about deposit
trevorfu Nov 16, 2018
5938c17
Add distribution feature docs
Nov 16, 2018
079fb57
gov module docs - about votes
trevorfu Nov 16, 2018
277c7be
Update English stake docs
yunkunrao Nov 16, 2018
d3c7746
Add Chinese docs for distribution
Nov 16, 2018
966fb21
Add doc for status subcmd
yunkunrao Nov 16, 2018
a849538
gov module docs - about votes
trevorfu Nov 16, 2018
e23a3e3
Add Chinese docs for lcd
Nov 16, 2018
f5644bf
Fix bug in swagger.yaml, response schema doesn't match
Nov 16, 2018
ac85574
Fix bug in query gov params
Nov 16, 2018
3e757b0
Update description of --help
zhangyelong Nov 16, 2018
f809cb4
Update description of --help
zhangyelong Nov 16, 2018
ee2aec4
updated version
harrietcao Nov 16, 2018
31a8c27
Update description of --help
zhangyelong Nov 16, 2018
c363a52
Update description of --help
zhangyelong Nov 16, 2018
4a781a4
updated with new version
harrietcao Nov 16, 2018
4d85687
Update description of --help
zhangyelong Nov 16, 2018
e9e5875
Update description of --help
zhangyelong Nov 16, 2018
9229bdc
Merge pull request #620 from trevorfu/docs_keys
zhangyelong Nov 16, 2018
e67fb31
add tag verification for tx search
Nov 16, 2018
63ed12f
IRISHUB-679:Add resources & get started
kidinamoto01 Nov 16, 2018
58a4d77
IRISHUB-679:Add resources & get started
kidinamoto01 Nov 16, 2018
1011bb9
IRISHUB-679:Add resources & get started
kidinamoto01 Nov 16, 2018
f60ad17
add chinese gov docs
trevorfu Nov 16, 2018
0076674
delete the ibc module
MrXJC Nov 16, 2018
8b1f28b
fix the ibc.mapper
MrXJC Nov 16, 2018
1f54349
Merge pull request #629 from MrXJC/jiacheng/develop
Nov 16, 2018
4569500
Merge pull request #626 from HaoyangLiu/develop
Nov 16, 2018
9a96d2d
IRISHUB-677: client doc of service
chengwenxi Nov 16, 2018
311a960
Add new password length checking
Nov 16, 2018
637267b
Merge pull request #630 from HaoyangLiu/develop
Nov 16, 2018
fed2248
add chinese gov docs
trevorfu Nov 16, 2018
70a4e08
Merge remote-tracking branch 'origin/docs_keys' into docs_keys
trevorfu Nov 16, 2018
b5af11c
fix gov doc's problem commented by yelong
trevorfu Nov 16, 2018
e6fb8cf
fix keys doc's problem commented by yelong
trevorfu Nov 16, 2018
2cc7f6f
Update stake English docs
yunkunrao Nov 16, 2018
16fa61d
Add stake Chinese docs
yunkunrao Nov 16, 2018
4f58829
Merge branch 'origin/feature/docs' into yunkun-docs
yunkunrao Nov 16, 2018
8a0516c
modify chinese description
trevorfu Nov 16, 2018
48b0237
modify chinese description
trevorfu Nov 16, 2018
a58faee
Merge pull request #621 from trevorfu/docs_gov
zhangyelong Nov 16, 2018
7887b26
Merge pull request #631 from trevorfu/docs_keys
zhangyelong Nov 16, 2018
c016ff5
Merge pull request #627 from chengwenxi/feature/docs
zhangyelong Nov 16, 2018
a763e93
add chinese docs for lcd and mint
Nov 16, 2018
45d725f
Add chinese docs for distribution
Nov 16, 2018
d50b249
Finish the upgrade EN
MrXJC Nov 16, 2018
4e23e40
Finish the upgrade ZH
MrXJC Nov 16, 2018
900c077
Finish the Feature/gov
MrXJC Nov 16, 2018
77ae0cb
Finish the Bech32
MrXJC Nov 16, 2018
c9f75a0
Finish the genesis
MrXJC Nov 16, 2018
86b1627
Finish the gov params
MrXJC Nov 16, 2018
bbc9696
Finish the Bech32 EN
MrXJC Nov 16, 2018
938a356
Merge pull request #616 from wancloud-cosmos/yunkun-docs
Nov 17, 2018
65db7b8
Merge pull request #625 from wancloud-cosmos/yunkun-docs-status
Nov 17, 2018
75cdf3a
Merge pull request #615 from HaoyangLiu/haoyang/docs
Nov 17, 2018
26e2cc7
Move all global flags to cli-client/README.md, and refactor stake and…
Nov 17, 2018
008f43a
Refactor Chinese docs for distribution
Nov 17, 2018
f0ddfe3
Reactor Chinese docs for stake
Nov 17, 2018
6b53911
Improve docs for distribution cli-client
Nov 17, 2018
8cddde9
Correct some spell error and grammar error
Nov 17, 2018
6f0ba71
Merge pull request #633 from HaoyangLiu/haoyang/docs
Nov 17, 2018
74c7ec4
Correct spell error depositer to depositor
Nov 17, 2018
c789514
IRISHUB-677: update doc of service feature
chengwenxi Nov 17, 2018
7a3bdad
Merge remote-tracking branch 'upstream/feature/docs' into feature/docs
chengwenxi Nov 17, 2018
fab31a2
Merge with develop
Nov 17, 2018
525adaa
Merge pull request #635 from HaoyangLiu/haoyang/docs
Nov 17, 2018
3b2ffe3
IRISHUB-677: remove global flags
chengwenxi Nov 17, 2018
9212c72
Merge pull request #634 from chengwenxi/feature/docs
Nov 17, 2018
d38f6b4
Merge pull request #636 from HaoyangLiu/haoyang/docs-develop
Nov 17, 2018
97cd807
Merge pull request #628 from kidinamoto01/feature/docs
Nov 17, 2018
080f5cf
Refactor docs for stake query interface
Nov 17, 2018
97f6769
Merge pull request #637 from HaoyangLiu/haoyang/docs
Nov 17, 2018
5ed67c9
Finish the features/gov ZH
MrXJC Nov 17, 2018
ac6106f
Update description begin with a capital letter
zhangyelong Nov 17, 2018
8a6cc71
Merge pull request #643 from irisnet/zhangyelong-patch-1
zhangyelong Nov 17, 2018
d8fb16c
Update description begin with a capital letter
zhangyelong Nov 17, 2018
5a0e405
Update cosmos and tendermint dependency from branch to tag
Nov 17, 2018
80ef237
Merge pull request #644 from HaoyangLiu/develop
Nov 17, 2018
7ea9a98
Fix some problems
trevorfu Nov 17, 2018
24e5a10
Merge branch 'feature/docs' of https://github.com/irisnet/irishub int…
MrXJC Nov 17, 2018
531dc3d
Complete the cli-client readme.md
MrXJC Nov 17, 2018
950ad46
Fix the comment
MrXJC Nov 17, 2018
5c782c8
IRISHUB-677: zh user guide for bank
chengwenxi Nov 17, 2018
d64e84f
IRISHUB-677: en user guide for bank
chengwenxi Nov 18, 2018
4ca9654
Update guide
chengwenxi Nov 18, 2018
425a6c2
Update guide
chengwenxi Nov 18, 2018
59d07c2
Merge pull request #648 from chengwenxi/feature/docs
Nov 18, 2018
88a8d5c
Modify the gov cliclient
MrXJC Nov 18, 2018
b5e7637
Modify the upgrade cli-client
MrXJC Nov 18, 2018
1555e78
Merge pull request #645 from trevorfu/docs_gov
Nov 18, 2018
6a6b628
Merge pull request #632 from MrXJC/jiacheng/docs
Nov 18, 2018
70ac52e
Add docs of stake
Nov 18, 2018
1ed5673
Remove useless flags
Nov 18, 2018
e4ae8b8
Correct some errors
Nov 18, 2018
879069e
Merge pull request #649 from HaoyangLiu/haoyang/docs
Nov 18, 2018
e5c4410
Remove useless change on .gitignore
Nov 18, 2018
c2b8303
Merge pull request #651 from HaoyangLiu/haoyang/docs
Nov 18, 2018
3dab6c6
Merge pull request #650 from irisnet/feature/docs
Nov 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ RUN cd $REPO_PATH && \
make build_linux && \
make install && \
make install_examples && \
make test_cli && \
make test_lcd && \
make test_sim
make test_cli
# make test_lcd && \
# make test_sim

FROM alpine:3.7

Expand Down
Loading