Commit Graph

79 Commits

Author SHA1 Message Date
Daniel Ternyak 5a15022987
ZF Grants 2.1 (#496)
* fix ccr pagination defaults

* add ccr admin tests

* add ccr user tests

* checkpoint

* fix tslint

* request changes discussion flow mvp

* admin - add discussion status

* backend - add live drafts

* admin - add live drafts

* frontend - add live drafts

* frontend - add edit discussion proposal

* fix tsc

* include DISCUSSION status in propsal listview

* do not make live draft on admin request changes

* hide live drafts from user proposal draft list

* fix backend tests

* add admin tests

* add user tests

* fix: liking, viewing discussion proposals, admin menu

* admin - update hints for live drafts

* fe - add better messaging when updating a proposal

* be - fix like test

* remove TODO comments

* add new email types

* fix storybook

* add revision tab story

* backend - implement proposal revisions

* frontend - implement proposal revisions

* update revision tab story

* fix lint

* remove set detection

* email proposal followers on revision

* restrict banner to team members only

* misc bug fixes

* update, add backend tests

* add milestone title change to revision history story

* fix milestones display in preview

* allow archived proposals to be queried

* implement archived proposal page

* fix tsc

* implement archived proposal get route

* move styling into less

* remove proposal archive parent id

* handle archived proposal status

* cleanup

* remove contributions, switch to USD, implement quarters

* use Qs to preserve formatting

* handle edit only kyc

* prevent ARCHIVED proposals from being sent to admin

* display latest revision first

* admin - proposal & ccr reject permanently

* backend - proposal & ccr reject permanently

* frontend - proposal & ccr reject permanently

* fix tsc

* use $ in milestone payout email

* introduce custom filters to proposal listview

* hide archive link on first revision

* upgrade packages

* add bech32 implementation

* add z address validation with tests

* fix tslint

* use local address validation

* fix tests, remove blockchain mock gets

* add additional bad addresses

* update briefs to include page break message

* remove contributions routes, menu entry

* disable countribution count admin stats

* remove matching and pretty print in finance

* fix tslint

* separate out rejected permanently proposals

* make removing proposals generic

* allow linked tabs to be ignored

* remove rejected permanently, bugfix

* update preview link to point to rejected tab

* implement rejected permanently tab, add tab message

* refactor variable

* fix tslint

* fix tslint

* send ccr reject permanently email on rejection

* fix preview message

* wire up proposal arbiter and rejected emails

* disable tip jar in proposal and profile

* sync ccr/proposal drafts on create form init

* check invites on submit modal open

* update team invite language

* update team text when edit

* fix ccr rejected permanently tag

* text changes, email preview fix

* display changes requested tag when in discussion with changes requested

* enable social share on open for discussion proposals, update language

* place sort below filter

* derive filter from query string

* use better filter names in query params

* fix tslint

* create snapshot of original proposal on first revision

* clear invites between edits, account for additional changes not tracked in revisions

* update tests

* fix test

* remove print

* SameSite Fixes (#150)

* QA Fixes 2 (#151)

* set filters as query strings on change

* remove rejected permanently tags

* add dollar sign in financials legend

* fix tsc

* Copy Touchups (#152)

* Email Fixes (#155)

* fix ZEC in milestone payout emails

* fix links in rejected permanently CCR/proposal emails

* Poll for Team and Invite Changes in Create Flow (#153)

* poll for team and invite changes in create flow

* fix tslint

Co-authored-by: Daniel Ternyak <dternyak@gmail.com>

* pretty print payouts by quarter (#156)

Co-authored-by: Daniel Ternyak <dternyak@gmail.com>

* Remove Blockchain Module (#154)

* remove blockchain route from backend, remove calls to node

* revert blockchain_get removal

* Add Tags to Proposal Cards (#157)

* add tag to proposals and dynamically set v1 card height

* listen on window resize

* make card height props optional

* set tag in bottom right, remove dynamic card resize, add dynamic tag resize

* cleanup

* cleanup

Co-authored-by: Daniel Ternyak <dternyak@gmail.com>

* Improve Frontend Address Validation (#158)

Co-authored-by: Daniel Ternyak <dternyak@gmail.com>

* Remove blockchain module (#162)

* remove blockchain route from backend, remove calls to node

* revert blockchain_get removal

* Remove Blockchain App (#160)

* remove blockchain app

* remove blockchain app from travis

Co-authored-by: Danny Skubak <skubakdj@gmail.com>

* Proposal Edit Fixes (#161)

* fe - display error if edit creation fails

* be - restrict live draft publish

Co-authored-by: Daniel Ternyak <dternyak@gmail.com>

* Restrict Arbiter Assignment (#159)

Co-authored-by: Daniel Ternyak <dternyak@gmail.com>

* Email Copy updates

* Remove Admin Financials Card

* Hookup 'proposal_approved_without_funding' to admin email example

* bump various package versions

* Update yarn.lock files

* Attach 'proposal_approved_without_funding' to backend example email

* bump package versions

Co-authored-by: Danny Skubak <skubakdj@gmail.com>
2020-04-07 21:56:32 -05:00
Daniel Ternyak 3311be8e98
CCRs (#86)
* CCRs API / Models boilerplate

* start on frontend

* backendy things

* Create CCR redux module, integrate API endpoints, create types

* Fix/Cleanup API

* Wire up CreateRequestDraftList

* bounty->target

* Add 'Create Request Flow' MVP

* cleanup

* Tweak filenames

* Simplify migrations

* fix migrations

* CCR Staking MVP

* tslint

* Get Pending Requests into Profile

* Remove staking requirement

* more staking related removals

* MVP Admin integration

* Make RFP when CCR is accepted

* Add pagination to CCRs in Admin
Improve styles for Proposals

* Hookup notifications
Adjust copy

* Simplify ccr->rfp relationship
Add admin approval email
Fixup copy

* Show Message on RFP Detail
Make Header CTAs change based on draft status
Adjust proposal card style

* Bugfix: Show header for non signed in users

* Add 'create a request' to intro

* Profile Created CCRs
RFP CCR attribution

* ignore

* CCR Price in USD  (#85)

* init profile tipjar backend

* init profile tipjar frontend

* fix lint

* implement tip jar block

* fix wrapping, hide tip block on self

* init backend proposal tipjar

* init frontend proposal tipjar

* add hide title, fix bug

* uncomment rate limit

* rename vars, use null check

* allow address and view key to be unset

* add api tests

* fix tsc errors

* fix lint

* fix CopyInput styling

* fix migrations

* hide tipping in proposal if address not set

* add tip address to create flow

* redesign campaign block

* fix typo

* init backend changes

* init admin changes

* init frontend changes

* fix backend tests

* update campaign block

* be - init rfp usd changes

* admin - init rfp usd changes

* fe - fully adapt api util functions to usd

* fe - init rfp usd changes

* adapt profile created to usd

* misc usd changes

* add tip jar to dedicated card

* fix tipjar bug

* use zf light logo

* switch to zf grants logo

* hide profile tip jar if address not set

* add comment, run prettier

* conditionally add info icon and tooltip to funding line

* admin - disallow decimals in RFPs

* fe - cover usd string edge case

* add Usd as rfp bounty type

* fix migration order

* fix email bug

* adapt CCRs to USD

* implement CCR preview

* fix tsc

* Copy Updates and UX Tweaks (#87)

* Add default structure to proposal content

* Landing page copy

* Hide contributors tab for v2 proposals

* Minor UX tweaks for Liking/Following/Tipping

* Copy for Tipping Tooltip, proposal explainer for review, and milestone day estimate notice.

* Fix header styles bug and remove commented out styles.

* Revert "like" / "unfollow" hyphenication

* Comment out unused tests related to staking
Increase PROPOSAL_TARGET_MAX in .env.example

* Comment out ccr approval email send until ready

* Adjust styles, copy.

* fix proposal prune test (#88)

* fix USD display in preview, fix non-unique key (#90)

* Pre-stepper explainer for CCRs.

* Tweak styles

* Default content for CCRs

* fix tsc

* CCR approval and rejection emails

* add back admin_approval_ccr email templates

* Link ccr author name to profile in RFPs

* copy tweaks

* copy tweak

* hookup mangle user command

* Fix/add endif in jinja

* fix tests

* review

* fix review
2019-12-05 19:01:02 -06:00
Danny Skubak 597472b5c6 remove funded proposals from arbiter count (#92) 2019-12-03 18:02:56 -06:00
Danny Skubak 8cfec5de5d Remove Categories (#63)
* remove category from admin

* remove category from frontend, add likes to proposal card view

* make category nullable in backend, remove from views

* add db migration

* remove category from frontend rfp

* update tests

* remove category from admin proposal

* remove category from rfp put

* remove moment

* remove moment
2019-11-13 17:23:36 -06:00
Danny Skubak ed6d98ceec Milestone Estimate in Days (#59)
* init admin milestone estimate in days

* init frontend milestone estimate in days

* init backend milestone estimate in days

* fix bugs

* fix bugs

* fix tests

* add tests

* add milestone_deadline email to examples

* fix type errors

* fix tests

* remove comment

* temp prep for merge

* restore changes, update tests

* add db migration

* add tests and comments for set_v2_date_estimates
2019-11-13 16:38:17 -06:00
Danny Skubak 25e43a34ff Update Accepted Without Funding (#35)
* backend - init endpoints and model changes

* backend - add tests

* admin - add change to accepted with funding functionality

* backend - fix tests
2019-10-23 16:44:19 -05:00
Danny Skubak 5799ffab19 Proposal Subscription (#31)
* init proposal subscribe be and fe

* add subscription email templates

* wire up subscription emails

* email subscribers on proposal milestone, update, cancel

* disallow subscriptions if email not verified

* update spelling, titles

* disallow proposal subscribe if user is team member

* hide subscribe if not signed in, is team member, canceled

* port follow from grant-base

* remove subscribed

* convert subscribed to follower

* backend - update tests

* frontend - fix typings

* finish follower port

* update comment

* fix email button display issues

* remove loading on AuthButton to prevent two spinners
2019-10-23 16:34:10 -05:00
Danny Skubak fb6b9b5af7 Proposal Lifecycle & Crowdfunding (#23)
* add proposal versioning

* remove deadlines

* update proposal lifecycle for admin

* update proposal lifecycle for backend

* update proposal lifecycle for frontend

* fix tests

* remove acceptedWithFunding

* fix lint, remove commented code

* remove commented code

* refactor backend to provide isVersionTwo

* refactor backend to provide isVersionTwo

* Revert "refactor backend to provide isVersionTwo"

This reverts commit e3b9bc661081e482326f83fa6aa517cf6bdebe6c.

* use isVersionTwo in admin

* add acceptedWithFunding

* trigger ci

* remove "version"

* remove "version"

* remove rejected from campaign block
2019-10-16 22:43:20 -05:00
AMStrix 8819ee3035 Rework Contribution Privacy (#456)
* rework contribution privacy
- add ProposalContribution.privacy
- remove ProposalContribution.no_refund
- anonymous contribution only if not logged in
- logged in contributions can be optionally attributed
- refunds can happen if a user has  a refund address

* admin: upgrade react-easy-state (had memory leak)

* be: filter users private contributions for others

* Adjust copy to be more accurate.

* Add copy for setting refund addresses (#458)
2019-06-11 21:49:14 -05:00
Aaron 1ae16004e5
be: filter canceled from stats ms payouts count 2019-05-27 14:43:50 -05:00
Daniel Ternyak 3143ea8231
filter out cancelled proposals from 'proposal_no_arbiter_count' 2019-05-25 19:35:48 -05:00
Aaron 96b9bc3c49
check calcs of grant totals for proposals that are over-funded 2019-04-16 15:53:19 -05:00
William O'Beirne edd2260423
Update RFP copy + fix admin bug (#414)
* Update RFP copy and use dangerous html to get a link working. Also fix an RFP create bug.

* Capitalize
2019-03-28 13:13:12 -04:00
AMStrix c41d74c0fa String replacement for block explorer URL (#384)
use string replace to build block explorer url
2019-03-15 00:16:38 -04:00
AMStrix 1d07997a7a Moar bugs (#379)
* #376 fix milestone passed to milestone_paid email

* #374 fix admin contribution PUT/POST status validation

* #373 fix updates & contributors tabs of Proposal
2019-03-14 22:26:28 -05:00
Daniel Ternyak 9b542ab1f1
More webargs validation (#344) 2019-03-14 15:29:02 -05:00
William O'Beirne 9d0591918e Require refund address or confirm donation (#354)
* Add API check to disallow unsetting refund address.

* Require either refund address to be set or explicit consent for a donation. Dont have them show up as refundable in admin.

* Show donations on financials page

* Continue after entry

* Consider no_refund when checking for duplicate contribution.

* Fix types.

* Add a filter for all contributions that are considered donations. Update financial query to include donations.

* Elaborate in message.
2019-03-13 18:36:24 -05:00
AMStrix c291d41d4e Admin financials (#310)
* admin: financials basics

* BE: allow missing emailSettings on user settings EP

* admin: add webpack import loader for ant-design-pro (for styles loading)

* BE: admin financials reporting

* admin: financials page

* admin financials - convert contribution and payout total summations to sql

* Handle some kinda failure case.

* admin: remove "accounting" card from financials
2019-03-12 13:08:16 -04:00
AMStrix 1d2228a394 Flexible Matching/Bounties + KYC (#277)
* BE: proposal rfp opt in & proposal bounty

* admin: proposal rfp opt in display & modify bounty

* FE: proposal rfp opt in / proposal.contributionBounty

* fix github merge (so close)

* add status field to update_rfp

* handle only showing canel and refund popover correctly

* undo unneeded change

* BE: make sure rfp.bounty is None when it is set to '0' or null during create/update
2019-03-06 14:25:58 -06:00
Will O'Beirne 2cc5ade673
Sort homepage rfps by bounty. Fix admin views and some bounty logic. 2019-03-04 13:52:57 -05:00
Daniel Ternyak f950e17397
Webargs Request Parsing (#228) 2019-03-01 14:11:03 -06:00
Will O'Beirne 06add917b5
Merge branch 'develop' into anonymous-contributions 2019-02-23 16:53:59 -05:00
William O'Beirne 8bf7013b0f
Cancel proposal (#253)
* Backend setup for proposal canceling.

* Cancelable in admin, update all states to properly reflect a canceled proposal.

* Replace REFUNDING stage with CANCELED and FAILED to distinguish between the 2

* Fix pending contributions showing up as needing refunds.

* Fix some refund cases.

* Dont show failed & canceled proposals on list view. Hide their filters.

* Show when proposal was canceled.

* Remove edit action, make cancel an explanation to contact support.

* Fix PR comments

* Fix issues from develop merge.
2019-02-23 16:38:06 -05:00
Will O'Beirne 115b127962
Initial pass at anon contributions on frontend. 2019-02-23 15:31:07 -05:00
Aaron a71f65a387
admin: add allow_stale option to throw_on_2fa_not_allowed 2019-02-22 11:55:45 -06:00
Aaron 3f7c90a381
admin: require email verification for admin login/setup 2019-02-21 19:39:37 -06:00
Aaron 64740b9f37
merge fixes: migration & admin/views 2019-02-21 18:56:00 -06:00
Aaron 43ee574899
Merge branch 'develop' into admin-users
# Conflicts:
#	backend/grant/admin/views.py
2019-02-21 18:44:58 -06:00
Aaron e1572de3f6
fix tests and add 2fa setup flow test 2019-02-21 18:39:41 -06:00
Aaron c30fa69152
2fa admin setup + login process 2019-02-21 16:23:46 -06:00
Will O'Beirne 6994bd9a67
Fix staking, fix being unable to edit contributions while staking. 2019-02-21 13:21:46 -05:00
Will O'Beirne a65c061f1d
Add staking column to contribution. Exclude staking contributions from refunds. 2019-02-21 13:02:29 -05:00
Will O'Beirne 6f50a7ae28
Merge develop in. 2019-02-21 12:17:48 -05:00
Aaron f49b58dca4
totp basics + remove old admin env key stuff 2019-02-20 16:35:13 -06:00
Will O'Beirne 05372e572b
PR feedback fixes. 2019-02-20 16:44:12 -05:00
Aaron cc07fb7797
admin: edit user admin status 2019-02-20 12:04:25 -06:00
Will O'Beirne 58c0f8cfdc
Remove unused imports 2019-02-19 12:20:17 -05:00
Will O'Beirne af7bc08828
Simplify logic. 2019-02-19 12:19:47 -05:00
Will O'Beirne ea35f7874c
Fail emails and task. 2019-02-19 12:13:13 -05:00
Aaron e8c7dad87f
be & admin moderation & reporting for proposal comments 2019-02-18 15:31:20 -06:00
Aaron e8d6f659e8
basic comment pagination + admin moderation 2019-02-17 13:15:40 -06:00
Will O'Beirne 7314631ea5
Admin refunds of contributions 2019-02-17 11:52:35 -05: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
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 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 72c3d6b507
join arbiter filter queries + use flush to get proposal.id on create 2019-02-11 15:59:29 -06:00