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
Daniel Ternyak
7235c15862
Merge branch 'develop' into expired-notif
2019-03-11 13:02:01 -04:00
AMStrix
a271724266
BE: add SESSION_COOKIE_DOMAIN setting ( #311 )
2019-03-07 15:04:40 -05:00
William O'Beirne
9c127648c5
Merge branch 'develop' into expired-notif
2019-03-06 17:37:17 -05:00
Will O'Beirne
1973db1330
Notify user if contribution expires.
2019-03-06 15:33:09 -05: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
William O'Beirne
7bbefe8abe
Update vulnerable packages ( #302 )
...
* Update frontend dependencies.
* Update admin packages.
* Fix content editor with new updates.
* Regenerate lock files.
* Revert "Regenerate lock files."
This reverts commit 93150fcac3
.
* Fix tsc
2019-03-06 12:56:01 -06:00
Daniel Ternyak
6aa6ea5624
Merge branch 'develop' into various-fixes
2019-02-27 17:15:12 -06:00
Daniel Ternyak
625a6cab99
don't show popovers, remove delete, add tsc to admin pre-commit
2019-02-27 16:50:53 -06:00
Will O'Beirne
2662e20389
Fix contribution status tag display.
2019-02-25 15:06:30 -05:00
Will O'Beirne
6f7de989e7
Merge branch 'develop' into anonymous-contributions
2019-02-25 11:43:36 -05:00
AMStrix
77e25b1c7c
Various fixes ( #260 )
...
* remove linkedin social media option
* fix ProfileEdit social media button white-space
* fix default profile tab for non-authed user
* filter out non live proposal contributions for GET user/<id>
* admin: remove 255 char limit on reject_reason
2019-02-25 11:41:00 -05:00
William O'Beirne
4c3a2127a8
Upgrade ant-design-pro to 2.2.1 to fix some dependency issues. ( #258 )
2019-02-25 11:21:37 -05: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
eb47e3e0aa
Allow for no user with contributions in admin.
2019-02-22 15:51:46 -05:00
Aaron
165950f803
admin: tsc fix
2019-02-22 10:27:00 -06:00
Aaron
9071f07443
admin MFAuth refactoring & cosmetics
2019-02-22 10:14:07 -06:00
Aaron
35661a0672
admin Settings & reset MFA
2019-02-21 23:22:16 -06:00
Aaron
3f7c90a381
admin: require email verification for admin login/setup
2019-02-21 19:39:37 -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
c30fa69152
2fa admin setup + login process
2019-02-21 16:23:46 -06: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
Aaron
cc07fb7797
admin: edit user admin status
2019-02-20 12:04:25 -06: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
1a87cadc4d
Merge branch 'develop' into comment-moderation
...
# Conflicts:
# backend/grant/utils/pagination.py
# frontend/client/components/Proposal/Comments/index.tsx
2019-02-18 15:36:31 -06:00
Aaron
e8c7dad87f
be & admin moderation & reporting for proposal comments
2019-02-18 15:31:20 -06:00
Daniel Ternyak
f3640f27ce
remove unused import
2019-02-18 11:03:16 -06:00
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
Aaron
af39ac6942
admin refactor - use generic page fn on store where apropo
2019-02-17 14:21:53 -06:00
Aaron
fe908f449a
Pageable: handle null filters
2019-02-17 14:20:55 -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
William O'Beirne
813e3b5f93
Merge branch 'develop' into user-banning
2019-02-15 13:53:44 -05:00
Daniel Ternyak
9fc9da8c44
Remove Dapp category from Admin ( #208 )
2019-02-15 13:53:27 -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
7090d3e97b
admin: user pagination + silencing + banning
2019-02-14 22:18:43 -06:00
Will O'Beirne
170510e1b8
Set initialValue of matching field on RFPs.
2019-02-14 19:14:03 -05: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
6a0961a015
disable arbiter button when proposal status not LIVE
2019-02-09 21:18:26 -06:00
Aaron
5b44f5dcd7
admin: more robust arbiter
2019-02-09 21:00:49 -06: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