perissology
|
cc9d084327
|
Merge branch 'veto_delegation' into v1
|
2017-12-19 16:46:19 -10:00 |
|
perissology
|
25fb84965a
|
Merge branch 'project_level_bug' into v1
|
2017-12-19 16:45:20 -10:00 |
|
perissology
|
6bd39d0eba
|
Merge branch 'escapable' into v1
|
2017-12-19 16:43:44 -10:00 |
|
perissology
|
aa4750fa03
|
update vault events & limit delegates to 10
|
2017-12-19 08:35:04 -10:00 |
perissology
|
e267e4c280
|
Merge pull request #50 from Giveth/GriffGreen-patch-1
Updated Comments... still not done :-(
|
2017-12-11 19:45:59 +00: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
|
5a1539bda8
|
fix missing event after merge
|
2017-12-06 15:27:55 -08:00 |
|
perissology
|
1beb06f172
|
update coment
|
2017-12-05 13:55:14 -08:00 |
|
perissology
|
0ac45fe49a
|
Merge branch 'master' into escapable
|
2017-12-05 13:53:09 -08:00 |
|
perissology
|
d8d6ac7a77
|
remove TODO
|
2017-12-05 13:47:01 -08:00 |
|
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 |