Commit Graph

883 Commits

Author SHA1 Message Date
04946211a5 Using the new overridable function 2018-01-03 11:14:02 +02:00
2f2ef68652 Increased Minor Version 2018-01-03 10:59:53 +02:00
ebdba08218 Added overridable getTokenAmount function 2018-01-03 10:54:30 +02:00
a74b7bd4b1 Merge pull request #613 from federicobond/remove-duplicate-constructor
Remove duplicated constructor call in FinalizableCrowdsaleImpl
2018-01-02 16:48:06 -03:00
090e2fca16 Remove duplicated constructor call in FinalizableCrowdsaleImpl 2018-01-02 16:26:02 -03:00
dbe8898d00 Merge pull request #636 from OpenZeppelin/release/v1.5.0
v1.5.0
2018-01-02 15:25:34 -03:00
52b2a619c7 Merge pull request #603 from elopio/patch-1
fix typo: that -> than
2018-01-02 13:14:04 -03:00
58ecbd6104 fix typo: that -> than 2018-01-02 15:58:35 +00:00
9aa61ad273 Merge pull request #634 from Shrugs/fix/destructible-typo
fix: TokenDestructible typo fron->from
2018-01-02 11:07:09 -03:00
7aa6f21147 fix: TokenDestructible typo fron->from 2017-12-31 19:06:38 +04:00
323d1fa941 Refactor assert revert helper to encapsulate promises (#628) 2017-12-28 00:39:55 -03:00
4073cf6585 v1.5.0 v1.5.0 2017-12-22 19:50:42 -03:00
4ce0e211c5 Merge pull request #604 from elopio/tests/fix-ReentrancyGuard
test: fix the mocks path in ReentrancyGuard test
2017-12-22 18:41:58 -03:00
9af6ad5ddf Merge pull request #610 from TalAter/master
Documented increaseApproval() and decreaseApproval()
2017-12-22 18:32:38 -03:00
2f336f7aaf Merge pull request #614 from him2him2/master
Update HTTP -> HTTPS
2017-12-22 18:02:15 -03:00
5751eac444 Merge pull request #617 from spalladino/feature/reenable-coverage
Re-enable solidity coverage
2017-12-22 17:27:19 -03:00
cda518d353 Merge pull request #624 from AugustoL/change-uint-tokentimelock
Use uint256 in TokenTimeLock contract
2017-12-22 12:32:19 -03:00
f446f5c5cd Use uint256 in TokenTimeLock contract 2017-12-22 10:34:29 -03:00
1455a5a942 Re-enable solidity coverage
- Upgrade version
- Re-enable in travis.yml
- Move mocks to contracts folder for instrumentation
2017-12-20 18:28:22 -03:00
207b92f63c Merge pull request #602 from nemild/patch-1
Consistent spellings of reentrant
2017-12-20 15:40:27 -03:00
b217ef6314 Update HTTP -> HTTPS
URLs were updated to use HTTPS protocol
2017-12-19 15:32:38 -08:00
687dc19a4a Documented increaseApproval() and decreaseApproval() 2017-12-14 20:14:58 +02:00
161f25fc12 Made spelling for 'reentrant' consistent in comment 2017-12-07 22:48:55 -08:00
4bb26c32b6 test: fix the mocks path in ReentrancyGuard test 2017-12-08 02:57:29 +00:00
d91f4d4bc1 Consistent spellings of reentrant
Changed `rentrancy_lock` variable to `reentrancy_lock`
2017-12-06 16:03:55 -08:00
ddcae6254e Merge pull request #600 from izetex/fix/burnable-token-inheritance
Burnable Token should be inherited from Basic Token issue#596
2017-12-06 12:25:35 -03:00
8375b6085f Burnable Token should be inherited from Basic Token issue#596 2017-12-06 08:08:42 +03:00
83b941c76c Merge pull request #580 from Shrugs/feat/rbac
feat: RBAC authentication contract and role library
2017-12-04 12:30:38 -03:00
63c8751e06 fix: linter errors 2017-12-04 17:08:28 +02:00
306132f823 Merge pull request #597 from JesseBusman/master
There's no need to throw when burning 0 tokens
2017-12-04 11:15:30 -03:00
677d05743c feat: update event names for OZ standards and test them 2017-12-04 13:42:55 +02:00
aef0f63aee There's no need to throw when burning 0 tokens
Throwing when trying to burn 0 tokens is an unnecessary special case.
If another contract wants to burn() a variable amount, it should not be forced to deal with this special case of burning 0.
2017-12-03 12:08:53 +01:00
5e55569db6 fix: make roles private 2017-12-01 18:15:44 +02:00
9bb2c958ec feat: add adminAddRole, adminRemoveRole, and make hasRole/checkRole public 2017-12-01 18:15:44 +02:00
e931c1cbfc feat: RBAC authentication contract and role library 2017-12-01 18:15:44 +02:00
dd1fd0002a Merge pull request #581 from Shrugs/feat/minor-additions
Minor standards and cleanup additions.
2017-12-01 12:22:01 -03:00
ac3808885a fix: default to empty string for mnemonic 2017-12-01 13:43:25 +02:00
258c001f7f feat: add linting to travis script 2017-12-01 13:40:11 +02:00
d07bdccc0c feat: manually fix linting errors across tests 2017-12-01 13:40:09 +02:00
227a335399 feat: move mock solidity contracts to mocks/ folder 2017-12-01 13:39:13 +02:00
58abd66969 feat: rename all test files to include .test.js postfix 2017-12-01 13:37:12 +02:00
8662846838 feat: apply eslint --fix across project 2017-12-01 13:37:09 +02:00
6ea0577bfe feat: enable eslint 2017-12-01 11:44:41 +02:00
b9b26e1d8a feat: allow configuration of ropsten and ganache with env variables 2017-12-01 11:43:49 +02:00
887c1bb925 feat: more comprehensive gitignore 2017-12-01 11:43:49 +02:00
cc5e898250 Merge pull request #588 from BrandonGilchrist/feature/delayed-crowdsale-docs
Add docs for DelayedClaimable
2017-11-29 18:36:33 -03:00
1cef36b5c0 Merge pull request #585 from Shrugs/feat/only-npm
feat: remove yarn in favor of npm
2017-11-29 11:59:28 -03:00
c95be493c3 fix: remove engines 2017-11-29 14:11:04 +02:00
bddc8755c1 Add docs for DelayedClaimable 2017-11-28 15:04:42 -08:00
3ad555bb01 fix: remove duplicate npm ls 2017-11-28 13:21:22 +02:00