Commit Graph

437 Commits

Author SHA1 Message Date
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 8153abbb69
Merge pull request #51 from Giveth/GriffGreen-patch-2
Added a bunch of comments and TODOs!!!
2017-12-05 20:22:42 +00:00
perissology 9cf0856e3d make LiquidPledgingEscapable 2017-12-05 11:58:20 -08:00
perissology 49540b1eb7 update solcpiler 2017-12-04 16:59:43 -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 4039a7173b remove solidfuzz dir 2017-12-03 06:33:46 -08:00
perissology 8a4355b13b
Merge pull request #42 from Giveth/quazia-comments
LPP Contract Comments
2017-12-03 04:52:16 +00:00
perissology 98fdd06aba remove build dir from repo & run build in npm prepublish 2017-12-02 20:29:40 -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
Quazia 458c6236bd tests passing; files merged 2017-11-29 19:38:02 -08: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
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
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
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
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