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

30 Dec, 2016 1 commit
- Merge pull request #78 from AugustoL/master · d54e56f9
```
DelayedClaimable contract extension of Claimable fix #64
```
  Manuel Aráoz authored Dec 30, 2016
  d54e56f9 Browse Files
29 Dec, 2016 2 commits
- Added claimAfterBlock variable and tests changes to support changes · d9749240
  AugustoL authored Dec 29, 2016
  
  d9749240 Browse Files
- Merge remote-tracking branch 'OpenZeppelin/master' · e310e672
  AugustoL authored Dec 29, 2016
  
  e310e672 Browse Files
27 Dec, 2016 1 commit
- Merge pull request #119 from adklempner/refactorDayLimit · 74adaeed
```
Decouple Shareable from DayLimit
```
  Manuel Aráoz authored Dec 27, 2016
  74adaeed Browse Files
26 Dec, 2016 2 commits
- Make resetSpentToday and setDailyLimit internal functions · a5602e7e
  Arseniy Klempner authored Dec 26, 2016
  
  a5602e7e Browse Files
- Merge pull request #102 from adklempner/test/MultisigWallet · 2a75a2c9
```
Create tests for MultisigWallet
```
  Manuel Aráoz authored Dec 26, 2016
  2a75a2c9 Browse Files
23 Dec, 2016 6 commits
- Merge pull request #123 from demibrener/readme · 6fa9e048
```
fix link
```
  Demian Brener authored Dec 23, 2016
  6fa9e048 Browse Files
- fix link · c21006e6
  Demian Elias Brener authored Dec 23, 2016
  
  c21006e6 Browse Files
- Merge pull request #122 from demibrener/readme · aa438fa0
```
add introductory guide to smart contracts
```
  Demian Brener authored Dec 23, 2016
  aa438fa0 Browse Files
- introductory guide to smart contracts · 1529e19b
  Demian Elias Brener authored Dec 23, 2016
  
  1529e19b Browse Files
- Add payable to MultisigWalletMock() · 813c1ff0
  Arseniy Klempner authored Dec 20, 2016
  
  813c1ff0 Browse Files
- Create tests for MultisigWallet · 8aa06bda
  Arseniy Klempner authored Dec 08, 2016
  
  8aa06bda Browse Files
22 Dec, 2016 1 commit
- Decouple Shareable from DayLimit · 36fa2a72
  Arseniy Klempner authored Dec 21, 2016
  
  36fa2a72 Browse Files
21 Dec, 2016 2 commits
- Merge pull request #118 from mediachain/master · 11cf9f87
```
Add payable modifier to bid functions in examples
```
  Manuel Aráoz authored Dec 21, 2016
  11cf9f87 Browse Files
- Fix example contracts · 9c81dd29
  Arkadiy Kukarkin authored Dec 21, 2016
  
  9c81dd29 Browse Files
20 Dec, 2016 4 commits
- Merge pull request #100 from adklempner/shareable-test · bb22cd62
```
Create tests for Shareable
```
  Manuel Aráoz authored Dec 20, 2016
  bb22cd62 Browse Files
- Make isOwner() const. Add necessary toString() calls in tests. · e5eaa919
  Arseniy Klempner authored Dec 20, 2016
  
  e5eaa919 Browse Files
- Merge pull request #101 from adklempner/test/DayLimit · ba37d918
```
Create tests for DayLimit
```
  Manuel Aráoz authored Dec 20, 2016
  ba37d918 Browse Files
- Remove unnecessary toString calls · e8459148
  Arseniy Klempner authored Dec 19, 2016
  
  e8459148 Browse Files
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 2 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