Commit Graph

75 Commits

Author SHA1 Message Date
Daniel Ternyak 625a6cab99
don't show popovers, remove delete, add tsc to admin pre-commit 2019-02-27 16:50:53 -06: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
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
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
Will O'Beirne 64da535650
Fix status lock 2019-02-08 11:59:52 -05:00
Will O'Beirne 1d1f3bb007
Admin interface for new fields. 2019-02-08 11:54:20 -05:00
Aaron 239c7a3432
make Pageable filters more generic (not just statuses) 2019-02-07 11:51:16 -06: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 126beec1dc
Convert txid deet to input. 2019-02-06 17:35:33 -05:00
Will O'Beirne df96094ed9
Fix deet style. 2019-02-06 17:33:43 -05: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 649d4c220f
admin set/change proposal arbiter 2019-02-06 12:38:07 -06:00
Will O'Beirne d4917dfd51
Contribution detail page. 2019-02-06 13:01:14 -05:00
Will O'Beirne 2f3161ae4b
Generecize pageable. List view of contributions. 2019-02-06 12:47:47 -05:00