Commit Graph

598 Commits

Author SHA1 Message Date
Will O'Beirne 2662e20389
Fix contribution status tag display. 2019-02-25 15:06:30 -05:00
Will O'Beirne 8a193756b3
Fix unsafe behavior in marshmallow class for contributions. 2019-02-25 15:04:33 -05:00
Will O'Beirne 5cb08a1f14
Only bootstrap with contributions made in the last 24h, to reduce payload size. 2019-02-25 15:03:52 -05:00
Will O'Beirne 560f63847e
More considerations for anonymous contributions on the frontend. 2019-02-25 14:46:47 -05:00
Will O'Beirne ad26bb1fd7
Downgrade sentry to be more stable. 2019-02-25 14:27:06 -05:00
Will O'Beirne 31d458e067
Make contribution code handle not having a user in all cases. 2019-02-25 14:26:43 -05:00
Will O'Beirne a2d89f2910
Pose a warning to user before contributing anonymously. Handle anonymous user in user row. 2019-02-25 14:26:02 -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
AMStrix 0b2676563a fe: Placeholder loading state & use it for profile tabs + RFPs list (#255) 2019-02-23 16:46:35 -05:00
William O'Beirne c6318e27f7
Up request limit to 50mb (#257) 2019-02-23 16:42:36 -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
AMStrix 4c026f5645
Merge pull request #252 from grant-project/admin-users
Admin users
2019-02-23 15:21:59 -06:00
William O'Beirne 076bcc67bf
Merge branch 'develop' into admin-users 2019-02-23 16:08:06 -05:00
William O'Beirne c35b62b6c4
Email subscription fixes (#243)
* Lookup user email subscription settings by email instead of hoping a user is passed.

* Functioning unsubscribe URLs
2019-02-23 15:33:19 -05:00
Will O'Beirne 115b127962
Initial pass at anon contributions on frontend. 2019-02-23 15:31:07 -05:00
William O'Beirne ae62b726ce
Rip sprout out. (#254) 2019-02-23 15:19:33 -05:00
Will O'Beirne eb47e3e0aa
Allow for no user with contributions in admin. 2019-02-22 15:51:46 -05:00
Aaron a71f65a387
admin: add allow_stale option to throw_on_2fa_not_allowed 2019-02-22 11:55:45 -06: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 e3fd6aa398
clean recovery codes before saving and checking 2019-02-22 10:13:29 -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 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
William O'Beirne b93348820c
Redirect to proposal if you try to edit and its not in draft state. (#242) 2019-02-21 17:07:55 -05:00
Daniel Ternyak acb16771bc
Merge pull request #231 from grant-project/refund-flow
Failed proposal refunds
2019-02-21 13:50:52 -06:00
Will O'Beirne 772b3529fa
Fix stake confirmed test. 2019-02-21 13:43:20 -05: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 733a664cc6
Exclude staking contributions from funding amount or contribution lists. 2019-02-21 13:07:11 -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
Daniel Ternyak a4c7f25442
Merge pull request #227 from grant-project/comment-moderation
Comment moderation
2019-02-20 15:52:05 -06:00
Daniel Ternyak 95c1f26153
Merge branch 'develop' into comment-moderation 2019-02-20 15:51:55 -06:00
Daniel Ternyak 825e7a84bc
Merge pull request #237 from grant-project/milestone-validation
Better Milestone Validation
2019-02-20 15:49:36 -06:00
Daniel Ternyak d128d110e6
Merge branch 'develop' into milestone-validation 2019-02-20 15:44:30 -06:00
Will O'Beirne 05372e572b
PR feedback fixes. 2019-02-20 16:44:12 -05:00
Will O'Beirne 55687a81af
More granular milestone errors. 2019-02-20 16:34:05 -05:00
Aaron cc07fb7797
admin: edit user admin status 2019-02-20 12:04:25 -06:00
Aaron c067d3e9ad
user is_admin field with working migration 2019-02-20 11:35:47 -06:00
Aaron 135ff9fff3
Merge branch 'develop' into admin-users 2019-02-20 11:22:42 -06:00
Daniel Ternyak 5a7235ab49
Merge branch 'develop' into comment-moderation 2019-02-19 16:46:03 -06:00
Daniel Ternyak 95d57983e3
Merge pull request #236 from grant-project/proposal-unlink
Proposal RFP unlinking
2019-02-19 16:44:40 -06:00
Daniel Ternyak 58ebdeb9fa
Merge branch 'develop' into proposal-unlink 2019-02-19 16:36:59 -06:00