perissology
9835535aa1
Merge branch 'master' into GriffGreen-patch-3
2017-12-05 13:44:29 -08:00
Griff Green
504c8d8155
Removed VaultSet event and fixed ref comment
2017-12-05 18:29:10 -03: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
9895c4df58
Merge pull request #53 from Giveth/GriffGreen-patch-4
...
added contributors
2017-12-05 20:48:55 +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
fc47f1c7ee
minor comment updates
2017-12-04 20:49:18 +00:00
perissology
0c92d0429e
minor comment changes
2017-12-04 20:33:15 +00:00
Griff Green
36631f28ef
added contributors
...
Make sure you take your name off this and the other commits if you don't want it there
2017-12-03 22:23:15 -03:00
Griff Green
a022730a38
Added events, comments and TODOs
2017-12-03 22:21:09 -03:00
Griff Green
09a275b50c
Added a bunch of comments and TODOs!!!
2017-12-03 22:18:31 -03:00
Griff Green
6bf0847df0
Updated Comments... still not done :-(
2017-12-03 22:12:46 -03:00
perissology
41f0eeb155
make vault Escapable & add escapeFunds method
2017-12-03 06:53:12 -08: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
perissology
2629a4c5bc
Merge branch 'master' into quazia-comments
2017-12-02 20:04:36 -08:00
Arthur L Lunn
e450358f0b
Fix idx Inconsistencies
2017-12-03 02:43:16 +01:00
Arthur L Lunn
9f105876a8
Change comments based on requests
2017-12-03 01:59:30 +01:00
perissology
e2f1b0fe21
Merge pull request #40 from Alonski/modifiers
...
Added Public Modifiers
2017-12-02 17:04:05 +00:00
perissology
5df006a76f
Fix getProjectLevel bug
...
fixes issue #48
2017-11-24 08:21:07 -08:00
Griff Green
a785a31dce
Commented all but the Whitelist additions
2017-11-23 10:00:28 -05:00
Arthur L Lunn
33480bdc14
fix id vs. idx discrepency
2017-11-18 18:33:06 +00:00
Arthur Lunn
7c2faf5e44
Merge branch 'master' into quazia-comments
2017-11-18 17:53:57 +00:00
perissology
8b629d3bd7
add plugin whitelist
...
fixes #33
2017-11-16 15:15:32 -08: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
b2e89ed954
fix issues with Vault naming
2017-11-01 17:22:41 -04: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
Jordi Baylina
966fdafce0
Merge pull request #24 from Giveth/vault
...
call transfer last
2017-11-01 04:32:51 -05:00
Arthur L Lunn
7982f9ca1b
change Vault to LPVault and comment
2017-10-31 17:00:34 -04:00
Arthur L Lunn
ee8e2b777b
spellcheck comments
2017-10-28 04:27:47 -04:00
Arthur L Lunn
77efe8ca90
comment LiquidPledgineBase
2017-10-27 15:09:55 -04:00
Arthur L Lunn
f7e1618093
Add comments to LiquidPledgingMock
2017-10-27 10:38:25 -04:00
Alon Bukai
0d81506bfa
Added Public Modifiers
2017-10-25 20:37:21 +03: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
perissology
2af33e397f
call transfer last
2017-10-06 11:21:20 -07:00
Jordi Baylina
5230c14ab2
Veto by the owner fixed
2017-10-06 12:07: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
Jordi Baylina
5fd25487b5
Do not allow transfers to a canceled campaign
2017-10-04 14:30:09 +02:00
Jordi Baylina
bd5c29cf2f
State to Status refactor
2017-10-04 13:02:19 +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
Jordi Baylina
28ecaff0ce
note to pledge refactor
2017-10-03 14:42:21 +02:00
Jordi Baylina
bae30084f0
project to campaign refactor
2017-10-03 13:37:45 +02:00
Jordi Baylina
e305229311
Donor to Giver refactor
2017-10-03 12:20:23 +02:00
Jordi Baylina
3e945ff349
Merge branch 'master' of github.com:Giveth/liquidpledging
2017-10-03 11:51:26 +02:00
Jordi Baylina
7b34866559
Merge branch 'master' into add_donor_on_donate
2017-10-03 11:36:14 +02:00
Jordi Baylina
2c73ec5941
Merge branch 'master' of github.com:Giveth/liquidpledging
2017-10-03 11:06:51 +02:00
Jordi Baylina
4bd6726b2a
Merge branch 'master' into GriffGreen-patch-4
2017-10-03 10:57:54 +02:00
Jordi Baylina
104b857736
Merge pull request #6 from Giveth/GriffGreen-patch-3
...
Added comments and a few other small things
2017-10-03 10:56:09 +02:00
Jordi Baylina
b5c0686ff4
Merge pull request #3 from Giveth/GriffGreen-patch-1
...
added comments
2017-10-03 10:55:43 +02:00
Jordi Baylina
4b4d614495
Merge pull request #5 from Giveth/GriffGreen-patch-2
...
Added comments and asserted 80 char per line
2017-10-03 10:54:48 +02:00
Jordi Baylina
8a106f054f
Merge pull request #4 from perissology/plugin
...
return plugin in getNoteManager
2017-10-03 10:53:53 +02:00
Jordi Baylina
942a5d55ab
Merge branch 'master' of github.com:Giveth/liquidpledging
2017-10-03 09:53:06 +02:00
Jordi Baylina
b93ae8454f
Cancel Project Event
2017-10-03 09:52:56 +02:00
perissology
adda020c71
fix typo
2017-09-30 12:04:14 -07:00
Griff Green
a4793fb44d
made acceptOwnership() throw when not newOwner
2017-09-29 15:09:05 +02:00
Griff Green
9cc092d2cd
edited comments
2017-09-29 12:21:21 +02:00
Griff Green
3ffdbceefa
Very
2017-09-29 12:18:07 +02:00
Griff Green
be4741aa38
Added comments and other small changes
2017-09-29 12:16:53 +02:00
Griff Green
885678c078
Added comments and a few other small things
2017-09-29 12:11:13 +02:00
Griff Green
da9a276647
Added comments and asserted 80 char per line
2017-09-29 11:06:11 +02:00
perissology
633d185989
fix addDonor call after merge
2017-09-28 12:03:36 -07:00
perissology
cea412426d
Merge remote-tracking branch 'upstream/master' into add_donor_on_donate
2017-09-28 08:50:57 -07:00
perissology
f01d174a56
create donor on donate if donorId == 0
2017-09-28 08:49:10 -07:00
perissology
e68546451e
explict type conversion for Plugin
2017-09-26 12:26:26 -07:00
perissology
aca20feb53
return plugin in getNoteManager
2017-09-26 12:07:36 -07:00
Griff Green
5ccf92d502
Update Owned.sol
2017-09-26 10:58:31 +02:00
Griff Green
f781649355
added comments
2017-09-26 10:57:09 +02:00
Jordi Baylina
1f0c5fd987
Fix soliditi error
2017-09-18 16:23:17 +02:00
Jordi Baylina
34e928ced9
No plugin update plus public normalizeNote and cancelNote and allow to be called from plugin
2017-09-18 15:43:09 +02:00
Jordi Baylina
254b6b27f8
creation functions returns id
2017-09-14 20:06:58 +02:00
Jordi Baylina
6d72a6af4d
Separate before and after plugin hooks
2017-09-14 08:03:36 +02:00