Manuel Aráoz
|
c10a2cf15c
|
Merge pull request #146 from maraoz/refactor
Refactor in preparation for audit
|
8 years ago |
|
Manuel Araoz
|
44082c029f
|
fix travis tests 4
|
8 years ago |
|
Manuel Araoz
|
8ba0f008df
|
fix travis tests 3
|
8 years ago |
|
Manuel Araoz
|
fcabd9957e
|
fix travis tests 2
|
8 years ago |
|
Manuel Araoz
|
9f12e870a9
|
fix travis tests
|
8 years ago |
|
Manuel Araoz
|
d24a2ed9a8
|
fix compiler error
|
8 years ago |
|
Manuel Araoz
|
b1cb7b5975
|
implement solium recommendations
|
8 years ago |
|
Manuel Araoz
|
9ab997d788
|
fix travis test runner
|
8 years ago |
|
Manuel Araoz
|
90654cb2c9
|
add .jshintrc
|
8 years ago |
|
Manuel Araoz
|
9bd51db2b2
|
refactor tests for truffle 3
|
8 years ago |
|
Manuel Araoz
|
7e7193ae61
|
truffle 2=>3
|
8 years ago |
|
Manuel Araoz
|
a69333e2b8
|
migrate to truffle 3
|
8 years ago |
Demian Brener
|
1f35727442
|
Merge pull request #144 from demibrener/readme
Aragon new collaborating organization
|
8 years ago |
Demian Elias Brener
|
cbc18e6dcc
|
Aragon new collaborating organization
|
8 years ago |
|
Manuel Araoz
|
60b48b0235
|
Solium
|
8 years ago |
|
Manuel Aráoz
|
f4624837a3
|
Merge pull request #140 from AragonOne/vesting
Vested Token implementation (Standard Token with vesting calendar)
|
8 years ago |
Jorge Izquierdo
|
0a5af4b8ac
|
Change operations order for rounding. Make tests use blocktime as reference time rather than date.
|
8 years ago |
Jorge Izquierdo
|
74dfd3511f
|
Merge pull request #1 from maraoz/vesting
Vesting test fixing help
|
8 years ago |
|
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 |
