aa431dfb20
[TokenVesting] Increase released amount before transfer
2017-10-13 16:13:54 -03:00
fff8e040b7
[TokenVesting] vestedAmount returns the historical vested amount
2017-10-13 15:32:44 -03:00
74636b7333
[TokenVesting] Use SafeMath
2017-10-12 00:34:03 -03:00
647fc13963
Merge pull request #492 from frangio/fix-vesting-revoke
...
TokenVesting bugfix
2017-10-11 16:58:21 -03:00
d5e0714faf
use safeTransfer
2017-10-11 16:31:31 -03:00
a184013d1e
explicitly mark functions public
2017-10-09 19:08:32 -03:00
7d08c4da7f
make TokenVesting variables public
2017-10-09 19:02:57 -03:00
01b92d1d56
fix a problem when revoke is called twice
2017-10-09 19:01:04 -03:00
790833e5d4
Update SimpleToken.sol
2017-10-08 04:26:21 +03:00
2cb2799a51
align docs developer-resources.rst with README.md
2017-10-07 23:44:43 +03:00
9dcf37dd19
align docs getting-started.rst with README.md
2017-10-07 23:37:37 +03:00
0d89e99ceb
Fix contracts path issue
2017-10-07 23:24:23 +03:00
a5a1be7219
Fixing docs issue #459
2017-10-07 23:21:58 +03:00
5aba967db9
Merge pull request #476 from martriay/add-token-vesting
...
Add token vesting
2017-10-05 18:44:39 -03:00
ffd1090718
[TokenVesting] Remove VestedTokenMock
2017-10-04 18:08:36 -03:00
22b9263674
[TokenVesting] Remove VestedToken and LimitedTranferToken
2017-10-04 14:52:55 -03:00
d21d35ca6f
[TokenVesting] Fix test.
2017-10-04 14:52:31 -03:00
4e39f50aec
[TokenVesting] Remove unnecessary instatiation on test.
2017-10-04 14:52:31 -03:00
9e0e80e820
[TokenVesting] Allow instantiation of already started vesting contracts. Improve comments' wording.
2017-10-04 14:52:31 -03:00
562fb6945f
[TokenVesting] Rename events according to convention
2017-10-04 14:52:31 -03:00
822de45bfc
[TokenVesting] Add a start parameter to constructor to defer vesting
2017-10-04 14:52:30 -03:00
bd56163900
[TokenVesting] Fix vestedAmount calculation. Linearity test watches beneficiary balance over vestedAmount
2017-10-04 14:52:30 -03:00
696615d392
[TokenVesting] Add linear release test
2017-10-04 14:52:30 -03:00
645edfc936
[TokenVesting] Fix should-revoke test
2017-10-04 14:52:30 -03:00
a227b212f5
[TokenVesting] Add tests
2017-10-04 14:52:30 -03:00
c11265e694
[TokenVesting] Add events
2017-10-04 14:52:30 -03:00
6344a76f83
add pending tests
2017-10-04 14:52:30 -03:00
3da7c31484
add revocable flag
2017-10-04 14:52:30 -03:00
998c72ab5b
add preconditions to constructor
2017-10-04 14:52:30 -03:00
00f323d132
add shortcut for vestedAmount after vesting end
2017-10-04 14:52:30 -03:00
80e591f487
add TokenVesting contract
2017-10-04 14:52:30 -03:00
1333f45cdc
Add missing code blocks to bounty docs
2017-10-01 22:34:58 -04:00
2ad88b59f6
Small indenting fix for bounty docs
2017-10-01 22:27:42 -04:00
a9055f5ce2
Fixes typos
2017-09-29 14:55:18 -05:00
9b0e89c4bf
Add npm init
...
If you don't do this, you'll receive this error:
```
❯ zeppelin npm install zeppelin-solidity
npm WARN saveError ENOENT: no such file or directory, open '/Users/et/package.json'
npm WARN enoent ENOENT: no such file or directory, open '/Users/et/package.json'
npm WARN et No description
npm WARN et No repository field.
npm WARN et No README data
npm WARN et No license field.
+ zeppelin-solidity@1.3.0
updated 1 package in 0.677s
```
2017-09-28 17:18:47 -06:00
27f8609ac9
Update TokenTimelock.sol: Issue #464
...
Removed deprecated function claim() as per Issue #464 .
2017-09-27 14:07:08 -05:00
5cf503673f
Merge pull request #466 from phiferd/master
...
Using require for Token preconditions
2017-09-25 11:53:50 -03:00
3837319141
Adding some additional tests
2017-09-23 17:06:14 +08:00
e70dd18734
Moving business logic preconditions to the beginning of the function.
2017-09-23 11:57:29 +08:00
158a7a881d
Merge pull request #460 from dmx374/patch-3
...
Add explicit visibility
2017-09-22 17:32:39 +02:00
725ed40a57
v1.3.0
2017-09-21 14:18:08 -03:00
3733c069c9
Add explicit visibility
2017-09-19 08:29:03 +02:00
1df75a951f
Merge pull request #446 from jakub-wojciechowski/master
...
Make approve method compliant with ERC20
2017-09-18 18:38:37 -03:00
adfd8fb6a9
Warning in approve method documentation.
2017-09-18 18:38:05 -03:00
98f672b534
Make approve method compliant with ERC20
2017-09-18 18:38:05 -03:00
e9068859b6
Merge pull request #448 from SylTi/fix/small-fixes
...
A bunch of small fixes
2017-09-18 18:18:55 -03:00
1203a2473d
add whenNotPaused modifier to all of PausableToken functions that modify it's state. Fix #401
2017-09-18 22:49:22 +02:00
4a1ff913ab
replace var by uint256 in StandardToken. Fix #432
2017-09-18 22:46:52 +02:00
83918cad4b
change approve() to conform to ERC20. Fix #438
2017-09-18 22:46:52 +02:00
d3c5ce268f
Merge pull request #260 from yondonfu/feature/merkleproof
...
Merkle proof library with tests and docs
2017-09-18 16:47:17 -03:00
