Commit Graph

613 Commits

Author SHA1 Message Date
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
perissology 1ed9c88a14 Merge branch 'master' into veto_delegation 2017-11-10 07:33:12 -08: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
Arthur L Lunn ebe7c823a2 Fix test issues from LPVault name change 2017-11-01 19:41:23 -04: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 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
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 355882de69 Add Solium Linting 2017-10-26 08:45:36 +03:00
Alon Bukai 0d81506bfa Added Public Modifiers 2017-10-25 20:37:21 +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