|
|
0a5af4b8ac
|
Change operations order for rounding. Make tests use blocktime as reference time rather than date.
|
2017-02-13 11:35:32 +01:00 |
|
|
|
74dfd3511f
|
Merge pull request #1 from maraoz/vesting
Vesting test fixing help
|
2017-02-13 10:08:43 +01:00 |
|
|
|
ee56abcc8a
|
remove console.logs from timer
|
2017-02-10 18:35:05 -03:00 |
|
|
|
b67f60929c
|
make VestedToken test deterministic
|
2017-02-10 18:32:58 -03:00 |
|
|
|
0b71dcded2
|
Rename GrantableToken to VestedToken
|
2017-02-10 16:20:23 +01:00 |
|
|
|
f305382ef4
|
Remove grantTokens without vesting function
|
2017-02-10 16:18:36 +01:00 |
|
|
|
917b129517
|
Add safeDiv and min/max functions to SafeMath
|
2017-02-10 16:17:02 +01:00 |
|
|
|
abc646a95c
|
lastTokenIsTransferableDate rename
|
2017-02-10 16:04:58 +01:00 |
|
|
|
1697518da8
|
Make vested stock calculation more testable
|
2017-02-10 15:28:20 +01:00 |
|
|
|
93e7984c61
|
Transferrable is now transferrable
|
2017-02-10 14:59:19 +01:00 |
|
|
|
8d9e12eda3
|
Add GrantableToken tests
|
2017-02-09 13:23:12 +01:00 |
|
|
|
fb0a96332c
|
GrantableTokenMock
|
2017-02-08 15:27:39 +01:00 |
|
|
|
ba7a0f7649
|
Merge branch 'master' of https://github.com/OpenZeppelin/zeppelin-solidity into vesting
|
2017-02-08 15:26:15 +01:00 |
|
|
|
a72de719c9
|
Merge pull request #139 from eordano/patch-1
BasicToken.sol: Remove useless check
|
2017-02-08 11:13:38 -03:00 |
|
|
|
ec6e728c0f
|
Grantable Token first version
|
2017-02-08 12:31:20 +01:00 |
|
|
|
70fbc7fe27
|
BasicToken.sol: Remove useless check
The condition this commit removes is already implemented by the call to `safeSub`
|
2017-02-07 19:45:32 -05:00 |
|
|
|
ced4e2da3f
|
Merge pull request #137 from JGcarv/chore/rename-to-pausable
Renamed files and replaced occurencies of 'Stoppable' to 'Pausable'
|
2017-02-06 16:34:54 -03:00 |
|
|
|
ae73f1a564
|
Renamed files and replaced occurencies of 'Stoppable' to 'Pausable'
|
2017-01-30 23:30:43 -02:00 |
|
|
|
26127ee36a
|
Merge pull request #136 from AragonOne/master
Make test cases that use assertJump fail if they dont fail
|
2017-01-23 15:48:38 -03:00 |
|
|
|
2f0471fff2
|
Make test cases that use assertJump fail if they dont fail
|
2017-01-23 19:18:41 +01:00 |
|
|
|
ad833fb40d
|
Merge pull request #132 from OpenZeppelin/refactor
Refactor folders in preparation for external audit
|
2017-01-17 13:02:16 -03:00 |
|
|
|
a544f1517c
|
Merge pull request #133 from jtakalai/patch-1
Fix typos
|
2017-01-17 11:24:17 -03:00 |
|
|
|
67ad6abdaa
|
Fix typos
On unrelated note, why on earth check like in safeAdd? Is it actually an overflow check?
|
2017-01-17 12:29:54 +02:00 |
|
|
|
0dfb27ff5f
|
fix tests
|
2017-01-16 17:42:26 -03:00 |
|
|
|
ca8f2f2362
|
rearrange folders
|
2017-01-16 17:23:28 -03:00 |
|
|
|
2de7fec6dc
|
Merge pull request #127 from OpenZeppelin/contributing
Add tag comment on CONTRIBUTING.md
|
2017-01-09 16:27:56 -03:00 |
|
|
|
342e7bf9ff
|
Add tag comment on CONTRIBUTING.md
Fixes #116
|
2017-01-09 16:27:32 -03:00 |
|
|
|
ac6f9288a8
|
v1.0.1
v1.0.1
|
2017-01-05 15:36:20 -03:00 |
|
|
|
d54e56f970
|
Merge pull request #78 from AugustoL/master
DelayedClaimable contract extension of Claimable fix #64
|
2016-12-30 12:04:05 -03:00 |
|
|
|
d974924045
|
Added claimAfterBlock variable and tests changes to support changes
|
2016-12-29 16:12:32 -03:00 |
|
|
|
e310e6728b
|
Merge remote-tracking branch 'OpenZeppelin/master'
|
2016-12-29 15:54:19 -03:00 |
|
|
|
74adaeedf2
|
Merge pull request #119 from adklempner/refactorDayLimit
Decouple Shareable from DayLimit
|
2016-12-27 13:12:51 -03:00 |
|
|
|
a5602e7e7b
|
Make resetSpentToday and setDailyLimit internal functions
|
2016-12-26 13:59:21 -08:00 |
|
|
|
2a75a2c9f4
|
Merge pull request #102 from adklempner/test/MultisigWallet
Create tests for MultisigWallet
|
2016-12-26 15:25:40 -03:00 |
|
|
|
6fa9e048da
|
Merge pull request #123 from demibrener/readme
fix link
|
2016-12-23 14:34:51 -03:00 |
|
|
|
c21006e6d3
|
fix link
|
2016-12-23 14:29:17 -03:00 |
|
|
|
aa438fa053
|
Merge pull request #122 from demibrener/readme
add introductory guide to smart contracts
|
2016-12-23 14:26:04 -03:00 |
|
|
|
1529e19b09
|
introductory guide to smart contracts
|
2016-12-23 14:19:20 -03:00 |
|
|
|
813c1ff0cd
|
Add payable to MultisigWalletMock()
|
2016-12-22 18:34:05 -08:00 |
|
|
|
8aa06bda38
|
Create tests for MultisigWallet
|
2016-12-22 18:34:05 -08:00 |
|
|
|
36fa2a72cf
|
Decouple Shareable from DayLimit
|
2016-12-21 16:43:39 -08:00 |
|
|
|
11cf9f8752
|
Merge pull request #118 from mediachain/master
Add payable modifier to bid functions in examples
|
2016-12-21 16:51:40 -03:00 |
|
|
|
9c81dd29bb
|
Fix example contracts
|
2016-12-21 14:26:32 -05:00 |
|
|
|
bb22cd62ac
|
Merge pull request #100 from adklempner/shareable-test
Create tests for Shareable
|
2016-12-20 18:22:23 -03:00 |
|
|
|
e5eaa919b1
|
Make isOwner() const. Add necessary toString() calls in tests.
|
2016-12-20 13:02:24 -08:00 |
|
|
|
ba37d91878
|
Merge pull request #101 from adklempner/test/DayLimit
Create tests for DayLimit
|
2016-12-20 11:26:13 -03:00 |
|
|
|
e8459148a8
|
Remove unnecessary toString calls
|
2016-12-19 21:52:37 -08:00 |
|
|
|
f292643543
|
DelayedClaimable tests changed to work with rename of transfer() to transferOwnership()
|
2016-12-19 19:15:22 -03:00 |
|
|
|
80cc1808fc
|
Merge remote-tracking branch 'OpenZeppelin/master'
|
2016-12-19 19:11:31 -03:00 |
|
|
|
d38941062b
|
Merge pull request #114 from maraoz/2-lines
add 2 lines between top level definitions
|
2016-12-19 18:10:27 -03:00 |
|
