zecfoundation
/
zcash-grant-system
mirror of https://github.com/ZcashFoundation/zcash-grant-system.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
456 Commits 10 Branches 21 Tags 9.5 MiB
Commit Graph

193 Commits

Author SHA1 Message Date
Aaron fd9a4c5393
full payout flow operational 2019-02-13 10:54:46 -06:00
Aaron 380eec005e
payout endpoints + redux actions + ms UX refactors 2019-02-11 23:10:09 -06:00
Aaron ce0ce4feef
fix migration history 2019-02-11 17:03:39 -06:00
Aaron dc92d3f297
Merge branch 'develop' into zcash-milestones 
# Conflicts:
#	backend/grant/proposal/models.py
#	backend/grant/utils/enums.py
#	frontend/client/modules/create/utils.ts
#	frontend/stories/props.tsx
#	frontend/types/proposal.ts
 2019-02-11 16:51:31 -06:00
Aaron 72c3d6b507
join arbiter filter queries + use flush to get proposal.id on create 2019-02-11 15:59:29 -06:00
Aaron 4e5c0eaea7
BE: more milestone fields 2019-02-11 15:08:51 -06:00
Daniel Ternyak f15c110f92
Merge branch 'develop' into arbiter-management 2019-02-10 15:53:29 -06:00
Aaron 5ec50718dd
fix indentation bug 2019-02-09 22:03:55 -06:00
Aaron 9831bc03db
BE: more robust arbiter + arbiter status + arbiter accept email code 2019-02-09 20:58:40 -06:00
William O'Beirne 2dcc1c8cad
Merge branch 'develop' into resend-verification 2019-02-08 15:18:31 -05:00
William O'Beirne 9d82140c48
Fix parser error by parsing unix with 'datetime' instead of dateutil 2019-02-08 15:12:44 -05:00
Will O'Beirne 2a0e12194c
Add resend button to email settings 2019-02-08 14:57:54 -05:00
Aaron 60575b4024
Merge branch 'develop' into proposal-arbiter 
# Conflicts:
#	admin/src/components/Proposals/index.tsx
#	admin/src/store.ts
#	backend/grant/admin/views.py
#	backend/grant/proposal/models.py
 2019-02-07 09:57:56 -06:00
