b0522b9c58
Merge pull request #518 from AugustoL/add-smart-token
...
Add ERC827 Token
2018-01-17 11:58:57 -03:00
969466b8fd
Add ethjs-abi dependency needed in ERC827 tests
2018-01-17 11:22:09 -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
c8878adcbd
Merge branch 'master' into refactor/info-md-updates
2018-01-16 21:57:35 -03:00
d95c3ade8f
Minor changes as per feedback from @frangio
2018-01-16 19:52:38 -03:00
7811370000
Remove branching section and remove negative comment
2018-01-16 19:26:10 -03:00
b1e1aadba1
Simplified and updated CONTRIBUTING.md, small update to README.md
2018-01-16 19:11:30 -03:00
7ddd66fb74
fix increaseApproval in ERC827Token with tests
2018-01-16 18:43:50 -03:00
0cdc5e13ce
Update ISSUE_TEMPLATE.md
2018-01-16 17:07:39 -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
146a22cd96
Merge pull request #661 from facuspagnuolo/enhancement/organize_test_files
...
Organize test files following contracts folders structure
2018-01-16 14:52:46 -03:00
b925b2dae6
Organize test files following contracts folders structure
2018-01-16 13:03:35 -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
7532dab17d
Merge pull request #677 from ernestas2k/fix/error-testing-in-delayed-claimable#672
...
Fix error testing in DelayClaimable tests
2018-01-15 18:48:43 -03:00
73a8be1449
Merge pull request #676 from Shrugs/feat/solidity-highlighting-#671
...
feat: add solidity syntax highlighting directive, fixes #671
2018-01-15 18:42:00 -03:00
c9fff647f4
Merge branch 'master' into fix/error-testing-in-delayed-claimable#672
2018-01-15 23:35:26 +02:00
ec2f7ba8d1
Merge pull request #673 from Shrugs/feat/solium
...
Solium Integration, Linting Refactor
2018-01-15 18:34:55 -03:00
a4029e7472
Fix error testing in DelayClaimable tests
2018-01-15 23:28:31 +02:00
ad5edd329f
feat: add solidity syntax highlighting directive, fixes #671
2018-01-15 16:24:18 -05: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
e0f3fea97f
feat: add solium linting to travis, npm script
2018-01-15 16:07:34 -05:00
d4dc4b25c8
fix: remove warning on timestamp usage
2018-01-15 16:07:34 -05:00
c1244d6297
updated soliumrc - Solium v1 compatible
2018-01-15 16:07:34 -05:00
462c52bcbf
Merge pull request #601 from elopio/test/math
...
test: add tests for max64 and min64 from Math
2018-01-15 18:05:19 -03: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
4dcf8f5bd0
Merge pull request #674 from frangio/add-missing-awaits
...
Add missing awaits in tests
2018-01-15 17:38:05 -03:00
ea1cb5c54e
add missing awaits in tests
2018-01-15 17:27:45 -03:00
49b42e8696
Minor change in SafeMath sub documentation
2018-01-15 15:44:06 -03:00
beea818f4e
Merge pull request #638 from LimelabsTech/master
...
BuyTokens getting the token amount from a function instead of just multiplication. Useful for making Crowdsales with bonus periods
2018-01-15 15:42:49 -03:00
13b75bd5af
Merge branch 'master' into master
2018-01-15 15:32:39 -03:00
e911b4d556
Add findMethod function in ERC827Token test
2018-01-12 13:08:55 -03:00
7bd95b1e31
Overload ERC20 funcitons with new _data argument
2018-01-11 16:35:21 -03:00
4ecdf312df
Change order of ERC20 methods and call in transferData and transferDataFrom
2018-01-11 13:56:52 -03:00
f36f8e96dc
Delete SmartToken old docs
2018-01-11 13:53:21 -03:00
e57f4be1fb
Rename SmartToken to ERC827
2018-01-11 13:52:36 -03:00
a806520d6f
change SmartToken test to work with new linter rules
2018-01-11 12:57:30 -03:00
a4b1cd6e31
Add SmartToken contract with tests and documentation
...
add missing public identifier in approveData in SmartToken contract
remove constact from showMessage function in message helper contract
move Message helper contract to mocks folder
move SmartTokenMock contract to mocks folder
2018-01-11 12:57:30 -03:00
21297e2b2c
Add documentation to safemath functions
...
Fixes #655
2018-01-11 11:12:13 -03:00
94697726f5
Merge pull request #664 from Shrugs/fix/pr-template-syntax
...
fixup: issue template mdown syntax
2018-01-11 00:57:22 -05:00
