|
|
4e77aaa0c3
|
Merge branch 'master' into fix/reference-of-rbac-usage
|
2018-01-22 17:46:47 -08:00 |
|
|
|
4be30dc3ae
|
Merge branch 'master' into feature/implement_erc721_standard
|
2018-01-19 17:43:03 -03:00 |
|
|
|
370e6a882a
|
ERC20 totalSupply changed from public property to a function (#666)
Fixes OpenZeppelin/zeppelin-solidity#434
|
2018-01-19 17:15:27 -03:00 |
|
|
|
9cc55ef2a5
|
use short circuit (#654)
|
2018-01-19 15:45:48 -03:00 |
|
|
|
48594890cf
|
Merge branch 'master' into feature/implement_erc721_standard
|
2018-01-19 15:36:52 -03:00 |
|
|
|
96e0d35f11
|
Merge branch 'master' into fix/reference-of-rbac-usage
|
2018-01-19 15:17:23 -03:00 |
|
|
|
a5ea0af65c
|
Merge branch 'master' into azavalla-feature/inheritable-contract
|
2018-01-18 17:20:07 -03:00 |
|
|
|
c01203b0b7
|
Index addreses in events and explicit uint size
|
2018-01-18 16:58:45 -03:00 |
|
|
|
9d005b492d
|
Explicit uint size
|
2018-01-18 16:42:19 -03:00 |
|
|
|
22c1403e5b
|
Fix solidity style issue
|
2018-01-18 16:42:19 -03:00 |
|
|
|
5ea9bd44a1
|
[Heritable] added HeirOwnershipClaimed event
|
2018-01-18 16:42:19 -03:00 |
|
|
|
51c2c50437
|
[Heritable] ownerLives(): constant --> view
|
2018-01-18 16:42:19 -03:00 |
|
|
|
52b6181d78
|
renamed Inheritable --> Heritable
|
2018-01-18 16:42:19 -03:00 |
|
|
|
82c85121bb
|
changed Inherited event for OwnershipTransfered
|
2018-01-18 16:42:19 -03:00 |
|
|
|
e5960465a7
|
owner can't be set as heir
|
2018-01-18 16:42:19 -03:00 |
|
|
|
5716492ebd
|
setHeartbeatTimeout: public --> internal
|
2018-01-18 16:42:19 -03:00 |
|
|
|
c7807c5b58
|
changed view for constant
|
2018-01-18 16:42:19 -03:00 |
|
|
|
560a855dc7
|
further example documentation
|
2018-01-18 16:42:19 -03:00 |
|
|
|
80ae074c57
|
marked ownerLives as view
|
2018-01-18 16:42:19 -03:00 |
|
|
|
d808e49b51
|
changed 'pronounce' for 'proclaim'
|
2018-01-18 16:42:19 -03:00 |
|
|
|
a8afb20c20
|
Use Inherited event instead of OwnershipTransfered
|
2018-01-18 16:42:19 -03:00 |
|
|
|
a613cd03c9
|
added example use-case for Inheritable.sol
|
2018-01-18 16:42:19 -03:00 |
|
|
|
b709206f9f
|
fixes
|
2018-01-18 16:42:19 -03:00 |
|
|
|
2a560ad82f
|
name fix
|
2018-01-18 16:42:19 -03:00 |
|
|
|
4fe2157e36
|
Inheritable contract
|
2018-01-18 16:42:19 -03:00 |
|
|
|
23afc74b59
|
Address feedback comments for ERC721
|
2018-01-18 10:15:59 -03:00 |
|
|
|
dcf1f8d22d
|
Rename ERC23 occurrences to ERC223
|
2018-01-18 11:03:43 +02:00 |
|
|
|
b67856c69d
|
Separate ERC20 and ERC827 form tokens implementations in contracts and test folders
|
2018-01-17 16:24:29 -03:00 |
|
|
|
2887393712
|
Merge branch 'master' into fix/reference-of-rbac-usage
|
2018-01-17 15:31:50 -03:00 |
|
|
|
af337047a4
|
Fix solint errors
|
2018-01-17 12:00:15 -03:00 |
|
|
|
2b008f4cb6
|
Fix solidity linter errors
|
2018-01-17 11:21:25 -03:00 |
|
|
|
d060d29912
|
Merge remote-tracking branch 'upstream/master' into add-smart-token
|
2018-01-17 11:01:05 -03:00 |
|
|
|
75439c1dd3
|
fix reference of RBAC usage.
|
2018-01-17 21:45:30 +09:00 |
|
|
|
7ddd66fb74
|
fix increaseApproval in ERC827Token with tests
|
2018-01-16 18:43:50 -03:00 |
|
|
|
5b50e99a0d
|
ERC721 required functionality tests
|
2018-01-16 16:05:01 -03:00 |
|
|
|
b09d7aada4
|
Implement ERC721 required functionality
|
2018-01-16 16:04:26 -03:00 |
|
|
|
5fc5ded661
|
Provide ERC721 required functionality interface
|
2018-01-16 16:04:26 -03:00 |
|
|
|
87f5916341
|
Separate ERC827 interface in another contract
|
2018-01-15 21:17:32 -03:00 |
|
|
|
8854966847
|
change throw for require in MessageHelper contract@
|
2018-01-15 21:15:21 -03:00 |
|
|
|
685d2087ca
|
Add increase and decrease approval functions to ERC827 with tests
|
2018-01-15 20:56:25 -03:00 |
|
|
|
955517dc2e
|
fix: add ignore directives to SampleCrowdsale and SimpleToken
|
2018-01-15 16:11:45 -05:00 |
|
|
|
3b48a671fd
|
fix: solium errors - whitespace related
|
2018-01-15 16:11:45 -05:00 |
|
|
|
bd2f1773cd
|
fix: solium errors - function-order only
|
2018-01-15 16:11:45 -05:00 |
|
|
|
e60aee61f2
|
fix: solium errors - blank-line only
|
2018-01-15 16:11:45 -05:00 |
|
|
|
b2e2d9ab1c
|
fix: solium errors - indentation only
|
2018-01-15 16:11:45 -05:00 |
|
|
|
4d263b7fc3
|
fix: the result of 'npm run lint:sol:fix'
|
2018-01-15 16:11:45 -05:00 |
|
|
|
9f68c00855
|
Merge pull request #667 from spalladino/feature/655-safemath_docs
Add documentation to safemath functions
|
2018-01-15 18:03:09 -03:00 |
|
|
|
49b42e8696
|
Minor change in SafeMath sub documentation
|
2018-01-15 15:44:06 -03:00 |
|
|
|
13b75bd5af
|
Merge branch 'master' into master
|
2018-01-15 15:32:39 -03:00 |
|
|
|
7bd95b1e31
|
Overload ERC20 funcitons with new _data argument
|
2018-01-11 16:35:21 -03:00 |
|
