Manuel Araoz
|
ee56abcc8a
|
remove console.logs from timer
|
8 years ago |
|
Manuel Araoz
|
b67f60929c
|
make VestedToken test deterministic
|
8 years ago |
Jorge Izquierdo
|
0b71dcded2
|
Rename GrantableToken to VestedToken
|
8 years ago |
|
Jorge Izquierdo
|
f305382ef4
|
Remove grantTokens without vesting function
|
8 years ago |
|
Jorge Izquierdo
|
917b129517
|
Add safeDiv and min/max functions to SafeMath
|
8 years ago |
|
Jorge Izquierdo
|
abc646a95c
|
lastTokenIsTransferableDate rename
|
8 years ago |
|
Jorge Izquierdo
|
1697518da8
|
Make vested stock calculation more testable
|
8 years ago |
|
Jorge Izquierdo
|
93e7984c61
|
Transferrable is now transferrable
|
8 years ago |
|
Jorge Izquierdo
|
8d9e12eda3
|
Add GrantableToken tests
|
8 years ago |
|
Jorge Izquierdo
|
fb0a96332c
|
GrantableTokenMock
|
8 years ago |
|
Jorge Izquierdo
|
ba7a0f7649
|
Merge branch 'master' of https://github.com/OpenZeppelin/zeppelin-solidity into vesting
|
8 years ago |
|
Manuel Aráoz
|
a72de719c9
|
Merge pull request #139 from eordano/patch-1
BasicToken.sol: Remove useless check
|
8 years ago |
|
Jorge Izquierdo
|
ec6e728c0f
|
Grantable Token first version
|
8 years ago |
Esteban Ordano
|
70fbc7fe27
|
BasicToken.sol: Remove useless check
The condition this commit removes is already implemented by the call to `safeSub`
|
8 years ago |
|
Manuel Aráoz
|
ced4e2da3f
|
Merge pull request #137 from JGcarv/chore/rename-to-pausable
Renamed files and replaced occurencies of 'Stoppable' to 'Pausable'
|
8 years ago |
João Gabriel Carvalho
|
ae73f1a564
|
Renamed files and replaced occurencies of 'Stoppable' to 'Pausable'
|
8 years ago |
|
Manuel Aráoz
|
26127ee36a
|
Merge pull request #136 from AragonOne/master
Make test cases that use assertJump fail if they dont fail
|
8 years ago |
|
Jorge Izquierdo
|
2f0471fff2
|
Make test cases that use assertJump fail if they dont fail
|
8 years ago |
|
Manuel Aráoz
|
ad833fb40d
|
Merge pull request #132 from OpenZeppelin/refactor
Refactor folders in preparation for external audit
|
8 years ago |
|
Manuel Aráoz
|
a544f1517c
|
Merge pull request #133 from jtakalai/patch-1
Fix typos
|
8 years ago |
jtakalai
|
67ad6abdaa
|
Fix typos
On unrelated note, why on earth check like in safeAdd? Is it actually an overflow check?
|
8 years ago |
|
Manuel Araoz
|
0dfb27ff5f
|
fix tests
|
8 years ago |
|
Manuel Araoz
|
ca8f2f2362
|
rearrange folders
|
8 years ago |
|
Manuel Aráoz
|
2de7fec6dc
|
Merge pull request #127 from OpenZeppelin/contributing
Add tag comment on CONTRIBUTING.md
|
8 years ago |
|
Manuel Aráoz
|
342e7bf9ff
|
Add tag comment on CONTRIBUTING.md
Fixes #116
|
8 years ago |
|
Manuel Araoz
|
ac6f9288a8
|
v1.0.1
|
8 years ago |
|
Manuel Aráoz
|
d54e56f970
|
Merge pull request #78 from AugustoL/master
DelayedClaimable contract extension of Claimable fix #64
|
8 years ago |
AugustoL
|
d974924045
|
Added claimAfterBlock variable and tests changes to support changes
|
8 years ago |
|
AugustoL
|
e310e6728b
|
Merge remote-tracking branch 'OpenZeppelin/master'
|
8 years ago |
|
Manuel Aráoz
|
74adaeedf2
|
Merge pull request #119 from adklempner/refactorDayLimit
Decouple Shareable from DayLimit
|
8 years ago |
Arseniy Klempner
|
a5602e7e7b
|
Make resetSpentToday and setDailyLimit internal functions
|
8 years ago |
|
Manuel Aráoz
|
2a75a2c9f4
|
Merge pull request #102 from adklempner/test/MultisigWallet
Create tests for MultisigWallet
|
8 years ago |
Demian Brener
|
6fa9e048da
|
Merge pull request #123 from demibrener/readme
fix link
|
8 years ago |
Demian Elias Brener
|
c21006e6d3
|
fix link
|
8 years ago |
|
Demian Brener
|
aa438fa053
|
Merge pull request #122 from demibrener/readme
add introductory guide to smart contracts
|
8 years ago |
|
Demian Elias Brener
|
1529e19b09
|
introductory guide to smart contracts
|
8 years ago |
|
Arseniy Klempner
|
813c1ff0cd
|
Add payable to MultisigWalletMock()
|
8 years ago |
|
Arseniy Klempner
|
8aa06bda38
|
Create tests for MultisigWallet
|
8 years ago |
|
Arseniy Klempner
|
36fa2a72cf
|
Decouple Shareable from DayLimit
|
8 years ago |
|
Manuel Aráoz
|
11cf9f8752
|
Merge pull request #118 from mediachain/master
Add payable modifier to bid functions in examples
|
8 years ago |
Arkadiy Kukarkin
|
9c81dd29bb
|
Fix example contracts
|
8 years ago |
|
Manuel Aráoz
|
bb22cd62ac
|
Merge pull request #100 from adklempner/shareable-test
Create tests for Shareable
|
8 years ago |
|
Arseniy Klempner
|
e5eaa919b1
|
Make isOwner() const. Add necessary toString() calls in tests.
|
8 years ago |
|
Manuel Aráoz
|
ba37d91878
|
Merge pull request #101 from adklempner/test/DayLimit
Create tests for DayLimit
|
8 years ago |
|
Arseniy Klempner
|
e8459148a8
|
Remove unnecessary toString calls
|
8 years ago |
|
AugustoL
|
f292643543
|
DelayedClaimable tests changed to work with rename of transfer() to transferOwnership()
|
8 years ago |
|
AugustoL
|
80cc1808fc
|
Merge remote-tracking branch 'OpenZeppelin/master'
|
8 years ago |
|
Manuel Aráoz
|
d38941062b
|
Merge pull request #114 from maraoz/2-lines
add 2 lines between top level definitions
|
8 years ago |
|
Manuel Araoz
|
f79ad4e2f6
|
add 2 lines between top level definitions
|
8 years ago |
|
Demian Brener
|
5567e73730
|
Merge pull request #113 from demibrener/documentation
update readme
|
8 years ago |