AMStrix 8be5e099f4
Merge branch 'develop' into contribution-admin 2019-02-07 09:36:01 -06:00
Daniel Ternyak 8bee1881d7 Add create-proposals script to README (#163) 2019-02-07 07:40:32 -05:00
Daniel Ternyak 33251d678c
Merge branch 'develop' into contribution-admin 2019-02-06 18:53:51 -06:00
Daniel Ternyak bd9c870e5c
Merge branch 'develop' into stake-topoff 2019-02-06 17:58:45 -06:00
Aaron 048cda8216
FE: user profile arbitrations tab 2019-02-06 16:37:45 -06:00
Will O'Beirne 9fd60cabaa
Button to create contribution. 2019-02-06 17:24:07 -05:00
Aaron 2b78a17973
proposal_arbiter email 2019-02-06 14:56:21 -06:00
Will O'Beirne e4290c76cf
Contribution create / edit form 2019-02-06 14:01:46 -05:00
Aaron 6fd885c274
order admin arbiter search by display_name 2019-02-06 12:56:08 -06:00
Aaron 40e73f9ee6
arbiters: admin views + pagination filter imp. 2019-02-06 12:31:53 -06:00
Will O'Beirne 2f3161ae4b
Generecize pageable. List view of contributions. 2019-02-06 12:47:47 -05:00
Will O'Beirne aeb0932120
Initial crack at admin endpoints. 2019-02-06 11:21:19 -05:00
Aaron 54e9889090
arbiter & related schema adjustments 2019-02-06 08:31:38 -06:00
Aaron eb8c1ec258
add ARBITER proposal filter 2019-02-05 21:30:31 -06:00
Will O'Beirne a1283f24eb
Allow topping off of partial stake contributions. Fix float innaccuracy errors in python. Allow staking proposals to be deleted. 2019-02-05 20:45:57 -05:00
Will O'Beirne f4f8d9312d
Merge branch 'develop' into proposal-date-fixes 2019-02-05 16:29:46 -05:00
Will O'Beirne a3a2392135
Convert milestone dates to unix timestamps to be inline with the rest of our entities. 2019-02-05 16:25:58 -05:00
Aaron 3f51b4f774
Merge branch 'develop' into proposal-arbiter 2019-02-05 14:46:16 -06:00
Aaron 2868d93fa1
proposal arbiter BE basics + initial admin work 2019-02-05 14:45:26 -06:00
AMStrix d696f7978d Proposal pagination & 404 fix (#151) 
* BE: command to create fake proposals

* BE: pagination system + implemented for GET proposals/

* FE: overlay mode for Loader component

* FE: paginated Proposals

* refactor pagination.py a bit

* Proposals: set search input from store on construction

* admin: switch proposals to new pagination regime

* BE: test adjustments

* set app.proposals.page after fetch in a less-creepy way

* optimictic proposal.detail from proposal.page

* keep api interfacing on the api surface (one-dimentional page filters vs structured)

* rem MOST & LEAST_FUNDED prop sort + rename NEWST & OLDEST

* ProposalPagination fix default sort
 2019-02-05 15:34:19 -05:00
William O'Beirne 08ed3e0417
Address validation (#156) 
* Fix create step query

* Add basic regex validation for addresses to frontend.

* Check with zcash node if address is valid before final proposal submission.

* tsc

* Mock requests where needed. Come up with a function that mocks all blockchain requests.

* Remove print
 2019-02-05 15:26:37 -05:00
Will O'Beirne a7fb3bcd81
Remove print 2019-02-05 15:16:39 -05:00
Aaron 6310e7ca90
remove old proposal model ENUMs 2019-02-05 11:01:57 -06:00
Will O'Beirne a2ddcf07c4
Mock requests where needed. Come up with a function that mocks all blockchain requests. 2019-02-05 06:17:07 -05:00
Will O'Beirne fa462175f3
Merge branch 'develop' into address-validation 2019-02-05 01:25:20 -05:00
Will O'Beirne df4b077a4a
Check with zcash node if address is valid before final proposal submission. 2019-02-05 01:24:17 -05:00
Daniel Ternyak 2dc3e1df86
Merge branch 'develop' into gdpr-and-cookies 2019-02-04 21:58:52 -06:00
Will O'Beirne 77bf47bf18
Implement user deleting. 2019-02-04 16:18:50 -05:00
Will O'Beirne 9415992bc1
Remove previews from update and comment emails. 2019-02-04 14:45:38 -05:00
William O'Beirne b920b73a4b
Enforce email verification server side (#142) 
* Add new auth middleware for ensuring user has verified email account.

* Fix test.
 2019-02-01 15:43:43 -05:00
William O'Beirne c17145986f
Request for Proposal (Pt. 3 - Create & Link Proposals) (#131) 
* Adjust rfp <-> proposal models. Add button to rfp detail page to make linked proposal.

* Add a block that links to the original request. Fix a bunch of preview issues.

* List proposals on RFP.

* Admin view for connected RFPs and proposals

* Fix TSC issues.

* Fix tab badge misalignment

* Redesign list page.

* Resolve PR issues.
 2019-02-01 14:13:30 -05:00
AMStrix f8f3bd1707 Proposal staking (#134) 
* BE: proposal/<id>/stake end-point basics

* BE: proposal staking tests

* add STAKING to ProposalStatusEnum

* BE: incremental staking related changes

* admin: staking status

* FE: proposal staking first pass

* ZCash -> Zcash spelling

* staking contribution confirmed email

* FE: staking related minor style changes

* FE proposal staking env var

* notify user of partially staked proposal contributions
 2019-01-31 17:56:16 -05:00
William O'Beirne 4091deaf2f
Request for Proposal (Pt. 1 - Models & Admin) (#120) 
* Convert constants into enums

* Initial RFP models and views.

* Fix model and enums

* RFP admin fully fleshed out.

* Fix tsc

* Fix tests and tsc

* Fix closed tag display

* Request for Proposal (Pt. 2 - Public View) (#125)

* RFP list page and backend endpoints. Scaffold of detail view.

* RFP detail view. Fix faulty addRfp action.

* Fix 0 showing up

* PR cleanup
 2019-01-30 12:59:15 -05:00
AMStrix b0d16ace7d Proposal contribution matching (#117) 
* BE: contribution_matching + admin proposal update end-point + tests

* admin: set proposal matching status

* frontend: contributionMatching

* improve CampaignBlock matching callout - thx Will

* adjust ProposalDetail matching confirmation popover child scope

* contributed & funded Proposal fields (hybrid props) + remove funded derivation from FE

* include "contributed" sum for ProposalDetail view

* fix branched migration revision
 2019-01-29 18:50:27 -05:00
Daniel Ternyak 25c622360d
fix test 2019-01-29 16:43:04 -06:00
Daniel Ternyak 2deb8c8cfa
PR review additions 2019-01-29 16:21:06 -06:00
Daniel Ternyak 357517278d
Merge branch 'develop' into task-scheduler 2019-01-29 13:29:40 -06:00