Commit Graph

252 Commits

Author SHA1 Message Date
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
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
d38941062b Merge pull request #114 from maraoz/2-lines
add 2 lines between top level definitions
2016-12-19 18:10:27 -03:00
f79ad4e2f6 add 2 lines between top level definitions 2016-12-19 17:43:02 -03:00
5567e73730 Merge pull request #113 from demibrener/documentation
update readme
2016-12-19 16:36:02 -03:00
2ddfb80a5e update readme 2016-12-19 16:29:02 -03:00
6a64d98a34 Merge pull request #112 from demibrener/documentation
Documentation
2016-12-19 14:32:58 -03:00
b1b66ce165 remove DS_Store 2016-12-19 14:29:48 -03:00
260edd8702 Merge pull request #110 from FundRequest/master
resolve conflict between Ownable and ERC20 token.
2016-12-19 13:56:52 -03:00
920e3ec940 improve docs 2016-12-19 12:59:36 -03:00
2299cd1c39 remove unneeded files 2016-12-19 12:10:00 -03:00
31a01ebde1 developer resources update 2016-12-19 11:56:34 -03:00
ec07dce76f writing docs 2016-12-19 11:56:34 -03:00
8ba40d066f building docs 2016-12-19 11:56:34 -03:00
ed6df57f88 updated documentation for claimable and ownable interfaces 2016-12-16 10:15:08 +01:00
77e732218e Also change claimable to avoid conflicts with ERC20 tokens 2016-12-15 15:59:25 +01:00
41fdd5d4c6 fixes gh-109: resolve conflict between Ownable and ERC20 token. 2016-12-15 15:32:08 +01:00
e859d53b6c Merge pull request #106 from FundRequest/master
fixes gh-99 PullPaymentMock needed a payable constructor
2016-12-13 16:35:49 +02:00
9d56414b75 fixed the code 2016-12-13 12:00:48 +01:00
fe184fdbdf Merge branch 'master' of https://github.com/FundRequest/zeppelin-solidity 2016-12-13 11:59:59 +01:00
c15fa95bea fixes gh-99 PullPaymentMock needed a payable constructor 2016-12-13 11:59:52 +01:00
0e58f7b992 fixes gh-99 PullPaymentMock needed a payable constructor 2016-12-13 11:53:31 +01:00
c390e94da6 Create tests for DayLimit 2016-12-06 11:45:02 -08:00
0ec09f4131 Create tests for Shareable 2016-12-06 11:33:39 -08:00
ab93a8e3e8 Merge pull request #97 from sogoiii/async_await_tests
issue #57: Async await tests
2016-12-03 04:27:32 +02:00
38545eb648 fix: spelling in a test 2016-12-01 20:20:44 -08:00
eb41a81faa fix: made code cleaner. added helper. removed done from most tests. 2016-12-01 08:42:05 -08:00
688106e9c3 fix: made all the tests consistent. now with done. 2016-11-30 13:24:02 -08:00
f2142545c7 modified test to use async await pattern. 2016-11-27 12:09:48 -08:00
c920c40507 fix Build badge 2016-11-24 14:38:39 -08:00
55e2d17e71 v1.0.0 v1.0.0 2016-11-23 20:21:41 -08:00
7b67ff2a2b Merge pull request #94 from adklempner/safemath
Create tests for SafeMath
2016-11-23 20:20:08 -08:00
b6feefaed9 Create tests for SafeMath 2016-11-23 19:51:23 -08:00
1548e38db1 Merge pull request #6 from OpenZeppelin/master
Merge
2016-11-23 19:48:43 -08:00
58810f8b6d Merge pull request #90 from adklempner/killable-test
Killable test
2016-11-23 19:44:21 -08:00
1c6f7e80b7 Merge pull request #5 from maraoz/killable-test
Killable test fix
2016-11-23 19:36:26 -08:00
c35261150c fix Killable test 2016-11-23 19:33:49 -08:00
390e22dfae Merge pull request #89 from maraoz/std-token
Remove redundant checks in StandardToken
2016-11-23 17:40:32 -08:00
e2051734c2 Merge pull request #87 from maraoz/readme
README and documentation improvements
2016-11-23 17:38:34 -08:00