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

190 Commits

Author SHA1 Message Date
AMStrix 709a370284 Proposal stage and comment pagination (#214) 
* hook up proposal stage filters

* paginate comments & "All" stages filter in frontend

* Add 'status' to 'create-proposals'
 2019-02-17 21:13:24 -05:00
William O'Beirne 1be2c5c945
Add bounty banner to campaign block. Reflect bounty in funded amount. Fix some of the cases that opens up. (#213) 2019-02-16 12:32:26 -05:00
AMStrix be259af0cd
Merge branch 'develop' into redux-alien-auth-events 2019-02-16 08:50:37 -06:00
AMStrix 877bc53332 Milestone & Arbiter adjustments (#211) 
* ms emails: fix link underline extra space

* fe: team member no arbiter ms action verbiage

* BE: no proposal matching changes after funding + pull proposal state changing into model funcs

* when funding reached with immediate payout skip MS to ACCEPTED (waiting for payment)

* email: fix another trailing link space

* arbiter may not be team-member

* add proposal hybrid property is_failed, true if not funded past deadline

* do not allow setting arbiter on failed proposals

* fix matching and arbiter related tests
 2019-02-15 22:35:25 -05:00
Aaron 00dedfbfc0
trigger redux auth state update based on custom auth header 2019-02-15 21:07:41 -06:00
Daniel Ternyak 7b365a28c7
Address user directly in error messages 2019-02-15 13:09:51 -06:00
Daniel Ternyak d01827ec43
Merge branch 'develop' into user-banning 2019-02-15 12:12:18 -06:00
Aaron f30d53c21c
Merge branch 'develop' into user-banning 
# Conflicts:
#	backend/grant/utils/pagination.py
 2019-02-14 22:25:03 -06:00
Aaron 1d811bb7d3
BE: user banning + silencing + pagination 2019-02-14 22:11:47 -06:00
Will O'Beirne 31345c57b6
Merge develop in 2019-02-14 19:08:18 -05:00
Aaron 16ed593304
Merge branch 'develop' into zcash-milestones 
# Conflicts:
#	frontend/client/modules/create/utils.ts
 2019-02-13 14:38:52 -06:00
Aaron 47f827693d
mileston payout emails + some bug fixes 2019-02-13 14:30:58 -06:00
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 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
Daniel Ternyak f2e685b1d6
Merge branch 'develop' into finalize-categories 2019-02-11 16:47:07 -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 7d6d38552c
remove DApp category 2019-02-10 16:15:36 -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
Will O'Beirne 74fba18f99
Fix contribution matching. Add deets to rfp detail admin. 2019-02-08 14:11:52 -05:00
Will O'Beirne 263764255b
Frontend for new RFP fields. 2019-02-08 14:02:34 -05:00
Will O'Beirne 1d1f3bb007
Admin interface for new fields. 2019-02-08 11:54:20 -05:00
Will O'Beirne b03a9d3caf
Update RFP model with new fields, api endpoint for editing them. 2019-02-07 15:35:33 -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
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