Commit Graph

132 Commits

Author SHA1 Message Date
Jordi Baylina 8f110300cb
Version 2017-11-23 14:59:43 +01:00
Jordi Baylina fdc05b8197
Merge branch 'master' of github.com:Giveth/liquidpledging 2017-11-23 14:51:46 +01:00
Jordi Baylina d1cd372802
LICENSE 2017-11-23 14:49:57 +01:00
Jordi Baylina 49bab9e0ee
Merge pull request #26 from Giveth/transpiled
Transpile js before publishing
2017-11-20 18:54:15 +01:00
perissology a7f803c56a public contracts dir to npm 2017-11-20 06:54:38 -08:00
perissology 04f5ab70d7 update scripts 2017-11-20 06:48:46 -08:00
perissology 6c1c337f07 update scripts 2017-11-20 06:48:03 -08:00
perissology 83faa0d78d transpile js before publishing 2017-11-20 06:48:03 -08:00
ojones c3fe341e57
readme 2017-11-19 23:30:16 -08:00
Jordi Baylina 5cce6663f1
Merge pull request #46 from Giveth/whitelist
Whitelist plugins
2017-11-17 16:20:58 +01:00
perissology e2083f4f12 fix tests after web3 update 2017-11-16 15:30:29 -08:00
perissology 8b629d3bd7 add plugin whitelist
fixes #33
2017-11-16 15:15:32 -08:00
Jordi Baylina 84be690f03
Merge pull request #44 from Giveth/confirmPayment
remove isProjectCanceled check from confirmPayment
2017-11-15 21:18:21 +01:00
perissology 7f36ec4030 fix typo from conflicts 2017-11-09 12:12:19 -08:00
perissology ca1e429724
Merge branch 'master' into confirmPayment 2017-11-09 20:11:01 +00:00
perissology a82cd3a5e5
Merge pull request #34 from Giveth/tests
more tests
2017-11-09 20:09:47 +00:00
perissology 7909aa3977 remove isProjectCanceled check from confirmPayment 2017-11-09 11:11:11 -08:00
perissology d4ca1669d4 Merge remote-tracking branch 'origin/master' into tests 2017-11-04 07:19:18 -05:00
Jordi Baylina 243fa40084
Merge pull request #39 from Alonski/linting
Add Solium Linting
2017-11-01 04:46:12 -05:00
Jordi Baylina 09110afc2b
Merge pull request #31 from Giveth/isProjectCanceled
use isProjectCanceled to check for canceled project
2017-11-01 04:40:21 -05:00
Jordi Baylina d198ac0d74
Merge pull request #30 from Giveth/cancelPledge
cancel pledge bugs
Good catch!
2017-11-01 04:37:51 -05:00
Jordi Baylina 966fdafce0
Merge pull request #24 from Giveth/vault
call transfer last
2017-11-01 04:32:51 -05:00
Jordi Baylina 5b53c5f4b9
Merge pull request #37 from Giveth/bit_manipulation
don't need to use bit manipulation in mNormalizePledge
2017-11-01 04:31:48 -05:00
Alon Bukai 355882de69 Add Solium Linting 2017-10-26 08:45:36 +03:00
perissology 8eadb054ca added tests for normalizePledge 2017-10-24 10:59:10 -07:00
perissology 9cdd35fc2c don't need to use bit manipulation in mNormalizePledge 2017-10-24 10:43:29 -07:00
perissology 1729939374 use setMockedTime in longest commitTime test 2017-10-24 10:07:12 -07:00
perissology 31e511393d rename DelegationChain test name 2017-10-24 09:16:59 -07:00
perissology c94caf9160 replace multiple withdraw calls with mWithdraw 2017-10-24 08:34:06 -07:00
perissology 423f61ff51 added test for maxCommit time in delegation chain 2017-10-23 17:02:47 -07:00
perissology fa996a43b9 merge VetoDelegation & DelegationChain tests 2017-10-23 16:17:39 -07:00
perissology 6d8c259f1d added tests for delegations 2017-10-23 14:25:06 -07:00
perissology 18984a26ff use isProjectCanceled to check for canceled project 2017-10-19 12:14:31 -07:00
perissology 34adef5505 cancelPledge getOldestPledgeNotCanceled
This will eliminate the bug when pledge.oldPledge is a canceled project
w/ a plugin and the plugin rejects transfers when canceled. This would
prevent the pledge from being canceled.

We address this by transfering the pledge amount to the
oldestPledgeNotCanceled.
2017-10-19 10:32:06 -07:00
perissology 420d07d161 prevent cancelPledge transfer to 0 note 2017-10-19 09:49:16 -07:00
ojones 66388c4e9e Merge pull request #29 from ojones/master
readme header png
2017-10-17 23:03:35 -07:00
ojones 3fe03bca0e readme header png 2017-10-17 22:56:43 -07:00
Jordi Baylina a32d7d48b0
Merge branch 'master' of github.com:Giveth/liquidpledging 2017-10-14 12:46:27 +02:00
Jordi Baylina 436be31e7f
Semarate mock class 2017-10-14 12:46:04 +02:00
ojones 4380e992ac Merge pull request #27 from ojones/master
readme
2017-10-09 00:46:26 -07:00
ojones d1c6bc35d6 removed spacing 2017-10-09 00:45:17 -07:00
ojones ee82906527 readme consistant with dapp 2017-10-09 00:44:07 -07:00
perissology 2af33e397f call transfer last 2017-10-06 11:21:20 -07:00
Jordi Baylina fe85890e4d
version 2017-10-06 20:11:22 +02:00
Jordi Baylina 5230c14ab2
Veto by the owner fixed 2017-10-06 12:07:25 +02:00
Jordi Baylina 6194f3957b
Compiled contracts 2017-10-06 11:14:46 +02:00
Jordi Baylina a3d7ffee99 Merge pull request #23 from Giveth/parent_project
Allow a any address to set parentProject, not only the parentProject.addr
2017-10-06 11:08:14 +02:00
Jordi Baylina b4b79671ce Merge pull request #21 from Giveth/campaign_to_project
refactor campaign -> project
2017-10-06 11:05:25 +02:00
perissology 0191db3a07 remove req for childProject.addr === msg.sender 2017-10-05 12:51:23 -07:00
perissology e0f19d8461 refactor campaign -> project 2017-10-04 16:39:18 -07:00