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

47 Commits

Author SHA1 Message Date
Will O'Beirne 6fb576c8a6
Fix revision branch. 2019-02-15 13:57:04 -05:00
Daniel Ternyak d01827ec43
Merge branch 'develop' into user-banning 2019-02-15 12:12:18 -06:00
Aaron 0c4cb59262
fix migration branch 2019-02-14 22:50:16 -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 030ac64391
Fix migration 2019-02-14 19:08:48 -05:00
Will O'Beirne 31345c57b6
Merge develop in 2019-02-14 19:08:18 -05: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 4e5c0eaea7
BE: more milestone fields 2019-02-11 15:08:51 -06:00
Aaron 9831bc03db
BE: more robust arbiter + arbiter status + arbiter accept email code 2019-02-09 20:58:40 -06:00
Will O'Beirne 263764255b
Frontend for new RFP fields. 2019-02-08 14:02:34 -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 2868d93fa1
proposal arbiter BE basics + initial admin work 2019-02-05 14:45:26 -06: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
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 f1ddc7d0cf
PR review adjustments 2019-01-28 21:00:55 -06:00
Daniel Ternyak b9a88d7276
MVP task architecture 2019-01-27 22:59:15 -06:00
Daniel Ternyak 9727134ac0
Run reformatter on all files 2019-01-22 23:35:22 -06:00
AMStrix 8de3b4e3c8 Email settings + unsubscribe (#75) 
* user subscription_settings utils + tests

* UserSettings user/models updates

* GET /<user_id>/settings endpoint

* PUT /<user_id>/settings + more tests + refactoring

* Email Notifications settings tab

* email subscription verbiage

* email-unsubscribe page + refactors

* hook up send_email for proposal approval + add subscription checks to send_email

* fix merge bug

* Send email on contribution. Dont double-count contributions from the blockchain watcher.

* Proposal contribution email, and fix email admin.

* Send email to team on contribution received.

* Email comment creator of their replies.

* Send comments to proposal creator. Adjust templates for all comment emails.

* Send email on contribution update.
 2019-01-16 17:26:44 -05:00
Will O'Beirne 749dc40ea4
Re-wipe migrations. 2019-01-09 16:35:47 -05:00
William O'Beirne 7ade6b5715
Merge branch 'develop' into zcash-contributions 2019-01-09 14:08:51 -05:00
AMStrix 47c695f43b Proposal Approval Process (#39) 
* endpoints and model support for proposal approval

* admin test + proposal approval tests

* GET user/<id> withPending support

* basic withPending suport for Profile

* change create publish to sumbit for approval

* admin proposal filter by status + some refactoring

* admin: update antd

* backend: admin get single proposal + populate date_approved

* admin: rework Proposals + support approval

* backend: approval process updates

* admin: review count on home + cosmetic

* frontend: proposal approval flow

* Profile ZEC/ZAT adjustments

* fix regression in formatUserFromGet + update error type in users/reducers

* fix merge tsc issues

* publish warning vebiage change

* fix ssr fetchProposal 404 hang bug

* proposals/<id> - limit status non-LIVE to team member, exclude DELETED

* various adjustments to Proposal based on `status`

* remove comments

* Proposal statuses to banner style + fix up CreateFlow - Preview mode

* Proposal tsc fix
 2019-01-09 13:23:08 -05:00
Will O'Beirne 6066b7adf0
Wipe migrations. Fix tests. 2019-01-08 12:44:54 -05:00
Will O'Beirne c444e5152d
Hook up blockchain to backend, backend to frontend for contributions. 2019-01-07 01:58:33 -05:00
William O'Beirne 99fdedb816 Initial work on contribution modal flow and contribution model overhaul. 2019-01-06 17:48:07 -05:00
AMStrix 22f8a0415c Verify User Social via OAuth (#30) 
* BE social oauth verify

* FE social oauth verification

* readme updates

* README social verification setup instructions

* adjust tests socialMedias

* BE add social verify tests

* save changes before leaving to OAuth

* Fix migration.

* Adjust social button styles.

* Remove question mark.

* merge fix

* fix migration branch
 2019-01-02 12:23:02 -06:00
William O'Beirne ec76cb414f Initial Proposal rework (#32) 
* Rework proposal model to remove ethereum specific stuff. Removed most traces of those fields around the backend.

* Refactor to a state where /proposlas loads.

* Get rid of the ProposalWithCrowdFund type.

* Fix padding on create flow.
 2018-12-28 17:05:34 -06:00
AMStrix 6ea75e6bda User Recovery Flow (#26) 2018-12-17 12:33:33 -06:00
AMStrix 50cc377b48 User Auth Conversion (#19) 2018-12-14 13:36:22 -06:00
Will O'Beirne c3985a07a3
Merge in develop 2018-11-27 13:21:11 -05:00
Will O'Beirne 02b1260573
Merge in latest changes. 2018-11-26 20:14:00 -05:00
Will O'Beirne f9b4f65ac4
Merge develop in. 2018-11-26 18:47:24 -05:00
Will O'Beirne 5afdb2011d
Merge develop in. 2018-11-26 18:25:02 -05:00
AMStrix d367e6e474 Track proposal contributions (#219) 
* BE proposal contribution tracking

* FE proposal contribution tracking

* validate contributions

* make sure we catch errors in the 'confirmation' listener

* remove console.log

* lowercase from address compare

* remove validate_contribution_tx from post_proposal_contribution
 2018-11-21 21:18:22 -06:00
Will O'Beirne c378c1d1bb
Nail down team invite model. 2018-11-15 16:51:32 -05:00
Will O'Beirne 415b1b7d5c
Blow away migrations due to sqllite issues. 2018-11-14 13:57:05 -05:00
Will O'Beirne 8aceac0c45
Get backend draft updates working. 2018-11-14 12:27:40 -05:00
Will O'Beirne 829d072b8c
Check in work on proposals, drafts 2018-11-13 11:07:09 -05:00
Will O'Beirne 1862b69169
Properly signing, creating, fetching comments. Fix incorrect types. Setup scaffolding for replies. 2018-11-08 13:29:29 -05:00
AMStrix d8eba48847 Readable Proposal URLs (#190) 
* proposal_id -> proposal_address & exposed proposal_id is prooposal.id

* FE proposalId to number + proposalUrlId generation and use
 2018-11-07 12:33:19 -05:00
Daniel Ternyak d3191c6cd8
Fix Migrations (#176) 2018-11-04 23:03:43 +01:00
William O'Beirne 118d7b645e
Proposal updates (#171) 
* Add models & endpoints

* Implement proposal updates.

* Reset state on close. Add missing key. Prompt on close if they will lose stuff.

* Dont warn if they submitted.
 2018-11-02 12:24:28 -04:00
William O'Beirne cdc3ea0107
Email verification (#172) 
* Add email_verification table and endpoints, setup email verification page, adjust emails to actually verify.

* Add User.create method
 2018-11-02 12:07:06 -04:00
Daniel Ternyak 397079869a
"Fuller" Users (#96) 
* check in progress

* revert

* fix up API, add tests

* remove unused milestone commands

* support filtering users via proposalId

* get UI working

* refactoring / add minimum team size.

* fix proposal create API to properly support both email and account based
 2018-09-25 15:09:25 -05:00
Daniel Ternyak 2f513d0ce6
initial commit 2018-09-10 11:55:26 -05:00