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
f60c5ad88a
Merge pull request #445 from frangio/fix-leftover-testrpc
...
Properly kill background testrpc instance
2017-09-18 15:54:42 -03:00
bcda5bfe9b
Merge branch 'master' into feature/merkleproof
2017-09-18 14:01:10 -04:00
33eb8b1da5
Merge pull request #457 from sot528/fix-typo
...
Just fix typo.
2017-09-18 14:26:21 -03:00
b069827bad
fix typo.
2017-09-19 01:57:50 +09:00
74e416f04f
Merge pull request #450 from dmx374/master
...
Explicit public visibility on methods
2017-09-18 12:58:34 -03:00
b395b06b65
Explicit public visibility on methods
2017-09-18 12:57:46 -03:00
bd84db735d
Merge pull request #450 from aupiff/master
...
removing trailing whitespace
2017-09-18 12:01:22 -03:00
bd99b207c9
Merge pull request #454 from economicnetwork/master
...
comments on vesting
2017-09-18 11:46:48 -03:00
2438557255
explain cliff
2017-09-18 12:41:54 +07:00
9f1826d83e
vesting: more corrections on comments
2017-09-18 12:22:23 +07:00
676f5f6931
comments on vesting
2017-09-18 12:18:10 +07:00
6d8bb497c8
removing trailing whitespace
2017-09-16 10:20:06 -04:00
5fd8684a5a
properly kill background testrpc instance
2017-09-14 15:40:14 -03:00
1737555b0d
Merge pull request #439 from frangio/fix-436
...
Remove indexed declaration of value in Burn event
2017-09-11 12:28:30 -03:00
eda63c75c4
Merge pull request #440 from spalladino/fix/simple_token_initial_supply
...
Fix INITIAL_SUPPLY in SimpleToken example
2017-09-11 12:27:35 -03:00
61f62eb3c7
Fix INITIAL_SUPPLY in SimpleToken example
...
Use token decimals
2017-09-11 12:13:19 -03:00
f96ebfca31
cosmetic changes to BurnableToken
2017-09-11 12:11:00 -03:00
fac580d1a9
remove indexed declaration of uint event parameter
2017-09-11 12:08:23 -03:00
dc1017c929
Simplify implementation using similar interface as PullPayment contract
2017-09-09 12:04:31 -03:00
07b688a0e6
Merge pull request #430 from frangio/fix-unchecked-transfer
...
Use SafeERC20 to transfer tokens safely
2017-09-07 20:33:43 -03:00
20187f2970
use SafeERC20#safeTransfer
2017-09-07 20:04:48 -03:00
84be318ca9
Merge pull request #424 from eugene-babichenko/transfer-ownership-event
...
Add OwnershipTransferred event to Ownable contract and its derivatives
2017-09-07 11:59:29 -03:00
5035718e4b
fixed wrong call order in Ownable.transferOwnership
2017-09-07 11:59:36 +03:00
fdc8fbaa45
Merge pull request #428 from frangio/fix-425-pausable-docs
...
Fix Pausable documentation
2017-09-06 16:25:37 -03:00
99887da49a
fix Pausable documentation
2017-09-06 15:07:12 -03:00
