Commit Graph

67 Commits

Author SHA1 Message Date
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
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 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
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