Commits · 49adfea68b6dda2c98aecddd6ee044ab7ffb3d61 · 俞永鹏 / openzeppelin-contracts-upgradeable · GitLab

18 Jan, 2018 4 commits
- Merge branch 'master' into fix/rename-erc23-occurrences-to-erc223Mock#675 · 49adfea6
  Matt Condon authored Jan 18, 2018
  
  49adfea6 Browse Files
- Merge pull request #689 from joejordan/patch-1 · a29fce9c
```
Update README.md
```
  Francisco Giordano authored Jan 18, 2018
  a29fce9c Browse Files
- Update README.md · 7f591a91
```
I clarified where the "npm install zeppelin-solidity" command should happen. I got hung up on it initially and I know others have as well.
```
  Joe Jordan authored Jan 18, 2018
  7f591a91 Browse Files
- Rename ERC23 occurrences to ERC223 · dcf1f8d2
  Ernestas Prisakaru authored Jan 15, 2018
  
  dcf1f8d2 Browse Files
17 Jan, 2018 7 commits
- Merge pull request #688 from AugustoL/refactor/reorganize-tests · c7f2138d
```
Reorganize tests and add library folder
```
  Facundo Spagnuolo authored Jan 17, 2018
  c7f2138d Browse Files
- Separate ERC20 and ERC827 form tokens implementations in contracts and test folders · b67856c6
  AugustoL authored Jan 17, 2018
  
  b67856c6 Browse Files
- Reorganize tests and add library folder · 4fbd44fd
  AugustoL authored Jan 17, 2018
  
  4fbd44fd Browse Files
- Merge pull request #518 from AugustoL/add-smart-token · b0522b9c
```
Add ERC827 Token
```
  Augusto Lemble authored Jan 17, 2018
  b0522b9c Browse Files
- Add ethjs-abi dependency needed in ERC827 tests · 969466b8
  AugustoL authored Jan 17, 2018
  
  969466b8 Browse Files
- Fix solidity linter errors · 2b008f4c
  AugustoL authored Jan 17, 2018
  
  2b008f4c Browse Files
- 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