Commit Graph

1677 Commits

Author SHA1 Message Date
f18fd17355 Merge pull request #48 from OpenZeppelin/docs/update-readme
Add more usage instructions to README
2019-02-13 12:22:16 -03:00
3dbf651b8e Add more usage instructions to README 2019-02-13 12:04:37 -03:00
6bf2ae8229 Merge pull request #46 from ZumZoom/linter
Fix identation and some linter warnings
2019-02-11 18:24:18 -03:00
644b121677 Merge branch 'master' into linter 2019-02-11 01:00:27 +03:00
453e3dd454 Merge pull request #39 from OpenZeppelin/fix/remove-ethpm
Remove ethpm.json
2019-02-06 12:34:52 -03:00
e8e6dd52a5 Remove ethpm.json
The package is not registered in ethpm at the moment. This file was an
artifact leftover from vanilla openzeppelin. This PR removes it, until
we decide to register openzeppelin-eth on ethpm.
2019-02-06 12:34:04 -03:00
105b927b62 Merge pull request #45 from ZumZoom/patch-2
Fix example in README.md
2019-02-06 12:31:11 -03:00
0b1e1810b1 Release v2.1.3 2019-01-29 02:15:39 -03:00
2eb0de4cd2 remove added sender argument 2019-01-28 19:31:03 -03:00
3fd5195573 remove StandardToken (unnecessary duplicate effort) 2019-01-28 19:31:03 -03:00
491fb5acd9 Merge pull request #44 from ZumZoom/patch-1
Remove initialize from ERC721Full
2019-01-28 19:07:46 -03:00
05c7d8c861 fix identation and some linter warnings 2019-01-28 22:04:50 +03:00
d032ca62e2 Fix example in README.md 2019-01-28 19:44:32 +03:00
b306c41525 Remove initialize from ERC721Full
Following d75ba162 ERC721 should not initialize their parents.
2019-01-28 19:39:29 +03:00
b39f3c2055 publish evm package to blockchains 2019-01-24 19:17:18 -03:00
4e026cd4c7 remove new gap 2019-01-24 17:49:30 -03:00
c08d63c118 rename PaymentSplitter in zos.json 2019-01-24 16:50:32 -03:00
e357592208 fix linter errors 2019-01-24 13:18:09 -03:00
f3635e1517 add missing gaps and Initializables 2019-01-23 19:38:00 -03:00
04186e2cf6 fix missing helper 2019-01-22 17:42:48 -03:00
cff2509c63 fix all tests for 2.1.2 2019-01-22 17:35:47 -03:00
dd433c41bb update package-lock.json 2019-01-21 20:07:10 -03:00
4952240620 Merge tag 'v2.1.2' of github.com:OpenZeppelin/openzeppelin-solidity into merge-v2.1
v2.1.2
2019-01-21 19:42:09 -03:00
00f7c19d02 fix remaining tests 2019-01-21 19:28:37 -03:00
5eafd1dec2 fix remaining tests in standalone contracts 2019-01-21 19:28:34 -03:00
f84278433d fix old helpers 2019-01-18 17:53:35 -03:00
73a34f96a7 fix roles initialization bug 2019-01-18 17:53:35 -03:00
877f07f0a9 fix all compilation errors 2019-01-18 17:14:53 -03:00
e808a64649 rename internal initializers 2019-01-18 16:38:26 -03:00
8617c4b4c8 Release v2.1.2 v2.1.2 2019-01-18 15:45:25 -03:00
96432bf28e Renamed test/behavior to test/behaviors. 2019-01-18 15:44:59 -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
1a9cb0786d Add changelog entry for PublicRole behavior. 2019-01-17 20:36:55 -03:00
fd808b3ff8 Add some barebones PublicRole.behavior documentation. 2019-01-17 20:27:51 -03:00
6a658f2ac8 Move PublicRole.behavior to behavior directory. 2019-01-17 20:26:56 -03:00
d9a8cd2bef Only publish the test suite behavior subdirectory 2019-01-17 20:24:53 -03:00
bce2d68e7f convert 2 spaces to 4 spaces 2019-01-17 18:02:50 -03:00
79145fa53a Temporarily disable solidity-coverage Travis job. 2019-01-14 19:13:45 -03:00
3e82db2f6f Migration to truffle 5 (and web3 1.0 (and BN)) (#1601)
* Now compiling using truffle 5.

* Migrated some test files, missing BN scientific notation usage.

* Now using BN time values.

* Migrate ERC20 tests.

* Migrate all ERC20 tests.

* Migrate utils, payment and ownership tests.

* All tests save ERC721 migrated.

* Migrated ERC721 tests.

* Fix lint errors.

* Delete old test helpers.

* Fix remaining crowdsale tests.

* Fix signature bouncer tests.

* Update how constants is used.

* Compile script pre-removes the build dir.

* Fix SafeMath tests.

* Revert "Compile script pre-removes the build dir."

This reverts commit 247e745113.

* Fix linter errors.

* Upgrade openzeppelin-test-helpers dependency.

* Update openzeppelin-test-helpers dependency.

* Define math constants globally.

* Remove unnecessary ether unit.

* Roll back reduced ether amounts in tests.

* Remove unnecessary toNumber conversions.

* Delete compile script.

* Fixed failing test.
2019-01-14 19:11:55 -03:00
089f14aa06 Add 2.2.0 changelog entry. 2019-01-11 17:48:41 -03:00
ae02103e47 Release v2.1.1 v2.1.1 2019-01-04 18:40:49 -03:00
ba83239dd8 Added 2.1.1 changelog entry. 2019-01-04 18:40:27 -03:00
4f5715bbd7 Release v2.1.0 2019-01-04 17:39:42 -03:00
312a2584e8 Updated 2.1 release date. 2019-01-04 17:39:32 -03:00
6aa88e2b7d silence npm output (#1590) 2019-01-04 17:30:45 -03:00
76abd1a41e Replaced Solium in favor of Solhint (#1575)
* Adding solhint, working on style fixes.

* Upgraded to solhint 1.5.0.

* Removed all references to Solium

* Updated mocks to make the pass the new linter rules.

* Reformatted the .solhint.json file a bit.

* Removed Solium configuration files.

* Remove Solium dependency.

* Add comment explaing disabled time rule in TokenVesting.

* Revert to the old (ugly?) style.

* Revert SignatureBouncerMock style.

* Fix ERC165InterfacesSupported interface.
2019-01-04 17:01:52 -03:00
35d70397b6 Rename WhitelisterRole to WhitelistAdminRole. (#1589)
* Rename WhitelisterRole to WhitelistAdminRole.

* Update WhitelistAdmin changelog entry.
2019-01-04 15:32:24 -03:00
a5b14f262e Separate unsigned and signed safemath libraries (#1588)
* separate unsigned and signed safemath libraries

* update changelog entry for SignedSafeMath
2019-01-04 14:57:04 -03:00
40f08a8c0b Release candidate v2.1.0-rc.2 v2.1.0-rc.2 2018-12-27 16:25:02 -03:00
8c20d53789 Updated changelog to reflect 0.5 support. 2018-12-27 16:24:38 -03:00