Commits · d060d29912e6b8a29e6c56eeb23f6aca01d360e3 · 俞永鹏 / openzeppelin-contracts-upgradeable · GitLab

17 Jan, 2018 1 commit
- Merge remote-tracking branch 'upstream/master' into add-smart-token · d060d299
  AugustoL authored Jan 17, 2018
  
  d060d299 Browse Files
16 Jan, 2018 6 commits
- fix increaseApproval in ERC827Token with tests · 7ddd66fb
  AugustoL authored Jan 16, 2018
  
  7ddd66fb Browse Files
- Update ISSUE_TEMPLATE.md · 0cdc5e13
  Manuel Aráoz authored Jan 16, 2018
  
  0cdc5e13 Browse Files
- Merge pull request #661 from facuspagnuolo/enhancement/organize_test_files · 146a22cd
```
Organize test files following contracts folders structure
```
  Facundo Spagnuolo authored Jan 16, 2018
  146a22cd Browse Files
- Organize test files following contracts folders structure · b925b2da
  Facundo Spagnuolo authored Jan 09, 2018
  
  b925b2da Browse Files
- Separate ERC827 interface in another contract · 87f59163
  AugustoL authored Jan 15, 2018
  
  87f59163 Browse Files
- change throw for require in MessageHelper contract@ · 88549668
  AugustoL authored Jan 15, 2018
  
  88549668 Browse Files
15 Jan, 2018 23 commits
- Add increase and decrease approval functions to ERC827 with tests · 685d2087
  AugustoL authored Jan 15, 2018
  
  685d2087 Browse Files
- Merge pull request #677 from ernestas2k/fix/error-testing-in-delayed-claimable#672 · 7532dab1
```
Fix error testing in DelayClaimable tests
```
  Francisco Giordano authored Jan 15, 2018
  7532dab1 Browse Files
- Merge pull request #676 from Shrugs/feat/solidity-highlighting-#671 · 73a8be14
```
feat: add solidity syntax highlighting directive, fixes #671
```
  Francisco Giordano authored Jan 15, 2018
  73a8be14 Browse Files
- Merge branch 'master' into fix/error-testing-in-delayed-claimable#672 · c9fff647
  Ernestas authored Jan 15, 2018
  
  c9fff647 Browse Files
- Merge pull request #673 from Shrugs/feat/solium · ec2f7ba8
```
Solium Integration, Linting Refactor
```
  Francisco Giordano authored Jan 15, 2018
  ec2f7ba8 Browse Files
- Fix error testing in DelayClaimable tests · a4029e74
  Ernestas Prisakaru authored Jan 15, 2018
  
  a4029e74 Browse Files
- feat: add solidity syntax highlighting directive, fixes #671 · ad5edd32
  Matt Condon authored Jan 15, 2018
  
  ad5edd32 Browse Files
- fix: add ignore directives to SampleCrowdsale and SimpleToken · 955517dc
  Matt Condon authored Jan 15, 2018
  
  955517dc Browse Files
- fix: solium errors - whitespace related · 3b48a671
  Matt Condon authored Jan 15, 2018
  
  3b48a671 Browse Files
- fix: solium errors - function-order only · bd2f1773
  Matt Condon authored Jan 15, 2018
  
  bd2f1773 Browse Files
- fix: solium errors - blank-line only · e60aee61
  Matt Condon authored Jan 15, 2018
  
  e60aee61 Browse Files
- fix: solium errors - indentation only · b2e2d9ab
  Matt Condon authored Jan 15, 2018
  
  b2e2d9ab Browse Files
- fix: the result of 'npm run lint:sol:fix' · 4d263b7f
  Matt Condon authored Jan 15, 2018
  
  4d263b7f Browse Files
- feat: add solium linting to travis, npm script · e0f3fea9
  Matt Condon authored Jan 15, 2018
  
  e0f3fea9 Browse Files
- fix: remove warning on timestamp usage · d4dc4b25
  Matt Condon authored Jan 15, 2018
  
  d4dc4b25 Browse Files
- updated soliumrc - Solium v1 compatible · c1244d62
  zava authored Nov 12, 2017
  
  c1244d62 Browse Files
- Merge pull request #601 from elopio/test/math · 462c52bc
```
test: add tests for max64 and min64 from Math
```
  Francisco Giordano authored Jan 15, 2018
  462c52bc Browse Files
- Merge pull request #667 from spalladino/feature/655-safemath_docs · 9f68c008
```
Add documentation to safemath functions
```
  Francisco Giordano authored Jan 15, 2018
  9f68c008 Browse Files
- Merge pull request #674 from frangio/add-missing-awaits · 4dcf8f5b
```
Add missing awaits in tests
```
  Francisco Giordano authored Jan 15, 2018
  4dcf8f5b Browse Files
- add missing awaits in tests · ea1cb5c5
  Francisco Giordano authored Jan 15, 2018
  
  ea1cb5c5 Browse Files
- Minor change in SafeMath sub documentation · 49b42e86
  Santiago Palladino authored Jan 15, 2018
  
  49b42e86 Browse Files
- Merge pull request #638 from LimelabsTech/master · beea818f
```
BuyTokens getting the token amount from a function instead of just multiplication. Useful for making Crowdsales with bonus periods
```
  Francisco Giordano authored Jan 15, 2018
  beea818f Browse Files
- Merge branch 'master' into master · 13b75bd5
  Francisco Giordano authored Jan 15, 2018
  
  13b75bd5 Browse Files
12 Jan, 2018 1 commit
- Add findMethod function in ERC827Token test · e911b4d5
  AugustoL authored Jan 12, 2018
  
  e911b4d5 Browse Files
11 Jan, 2018 8 commits
- Overload ERC20 funcitons with new _data argument · 7bd95b1e
  AugustoL authored Jan 11, 2018
  
  7bd95b1e Browse Files
- Change order of ERC20 methods and call in transferData and transferDataFrom · 4ecdf312
  AugustoL authored Jan 11, 2018
  
  4ecdf312 Browse Files
- Delete SmartToken old docs · f36f8e96
  AugustoL authored Jan 11, 2018
  
  f36f8e96 Browse Files
- Rename SmartToken to ERC827 · e57f4be1
  AugustoL authored Jan 11, 2018
  
  e57f4be1 Browse Files
- change SmartToken test to work with new linter rules · a806520d
  AugustoL authored Jan 04, 2018
  
  a806520d Browse Files
- Add SmartToken contract with tests and documentation · a4b1cd6e
```
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
```
  AugustoL authored Oct 26, 2017
  a4b1cd6e Browse Files
- Add documentation to safemath functions · 21297e2b
```
Fixes #655
```
  Santiago Palladino authored Jan 11, 2018
  21297e2b Browse Files
- Merge pull request #664 from Shrugs/fix/pr-template-syntax · 94697726
```
fixup: issue template mdown syntax
```
  Matt Condon authored Jan 11, 2018
  94697726 Browse Files
10 Jan, 2018 1 commit
- fixup: pr template mdown syntax · a58e3e15
  Matt Condon authored Jan 10, 2018
  
  a58e3e15 Browse Files