Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
84843d42
Commit
84843d42
authored
May 25, 2017
by
Manuel Aráoz
Committed by
GitHub
May 25, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #225 from DavidKnott/fix-natspec-typos
Edit natspec documentation typos
parents
efe09575
d08185fc
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
8 deletions
+6
-8
Bounty.sol
contracts/Bounty.sol
+1
-1
MultisigWallet.sol
contracts/MultisigWallet.sol
+0
-1
DelayedClaimable.sol
contracts/ownership/DelayedClaimable.sol
+2
-2
Shareable.sol
contracts/ownership/Shareable.sol
+0
-1
MintableToken.sol
contracts/token/MintableToken.sol
+1
-1
VestedToken.sol
contracts/token/VestedToken.sol
+2
-2
No files found.
contracts/Bounty.sol
View file @
84843d42
...
...
@@ -44,7 +44,7 @@ contract Bounty is PullPayment, Destructible {
/**
* @dev Sends the contract funds to the researcher that proved the contract is broken.
* @param
T
arget contract
* @param
t
arget contract
*/
function claim(Target target) {
address researcher = researchers[target];
...
...
contracts/MultisigWallet.sol
View file @
84843d42
...
...
@@ -101,7 +101,6 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
/**
* @dev Resets the value spent to enable more spending
* @param _newLimit
*/
function resetSpentToday() onlymanyowners(keccak256(msg.data)) external {
_resetSpentToday();
...
...
contracts/ownership/DelayedClaimable.sol
View file @
84843d42
...
...
@@ -17,8 +17,8 @@ contract DelayedClaimable is Claimable {
/**
* @dev Used to specify the time period during which a pending
* owner can claim ownership.
* @param
s
_start The earliest time ownership can be claimed.
* @param
s
_end The latest time ownership can be claimed.
* @param _start The earliest time ownership can be claimed.
* @param _end The latest time ownership can be claimed.
*/
function setLimits(uint _start, uint _end) onlyOwner {
if (_start > _end)
...
...
contracts/ownership/Shareable.sol
View file @
84843d42
...
...
@@ -58,7 +58,6 @@ contract Shareable {
* transactions as well as the selection of addresses capable of confirming them.
* @param _owners A list of owners.
* @param _required The amount required for a transaction to be approved.
* @param _limit Uint to represent the daily limit.
*/
function Shareable(address[] _owners, uint _required) {
owners[1] = msg.sender;
...
...
contracts/token/MintableToken.sol
View file @
84843d42
...
...
@@ -8,7 +8,7 @@ import '../ownership/Ownable.sol';
/**
* @title Mintable token
* @dev
:
Simple ERC20 Token example, with mintable token creation
* @dev Simple ERC20 Token example, with mintable token creation
* @dev Issue: * https://github.com/OpenZeppelin/zeppelin-solidity/issues/120
* Based on code by TokenMarketNet: https://github.com/TokenMarketNet/ico/blob/master/contracts/MintableToken.sol
*/
...
...
contracts/token/VestedToken.sol
View file @
84843d42
...
...
@@ -124,8 +124,8 @@ contract VestedToken is StandardToken, LimitedTransferToken {
* @param tokens uint256 The amount of tokens grantted.
* @param time uint64 The time to be checked
* @param start uint64 A time representing the begining of the grant
* @param
_
cliff uint64 The cliff period.
* @param
_
vesting uint64 The vesting period.
* @param cliff uint64 The cliff period.
* @param vesting uint64 The vesting period.
* @return An uint representing the amount of vested tokensof a specif grant.
*/
function calculateVestedTokens(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment