2b9dc9ae87
Merge tag 'v2.2.0' of github.com:OpenZeppelin/openzeppelin-solidity
...
v2.2.0
2019-05-28 18:08:44 -03:00
e357592208
fix linter errors
2019-01-24 13:18:09 -03:00
e808a64649
rename internal initializers
2019-01-18 16:38:26 -03:00
a221c17fb2
Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity
...
v2.1.1
2019-01-18 15:33:51 -03:00
bce2d68e7f
convert 2 spaces to 4 spaces
2019-01-17 18:02:50 -03:00
b7d60f2f9a
Fix warnings ( #1606 )
...
* Bump required compiler version to 0.5.2.
* Fix shadowed variable warning in ERC20Migrator.
* Rename Counter to Counters.
* Add dummy state variable to SafeERC20Helper.
* Update changelog entry.
* Fix CountersImpl name.
* Improve changelog entry.
2019-01-17 15:59:30 -03:00
be5ed7364b
Release v2.1.0 solc 0.5.x ( #1568 )
...
* Now compiling in a separate directory using truffle 5.
* Ported to 0.5.1, now compiling using 0.5.1.
* test now also compiles using the truffle 5 hack.
* Downgraded to 0.5.0.
* Sorted scripts.
* Cleaned up the compile script a bit.
2018-12-20 12:26:43 -03:00
5471fc808a
Updated code style to 4 space indentation and 120 characters per line. ( #1508 )
...
* Updated code style to 4 spaces and 120 max characters per line.
* Update contracts/token/ERC721/ERC721Pausable.sol
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
* Update contracts/token/ERC721/IERC721.sol
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
2018-11-22 16:53:30 -03:00
d75ba16223
ERC721 contracts no longer initialize their parents (but have some safety checks).
2018-10-15 13:41:51 -03:00
fffa406aa4
Merge branch 'master' into peer-dep
2018-10-10 09:09:06 -03:00
bc7ba69f9b
Removed Initializable, now using zos-lib's.
2018-10-09 17:56:56 -03:00
932a39f5fd
Added gaps at the end of the storage of each contract.
2018-10-08 14:42:02 -03:00
14dd3f6610
Added sender parameter to initializers using msg.sender.
2018-10-05 17:40:38 -03:00
dd750bc094
Added missing initializations.
2018-10-05 16:34:29 -03:00
ef83f895b9
Added initializer to ERC721MetadataMintable.
2018-10-05 16:34:29 -03:00
bd8345a153
Separate ERC721Mintable ( #1365 )
...
* separate part of ERC721Mintable into ERC721MetadataMintable
* remove mint and burn from 721 tests
* Fixed linter error.
* fix ERC721 mint tests
* Minor fixes.
(cherry picked from commit 744f567f40 )
2018-10-04 11:12:05 -03:00
744f567f40
Separate ERC721Mintable ( #1365 )
...
* separate part of ERC721Mintable into ERC721MetadataMintable
* remove mint and burn from 721 tests
* Fixed linter error.
* fix ERC721 mint tests
* Minor fixes.
2018-10-04 11:10:08 -03:00