Commit Graph

75 Commits

Author SHA1 Message Date
perissology 80a8e5a9b4 fix solc warnings 2018-01-16 11:58:10 -08:00
perissology cc9d084327 Merge branch 'veto_delegation' into v1 2017-12-19 16:46:19 -10:00
perissology 6bd39d0eba Merge branch 'escapable' into v1 2017-12-19 16:43:44 -10:00
Griff Green 88f563915a
a few more 2017-12-09 20:24:39 -05:00
Griff Green a6adb37190
A few more comments 2017-12-09 18:24:47 -05:00
perissology 2076a91859
Merge branch 'master' into veto_delegation 2017-12-05 21:10:15 +00:00
perissology e35dbb5e5a
Merge branch 'master' into escapable 2017-12-05 21:07:49 +00:00
perissology dfd1b4de37
Merge branch 'master' into GriffGreen-patch-1 2017-12-05 20:55:57 +00:00
perissology cf5c84e20f rename Pledge n -> Pledge p 2017-12-05 12:47:38 -08:00
perissology 584726ffd0 rename PaymentState -> PledgeState 2017-12-05 12:42:59 -08:00
perissology 0687776b68 update comment 2017-12-05 12:23:56 -08:00
perissology 9cf0856e3d make LiquidPledgingEscapable 2017-12-05 11:58:20 -08:00
perissology 56515bff12 proposeAssignProject should check MAX_INTERPROJECT_LEVEL 2017-12-04 13:22:14 -08:00
perissology 0c92d0429e
minor comment changes 2017-12-04 20:33:15 +00:00
Griff Green 6bf0847df0
Updated Comments... still not done :-( 2017-12-03 22:12:46 -03:00
perissology 782ff8073a Merge branch 'master' into veto_delegation 2017-12-03 06:45:02 -08:00
perissology 6d19fd0d57 few minor fixes to comments 2017-12-02 20:15:52 -08:00
Arthur L Lunn 9f105876a8 Change comments based on requests 2017-12-03 01:59:30 +01:00
Arthur Lunn 7c2faf5e44
Merge branch 'master' into quazia-comments 2017-11-18 17:53:57 +00:00
Arthur L Lunn 4edb86cf19 Add build files 2017-11-10 18:54:44 +00:00
Arthur L Lunn 8ab1ce5066 Fix test issues and merge from master 2017-11-10 18:54:27 +00:00
perissology 5d15fc6f62 preserve delegationChain on delegation veto 2017-11-10 08:39:58 -08:00
perissology ca1e429724
Merge branch 'master' into confirmPayment 2017-11-09 20:11:01 +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
Arthur L Lunn 0b77977f90 fix errors with docstrings 2017-11-01 17:03:03 -04: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
Arthur L Lunn ee8e2b777b spellcheck comments 2017-10-28 04:27:47 -04:00
perissology 9cdd35fc2c don't need to use bit manipulation in mNormalizePledge 2017-10-24 10:43:29 -07:00
alf40k 5dacc27943 Add copyrights and finish commenting plugin interface 2017-10-24 00:09:56 -04:00
alf40k cce055d31b Finish liquidPledging comments 2017-10-23 23:26:31 -04:00
perissology 423f61ff51 added test for maxCommit time in delegation chain 2017-10-23 17:02:47 -07:00
alf40k 9d5ea4fe7f comment all private methods 2017-10-23 17:40:51 -04:00
alf40k 8eb3a6930d comment transferOwnershipToGiver 2017-10-22 20:50:48 -04:00
alf40k 3a8e906ee9 comment transferOwnershipToProject 2017-10-22 20:43:28 -04:00
alf40k 5cebf72fb3 Shorten Line Length 2017-10-22 20:04:58 -04:00
alf40k 456f46a5ab Resolve mutl pledge function comment issues 2017-10-19 18:40:37 -04:00
alf40k e7ae5cc61d comment multi pledge methods 2017-10-19 17:49:53 -04: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
Jordi Baylina 5230c14ab2
Veto by the owner fixed 2017-10-06 12:07:25 +02:00
perissology e0f19d8461 refactor campaign -> project 2017-10-04 16:39:18 -07:00
Jordi Baylina 5fd25487b5
Do not allow transfers to a canceled campaign 2017-10-04 14:30:09 +02:00
Jordi Baylina 2af64a9e60
find to findOrCreate name refactor 2017-10-04 12:55:46 +02:00
Jordi Baylina b4d5e5657c
url added 2017-10-04 11:40:26 +02:00
Jordi Baylina 52e439318c
proposed to intended refactor 2017-10-04 10:33:33 +02:00
Jordi Baylina aaa3be9305
NotPaid to Pledged refactor 2017-10-04 10:29:41 +02:00
Jordi Baylina 41154e89d2
Manager to Admin refactor 2017-10-04 10:24:35 +02:00