Merge development into p2p feature #4024

diego-G · 2019-07-31T10:27:19Z

Review checklist

All new code is covered with unit tests
Relevant integration / functional tests are added
Commit messages follow the commit guidelines
Documentation has been added/updated

This reverts commit 2651b07, reversing changes made to 8d1736b.

Darwin builds - Closes #2902

Reduce size of Darwin builds - Closes #2902

Calculate broadhash from "id" instead of legacy "b_id" field - Closes #2953

API voters votes field value changed from count of voters to vote weight - Closes #2968

Fix #2973

API Accounts approval results changed from 1.4.1 to 1.5.0-rc.1 - Closes #2971

…owing-decimal Account productivity not showing decimal places - Closes #2965

Fix #2978

…ase/2.2.0

…to development

Fix github issue template

francoilol and others added 30 commits February 19, 2019 16:35

Darwin builds

9bba417

Correct typo in build/README.md

b81c6f1

Revert "Merge pull request #2786 from LiskHQ/2579-cache_as_a_component"

a00557a

This reverts commit 2651b07, reversing changes made to 8d1736b.

Bump Version (Alphanet)

43089b7

Improve build/README.md

d1ae3c3

Correct punctuation in build/README.md

a10a17e

Merge pull request #2903 from LiskHQ/2902-darwin-builds

5fd784b

Darwin builds - Closes #2902

Fix typo

912571b

Ignore "pgAdmin 4.app" also

ca76486

Explicitly set gzip compression level

04f8c6e

Merge pull request #2932 from LiskHQ/2902-darwin-fixes

245fa3d

Reduce size of Darwin builds - Closes #2902

Bump Version (Alphanet)

48f9ee2

Bump Version (Testnet)

4b1fa5c

Calculate broadhash consensus from "id" instead of "b_id" field

c52f19e

Merge pull request #2955 from LiskHQ/2953-broadhash_consensus_fix

5e8ee6b

Calculate broadhash from "id" instead of legacy "b_id" field - Closes #2953

Bump Version (Testnet)

53905e4

Fix account productivity response from API

5ce4e27

Improve tests for account productivity response

fd3b2d5

Fix /api/voters api response

6d2de0d

Fix /api/voters votes response and update swagger definition

8892d15

Fix /api/accounts approval response

606638b

Add functional test for accocunt approval response

f800bad

Add functional test for /api/voters votes response

1e60896

Merge pull request #2969 from LiskHQ/2968-api-voters-votes-field

b878268

API voters votes field value changed from count of voters to vote weight - Closes #2968

Use calculateApproval function from api module in tests

bf114ef

Exclude signSignature if it is empty

7166e0a

Fix #2973

Merge pull request #2972 from LiskHQ/2971-api-accounts-approval

4a5d4b3

API Accounts approval results changed from 1.4.1 to 1.5.0-rc.1 - Closes #2971

Merge pull request #2967 from LiskHQ/2965-account-productivity-not-sh…

dfb594e

…owing-decimal Account productivity not showing decimal places - Closes #2965

Use correct filter blockHeight on getTransactions controller

ac841ce

Fix #2978

Modify transactionFormatter to return valid asset

27d6c63

shuse2 and others added 6 commits July 31, 2019 16:18

Merge branch 'hotfix/2.0.1' of https://github.com/LiskHQ/lisk-sdk

87c8fc9

Merge branch 'master' of https://github.com/LiskHQ/lisk-sdk into rele…

bc40b14

…ase/2.2.0

Merge branch 'release/2.2.0' of https://github.com/LiskHQ/lisk-sdk in…

4627d4b

…to development

🐛 Fix github issue template

3a11bd1

Merge pull request #4029 from LiskHQ/fix_issue_template

47dc4a9

Fix github issue template

Update issue templates

39a94b1

diego-G added status: in progress and removed status: pending review labels Aug 1, 2019

diego-G force-pushed the merge_development_into_p2p_feature branch from 1d27331 to 47c4e2b Compare August 1, 2019 08:22

diego-G added status: pending review and removed status: in progress labels Aug 1, 2019

diego-G force-pushed the merge_development_into_p2p_feature branch from 47c4e2b to 67b3f86 Compare August 1, 2019 08:28

Merge develoment into P2P feature

6ef4d79

diego-G force-pushed the merge_development_into_p2p_feature branch from 67b3f86 to 6ef4d79 Compare August 1, 2019 09:10

Update JEST application snapshot

f8b72e9

diego-G added status: in progress and removed status: pending review labels Aug 1, 2019

Skip P2P integration test planned to be re-evaluated

9cc2723

diego-G added status: pending review and removed status: in progress labels Aug 1, 2019

diego-G requested a review from pablitovicente August 1, 2019 11:42

Fix Mocha functional ws test related to blocksCommon

ce3043c

diego-G force-pushed the merge_development_into_p2p_feature branch from ed6be6d to ce3043c Compare August 1, 2019 12:06

shuse2 approved these changes Aug 1, 2019

View reviewed changes

jondubois approved these changes Aug 1, 2019

View reviewed changes

shuse2 merged commit 57d6368 into feature/implement-lip-p2p Aug 1, 2019

shuse2 deleted the merge_development_into_p2p_feature branch August 1, 2019 13:48

diego-G removed the status: pending review label Aug 1, 2019

diego-G removed the request for review from pablitovicente August 1, 2019 14:44

karmacoma added the status: ready label Nov 15, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge development into p2p feature #4024

Merge development into p2p feature #4024

diego-G commented Jul 31, 2019 •

edited

Loading

Merge development into p2p feature #4024

Merge development into p2p feature #4024

Conversation

diego-G commented Jul 31, 2019 • edited Loading

Review checklist

diego-G commented Jul 31, 2019 •

edited

Loading