Update open zeppelin and oraclize#398

Merged

adamdossa merged 17 commits into

update-openZeppelin-and-oraclize

Nov 14, 2018

Commits on Nov 5, 2018

Updated oraclizeAPI to version 0.4.25
Dmitriy Kostin
committed

Commits on Nov 6, 2018

Updated: imports, use owner()
Dmitriy Kostin
committed
Fixed compilation errors (transfer in ReclaimTokens commented)
Dmitriy Kostin
committed
IERC20 instead of IERC20Extended
Dmitriy Kostin
committed
fix for "truffle test"
Dmitriy Kostin
committed

Commits on Nov 7, 2018

reverted changes in PolyToken
Dmitriy Kostin
committed
fixed creation of SecurityToken in tests
Dmitriy Kostin
committed

Commits on Nov 8, 2018

fix tests
Dmitriy Kostin
committed
fixed SecurityToken._burn
Dmitriy Kostin
committed
Merge branch 'dev-3.0.0' into update-openZeppelin-and-oraclize
maxsam4
authored

Commits on Nov 9, 2018

Removed redundant checking.
Dmitriy Kostin
committed
Merge branch 'dev-3.0.0' into update-openZeppelin-and-oraclize
maxsam4
authored
fix merge
maxsam4
committed
Removed redundant checking.
Dmitriy Kostin
committed

Commits on Nov 12, 2018

Commits on Nov 14, 2018

Some function name changes to avoid namespace clashes with OZ
adamdossa
committed