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

19 Dec, 2016 15 commits
- DelayedClaimable tests changed to work with rename of transfer() to transferOwnership() · f2926435
  AugustoL authored Dec 19, 2016
  
  f2926435 Browse Files
- Merge remote-tracking branch 'OpenZeppelin/master' · 80cc1808
  AugustoL authored Dec 19, 2016
  
  80cc1808 Browse Files
- Merge pull request #114 from maraoz/2-lines · d3894106
```
add 2 lines between top level definitions
```
  Manuel Aráoz authored Dec 19, 2016
  d3894106 Browse Files
- add 2 lines between top level definitions · f79ad4e2
  Manuel Araoz authored Dec 19, 2016
  
  f79ad4e2 Browse Files
- Merge pull request #113 from demibrener/documentation · 5567e737
```
update readme
```
  Demian Brener authored Dec 19, 2016
  5567e737 Browse Files
- update readme · 2ddfb80a
  Demian Elias Brener authored Dec 19, 2016
  
  2ddfb80a Browse Files
- Merge pull request #112 from demibrener/documentation · 6a64d98a
```
Documentation
```
  Manuel Aráoz authored Dec 19, 2016
  6a64d98a Browse Files
- remove DS_Store · b1b66ce1
  Demian Elias Brener authored Dec 19, 2016
  
  b1b66ce1 Browse Files
- mend · e6c50b33
  AugustoL authored Dec 16, 2016
  
  e6c50b33 Browse Files
- Merge pull request #110 from FundRequest/master · 260edd87
```
resolve conflict between Ownable and ERC20 token.
```
  Manuel Aráoz authored Dec 19, 2016
  260edd87 Browse Files
- improve docs · 920e3ec9
  Demian Elias Brener authored Dec 19, 2016
  
  920e3ec9 Browse Files
- remove unneeded files · 2299cd1c
  Demian Elias Brener authored Dec 19, 2016
  
  2299cd1c Browse Files
- developer resources update · 31a01ebd
  Demian Elias Brener authored Dec 19, 2016
  
  31a01ebd Browse Files
- writing docs · ec07dce7
  Demian Elias Brener authored Dec 18, 2016
  
  ec07dce7 Browse Files
- building docs · 8ba40d06
  Demian Elias Brener authored Dec 13, 2016
  
  8ba40d06 Browse Files
16 Dec, 2016 2 commits
- updated documentation for claimable and ownable interfaces · ed6df57f
  qdeswaef authored Dec 16, 2016
  
  ed6df57f Browse Files
- Fix invalid character on Claimable · 02f7f4c4
  AugustoL authored Dec 15, 2016
  
  02f7f4c4 Browse Files
15 Dec, 2016 2 commits
- Also change claimable to avoid conflicts with ERC20 tokens · 77e73221
  qdeswaef authored Dec 15, 2016
  
  77e73221 Browse Files
- fixes gh-109: resolve conflict between Ownable and ERC20 token. · 41fdd5d4
  qdeswaef authored Dec 15, 2016
  
  41fdd5d4 Browse Files
13 Dec, 2016 5 commits
- Merge pull request #106 from FundRequest/master · e859d53b
```
fixes gh-99 PullPaymentMock needed a payable constructor
```
  Manuel Aráoz authored Dec 13, 2016
  e859d53b Browse Files
- fixed the code · 9d56414b
  qdeswaef authored Dec 13, 2016
  
  9d56414b Browse Files
- Merge branch 'master' of https://github.com/FundRequest/zeppelin-solidity · fe184fdb
  qdeswaef authored Dec 13, 2016
  
  fe184fdb Browse Files
- fixes gh-99 PullPaymentMock needed a payable constructor · c15fa95b
  qdeswaef authored Dec 13, 2016
  
  c15fa95b Browse Files
- fixes gh-99 PullPaymentMock needed a payable constructor · 0e58f7b9
  qdeswaef authored Dec 13, 2016
  
  0e58f7b9 Browse Files
07 Dec, 2016 1 commit
- claimBefore modifier removed on DelayedClaimable contract · 423cec41
  AugustoL authored Dec 07, 2016
  
  423cec41 Browse Files
03 Dec, 2016 1 commit
- Merge pull request #97 from sogoiii/async_await_tests · ab93a8e3
```
issue #57: Async await tests
```
  Manuel Aráoz authored Dec 03, 2016
  ab93a8e3 Browse Files
02 Dec, 2016 3 commits
- DelayedClaimable contract with test added · c7eb6736
```
Renamed DelayedClaimable function and modifier
```
  AugustoL authored Nov 16, 2016
  c7eb6736 Browse Files
- Sync with v1.0.0 of zeppelin-solidity · 42ccbb22
  AugustoL authored Dec 02, 2016
  
  42ccbb22 Browse Files
- fix: spelling in a test · 38545eb6
  Angello Pozo authored Dec 01, 2016
  
  38545eb6 Browse Files
01 Dec, 2016 1 commit
- fix: made code cleaner. added helper. removed done from most tests. · eb41a81f
  Angello Pozo authored Dec 01, 2016
  
  eb41a81f Browse Files
30 Nov, 2016 1 commit
- fix: made all the tests consistent. now with done. · 688106e9
  Angello Pozo authored Nov 30, 2016
  
  688106e9 Browse Files
27 Nov, 2016 1 commit
- modified test to use async await pattern. · f2142545
  Angello Pozo authored Nov 27, 2016
  
  f2142545 Browse Files
24 Nov, 2016 8 commits
- fix Build badge · c920c405
  Manuel Araoz authored Nov 24, 2016
  
  c920c405 Browse Files
- v1.0.0 · 55e2d17e
  Manuel Araoz authored Nov 23, 2016
  
  55e2d17e Browse Files
- Merge pull request #94 from adklempner/safemath · 7b67ff2a
```
Create tests for SafeMath
```
  Manuel Aráoz authored Nov 23, 2016
  7b67ff2a Browse Files
- Create tests for SafeMath · b6feefae
  Arseniy Klempner authored Nov 23, 2016
  
  b6feefae Browse Files
- Merge pull request #6 from OpenZeppelin/master · 1548e38d
```
Merge
```
  Arseniy Klempner authored Nov 23, 2016
  1548e38d Browse Files
- Merge pull request #90 from adklempner/killable-test · 58810f8b
```
Killable test
```
  Manuel Aráoz authored Nov 23, 2016
  58810f8b Browse Files
- Merge pull request #5 from maraoz/killable-test · 1c6f7e80
```
Killable test fix
```
  Arseniy Klempner authored Nov 23, 2016
  1c6f7e80 Browse Files
- fix Killable test · c3526115
  Manuel Araoz authored Nov 23, 2016
  
  c3526115 Browse Files