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

Jump to bottom

Merge the develop branch to the master branch, preparation to v2.1.0 #209

Merged
merged 110 commits into from
Apr 1, 2019
Merged

Merge the develop branch to the master branch, preparation to v2.1.0 #209

merged 110 commits into from
Apr 1, 2019

Conversation

akolotov
Copy link
Collaborator

francois branciard and others added 30 commits December 21, 2018 14:45
add token decimals support
6e9990b
support status in tx receipt can be boolean depend on eip activate or…
9f29b29 
… not
add decimals.js and remove alternativeContract call for getDecimals
6669067
@akolotov
Merge pull request #165 from branciard/token-decimals-format
5030dba 
Support of tokens with decimals different from 18
@akolotov
Merge pull request #166 from branciard/support-status-receipt
c5fa6b2 
Support status in tx receipt that can be boolean
breaking change in last web3js target fix dep
a49de49
@patitonar
Add fee information on transfer alert
a7d6af1
@patitonar
Fix validator list for RewardableValidators contract
2e323d3
@patitonar
Fix getFee method
4ef65be
@patitonar
Temporarily disable caching of node_modules on travis
7d5c622
@akolotov
Merge pull request #180 from branciard/fix-web3js-dependency-version
a552826 
breaking change in last web3js release.  fix dep.
@vbaranov
change Sokol faucet link to alias
17ec931
@akolotov
Merge pull request #183 from vbaranov/develop
75eee71 
Change Sokol faucet link to alias
@patitonar
Refactor getFee logic
7a2c4b4
@patitonar
Add TransferAlert fee render test
f794c80
@patitonar
Fix getFeeManager
ead41b9
@akolotov
Merge pull request #182 from poanetwork/#163-fee-charged
5b4ebeb 
Update transfer alert to display fee information
@patitonar
Add build-css step on build script
73dcdf6
@patitonar
Update wallet buttons links
2f2a13f
@akolotov
Merge pull request #188 from poanetwork/update-wallets-links
88cad7c 
Update wallet buttons links
@akolotov
Merge pull request #187 from poanetwork/Add-build-css-on-build-script
976890c 
Add build-css step on build script
@bitcoinwarrior1
add AlphaWallet as a supporting wallet for xDAI
34a2ba0
@bitcoinwarrior1
fix merge conflict with develop on upstream
8d1be1b
@akolotov
Merge pull request #186 from James-Sangalli/develop
0d8e604 
add AlphaWallet as a supporting wallet for xDAI
@patitonar
check transaction logs length if status field is empty
b7c61f8
@patitonar
Add tx status unit tests
d9db5a4
@patitonar
upgrade node version to 10.15
610ed2c
@akolotov
Merge pull request #189 from poanetwork/support-transaction-null-status
17fe309 
Support transaction null status
@gabitoesmiapodo
(add) some basic theming support - (add) header theme - (add) header …
f64b2cd 
…logo theme
@gabitoesmiapodo
(add) header menu theming support
3cc06fc
patitonar and others added 19 commits March 28, 2019 15:15
@patitonar
Changes for own web3 library
88d2473
@patitonar
Add modified web3 with chainId method on web-eth
4452b5c
@patitonar
Remove web3 docs
04b4404
@patitonar
Remove web3 tests
f06e119
@patitonar
Add chainId on tx to send
f4a66ee
@patitonar
Merge branch 'develop' into add-own-web3
db2c20a 
# Conflicts:
#	package-lock.json
@patitonar
Replace own web3 for 1.0.0-beta.30 and add modified web3-eth
fe27eba
@akolotov
Merge pull request #205 from poanetwork/add-own-web3
e4153be 
Downgrade to web3js to the version `1.0.0-beta.30`, add own web3-eth version to support `eth_getChainId` call, rollback changes related to usage of the version `beta.50`
@patitonar
Fix docker
bf7e28e
@akolotov
Merge pull request #206 from poanetwork/fix-e2e-tests
5ec7244 
Fix e2e tests
@akolotov
absence of eth_chainId handled to provide more precise error message
60ddc55
@akolotov
variable declaration corrected and existing type of the alert windows…
47c232a 
… used
@patitonar
Add decorators support on tests run
157815c
@akolotov
Merge pull request #207 from akolotov/web3provider-wo-chainid
a032b6b 
Handling of absence eth_chainId on Web3 provider side
@patitonar
Merge branch 'develop' into fix-unit-tests
b1b2a7a
@akolotov
Merge pull request #208 from poanetwork/fix-unit-tests
227ba70 
Fix unit tests on travis CI
@akolotov
Merge remote-tracking branch 'upstream/develop' into doc-update
2e392c0
@akolotov
comments raised on the review addressed
ca343bf
@akolotov
Merge pull request #203 from akolotov/doc-update
85877f0 
README update related recent improvements
@akolotov akolotov requested a review from patitonar March 30, 2019 10:23
@ghost ghost assigned akolotov Mar 30, 2019
@netlify
Copy link

netlify bot commented Mar 30, 2019

Deploy preview for kind-kilby-95344f processing.

Building with commit 85877f0

https://app.netlify.com/sites/kind-kilby-95344f/deploys/5c9f43a72b41550007126887

@akolotov akolotov merged commit 9aeb632 into master Apr 1, 2019
@ghost ghost removed the review label Apr 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@patitonar patitonar patitonar approved these changes

Assignees

@akolotov akolotov

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@akolotov @patitonar @vbaranov @bitcoinwarrior1 @gabitoesmiapodo @SiddigZeidan