Commits · 3caaaaff81219461f8a40cf0465c59bc00a56b2d · 俞永鹏 / openzeppelin-contracts-upgradeable · GitLab

21 Nov, 2016 1 commit
- Merge pull request #2 from OpenZeppelin/master · 3caaaaff
```
Merge
```
  Arseniy Klempner authored Nov 20, 2016
  3caaaaff Browse Files
18 Nov, 2016 4 commits
- Merge pull request #77 from maraoz/erc20basic · fb0f9c05
```
Polish BasicToken
```
  Manuel Aráoz authored Nov 18, 2016
  fb0f9c05 Browse Files
- polish BasicToken · 7bc35f6f
  Manuel Araoz authored Nov 18, 2016
  
  7bc35f6f Browse Files
- Merge pull request #76 from maraoz/limit-funds · 7d4e7b79
```
Limit funds improvements
```
  Manuel Aráoz authored Nov 18, 2016
  7d4e7b79 Browse Files
- add more limit tests to LimitBalance · 4cd8aa79
  Manuel Araoz authored Nov 18, 2016
  
  4cd8aa79 Browse Files
17 Nov, 2016 1 commit
- limit funds improvements · 44138018
  Manuel Araoz authored Nov 17, 2016
  
  44138018 Browse Files
16 Nov, 2016 8 commits
- Merge pull request #74 from maraoz/rejector · da42a5c7
```
remove references to rejector on README
```
  Manuel Aráoz authored Nov 16, 2016
  da42a5c7 Browse Files
- remove references to rejector on README · b4c00cf6
  Manuel Araoz authored Nov 16, 2016
  
  b4c00cf6 Browse Files
- Merge pull request #73 from maraoz/tokens · dfbcb233
```
Token contracts work
```
  Manuel Aráoz authored Nov 16, 2016
  dfbcb233 Browse Files
- add simple tests for BasicToken · 3e9bfbc7
  Manuel Araoz authored Nov 16, 2016
  
  3e9bfbc7 Browse Files
- rename lite->basic · 8acc7833
  Manuel Araoz authored Nov 16, 2016
  
  8acc7833 Browse Files
- move erc20 and standardtoken to token folder · 10e8d6a0
  Manuel Araoz authored Nov 16, 2016
  
  10e8d6a0 Browse Files
- Merge pull request #71 from maraoz/fix-truffle-build · a767b3df
```
fix truffle build
```
  Manuel Aráoz authored Nov 16, 2016
  a767b3df Browse Files
- fix truffle build · 69463d91
  Manuel Araoz authored Nov 16, 2016
  
  69463d91 Browse Files
15 Nov, 2016 2 commits
- Merge pull request #65 from se3000/ownable_guard · 32079967
```
add check prevening ownables from getting stuck
```
  Manuel Aráoz authored Nov 14, 2016
  32079967 Browse Files
- Merge pull request #68 from OpenZeppelin/demibrener-patch-1 · eed0ba95
```
Collaborating organizations list
```
  Manuel Aráoz authored Nov 14, 2016
  eed0ba95 Browse Files
14 Nov, 2016 7 commits
- Update README.md · 7c7ca1cf
  Demian Brener authored Nov 14, 2016
  
  7c7ca1cf Browse Files
- Update README.md · 4cd3de4c
  Demian Brener authored Nov 14, 2016
  
  4cd3de4c Browse Files
- Merge pull request #69 from federicobond/tokenmock-totalsupply · e1dcab29
```
Fill totalSupply in StandardTokenMock
```
  Manuel Aráoz authored Nov 14, 2016
  e1dcab29 Browse Files
- Fill totalSupply in StandardTokenMock · 2b62f349
  Federico Bond authored Nov 14, 2016
  
  2b62f349 Browse Files
- Update README.md · 23448fa5
  Demian Brener authored Nov 14, 2016
  
  23448fa5 Browse Files
- Collaborating organizations list · 0e0d6c0a
  Demian Brener authored Nov 14, 2016
  
  0e0d6c0a Browse Files
- Merge pull request #67 from se3000/fresh_fixtures · d7b38038
```
Move away from migration fixtures in tests
```
  Manuel Aráoz authored Nov 14, 2016
  d7b38038 Browse Files
13 Nov, 2016 3 commits
- make claimable use fresh instances for each test · a156064b
  Steve Ellis authored Nov 13, 2016
  
  a156064b Browse Files
- move Ownable tests away from migration fixtures · 1547000d
  Steve Ellis authored Nov 13, 2016
  
  1547000d Browse Files
- add check prevening ownables from getting stuck · 5f6b7f93
  Steve Ellis authored Nov 13, 2016
  
  5f6b7f93 Browse Files
09 Nov, 2016 2 commits
- Merge pull request #51 from AugustoL/master · a3362f72
```
Added Claimable contract as an extension of Ownable
```
  Manuel Aráoz authored Nov 09, 2016
  a3362f72 Browse Files
- Merge pull request #48 from federicobond/inheritance-bounty · df44240e
```
Replace composition for inheritance in Bounty
```
  Manuel Aráoz authored Nov 09, 2016
  df44240e Browse Files
08 Nov, 2016 3 commits
- Replace composition for inheritance in Bounty · 278f060c
  Federico Bond authored Nov 01, 2016
  
  278f060c Browse Files
- Merge pull request #60 from OpenZeppelin/sol-0.4.4 · 056320ed
```
migrate to 0.4.4
```
  Manuel Aráoz authored Nov 08, 2016
  056320ed Browse Files
- migrate to 0.4.4 · 83f41046
  Manuel Araoz authored Nov 03, 2016
  
  83f41046 Browse Files
04 Nov, 2016 2 commits
- Merge pull request #58 from federicobond/selfdestruct · 0c0eb292
```
Replace deprecated suicide with selfdestruct
```
  Manuel Aráoz authored Nov 04, 2016
  0c0eb292 Browse Files
- Replace deprecated suicide with selfdestruct · defcf566
  Federico Bond authored Nov 03, 2016
  
  defcf566 Browse Files
03 Nov, 2016 1 commit
- Merge pull request #49 from federicobond/ownable-stoppable · 75485ca3
```
Make Stoppable a subclass of Ownable
```
  Manuel Aráoz authored Nov 03, 2016
  75485ca3 Browse Files
02 Nov, 2016 2 commits
- Make Stoppable a subclass of Ownable. Fixes #47 · 4599fbf2
  Federico Bond authored Nov 01, 2016
  
  4599fbf2 Browse Files
- Added Claimable contract as an extension of Ownable with the Claimable tests · 0f3a8051
  AugustoL authored Nov 02, 2016
  
  0f3a8051 Browse Files
01 Nov, 2016 2 commits
- Merge pull request #46 from adklempner/standard-token-tests · c70a0cfd
```
Add test for StandardToken
```
  Manuel Aráoz authored Nov 01, 2016
  c70a0cfd Browse Files
- Add test for StandardToken · aa3cd8c0
  Arseniy Klempner authored Nov 01, 2016
  
  aa3cd8c0 Browse Files
31 Oct, 2016 1 commit
- v0.0.11 · 5683417d
  Manuel Araoz authored Oct 31, 2016
  
  5683417d Browse Files
28 Oct, 2016 1 commit
- fix spacing · e2861e75
  Manuel Araoz authored Oct 18, 2016
  
  e2861e75 Browse Files