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

Sync code into dev #336

Merged
merged 35 commits into from
Jul 8, 2019
Merged

Sync code into dev #336

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
4d003a3
Merge pull request #287 from FISCO-BCOS/release-2.0.0-rc3
fqliao May 30, 2019
ded8c41
Revert "Release 2.0.0 rc3"
JimmyShi22 May 30, 2019
c6ce1d3
Merge pull request #288 from FISCO-BCOS/revert-287-release-2.0.0-rc3
JimmyShi22 May 30, 2019
6621ed4
Revert "Revert "Release 2.0.0 rc3""
bxq2011hust Jun 4, 2019
51f062f
Merge pull request #293 from FISCO-BCOS/release-2.0.0-rc3
bxq2011hust Jun 5, 2019
3783c7b
Merge pull request #300 from fqliao/release-2.0.0-rc3
fqliao Jun 12, 2019
9054e6a
Merge pull request #303 from fqliao/release-2.0.0-rc3
fqliao Jun 13, 2019
38c4a7f
Merge pull request #307 from FISCO-BCOS/release-2.0.0-rc3
bxq2011hust Jun 13, 2019
43a732e
make receipt error more friendly and format code
vita-dounai Jun 13, 2019
3f8debd
Merge pull request #292 from FISCO-BCOS/revert-288-revert-287-release…
bxq2011hust Jun 13, 2019
bc4aa23
update version in file release_node.txt
ywy2090 Jun 17, 2019
616bf27
Merge pull request #319 from ywy2090/fisco-master
ywy2090 Jun 17, 2019
bfc12aa
update version in filerelease_node.txt (#318)
ywy2090 Jun 17, 2019
f21ea53
Merge pull request #324 from FISCO-BCOS/dev
bxq2011hust Jun 24, 2019
96af231
fix conflict between master and release-2.0.4
vita-dounai Jul 3, 2019
a767255
update .travis.yml
vita-dounai Jul 3, 2019
64dd45d
Merge pull request #329 from vita-dounai/master
bxq2011hust Jul 3, 2019
6bfcd16
add indexed parameters for event.
ywy2090 Jun 25, 2019
229467b
fix conficts
fqliao Jul 4, 2019
7138e73
add guomi TableTest test class
fqliao Jun 24, 2019
1049524
remove useless file
fqliao Jun 24, 2019
42c7c90
update .gitignore
fqliao Jun 24, 2019
ab0a1ca
remove useless test
fqliao Jun 24, 2019
3b2a90a
move guomi TableTest
fqliao Jun 24, 2019
6a2314c
remove password parameter for some method for P12Manager
fqliao Jun 24, 2019
eba6483
add create(ECKeyPair keyPair) for GenCredential
fqliao Jun 24, 2019
20042ab
fix codacy
fqliao Jun 25, 2019
6f6eef1
rename CRUDSerivce to CRUDService
fqliao Jun 25, 2019
e0c23c4
fix conficts
fqliao Jul 4, 2019
e61664a
fix conficts
fqliao Jul 4, 2019
2d463f3
fix codacy
fqliao Jun 26, 2019
ff7fba5
update travis ci
fqliao Jul 4, 2019
0225e02
fix ut
fqliao Jul 4, 2019
f0abd40
update ChangeLog and web3sdk version.
ywy2090 Jul 4, 2019
bfc983b
resolve conflicts
bxq2011hust Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge pull request #324 from FISCO-BCOS/dev 
sync code
  • Loading branch information
@bxq2011hust
bxq2011hust authored Jun 24, 2019
commit f21ea5344dcd2537a7cca630b8421821800918c4

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.