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
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
076bcc67bf
Merge branch 'develop' into admin-users
2019-02-23 16:08:06 -05:00
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
ae62b726ce
Rip sprout out. ( #254 )
2019-02-23 15:19:33 -05:00
a71f65a387
admin: add allow_stale option to throw_on_2fa_not_allowed
2019-02-22 11:55:45 -06:00
e3fd6aa398
clean recovery codes before saving and checking
2019-02-22 10:13:29 -06:00
35661a0672
admin Settings & reset MFA
2019-02-21 23:22:16 -06:00
3f7c90a381
admin: require email verification for admin login/setup
2019-02-21 19:39:37 -06:00
64740b9f37
merge fixes: migration & admin/views
2019-02-21 18:56:00 -06:00
43ee574899
Merge branch 'develop' into admin-users
...
# Conflicts:
# backend/grant/admin/views.py
2019-02-21 18:44:58 -06:00
e1572de3f6
fix tests and add 2fa setup flow test
2019-02-21 18:39:41 -06:00
c30fa69152
2fa admin setup + login process
2019-02-21 16:23:46 -06:00
772b3529fa
Fix stake confirmed test.
2019-02-21 13:43:20 -05:00
6994bd9a67
Fix staking, fix being unable to edit contributions while staking.
2019-02-21 13:21:46 -05:00
733a664cc6
Exclude staking contributions from funding amount or contribution lists.
2019-02-21 13:07:11 -05:00
a65c061f1d
Add staking column to contribution. Exclude staking contributions from refunds.
2019-02-21 13:02:29 -05:00
6f50a7ae28
Merge develop in.
2019-02-21 12:17:48 -05:00
f49b58dca4
totp basics + remove old admin env key stuff
2019-02-20 16:35:13 -06:00
05372e572b
PR feedback fixes.
2019-02-20 16:44:12 -05:00
cc07fb7797
admin: edit user admin status
2019-02-20 12:04:25 -06:00
c067d3e9ad
user is_admin field with working migration
2019-02-20 11:35:47 -06:00
5a7235ab49
Merge branch 'develop' into comment-moderation
2019-02-19 16:46:03 -06:00
abcfc64dcc
filter out top-level comments via sql so pagination is not borked
2019-02-19 15:30:32 -06:00
6749626249
prune "dead" comments during serialization
2019-02-19 15:01:25 -06:00
5163d87172
Add link for unlinking proposals from requests.
2019-02-19 14:48:51 -05:00
58c0f8cfdc
Remove unused imports
2019-02-19 12:20:17 -05:00
af7bc08828
Simplify logic.
2019-02-19 12:19:47 -05:00
ea35f7874c
Fail emails and task.
2019-02-19 12:13:13 -05:00
10d70ec4f6
fix UserCommentSchema
2019-02-18 17:59:22 -06:00
8ef9a7e5e4
comment reporting for moderation
2019-02-18 16:35:21 -06:00
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
e8c7dad87f
be & admin moderation & reporting for proposal comments
2019-02-18 15:31:20 -06:00
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
e8d6f659e8
basic comment pagination + admin moderation
2019-02-17 13:15:40 -06:00
7314631ea5
Admin refunds of contributions
2019-02-17 11:52:35 -05:00
1be2c5c945
Add bounty banner to campaign block. Reflect bounty in funded amount. Fix some of the cases that opens up. ( #213 )
2019-02-16 12:32:26 -05:00
cbe0ed659c
Add refund address to settings, editable on the account page.
2019-02-16 11:49:32 -05:00
be259af0cd
Merge branch 'develop' into redux-alien-auth-events
2019-02-16 08:50:37 -06:00
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
00dedfbfc0
trigger redux auth state update based on custom auth header
2019-02-15 21:07:41 -06:00
7b365a28c7
Address user directly in error messages
2019-02-15 13:09:51 -06:00
6fb576c8a6
Fix revision branch.
2019-02-15 13:57:04 -05:00
d01827ec43
Merge branch 'develop' into user-banning
2019-02-15 12:12:18 -06:00
0c4cb59262
fix migration branch
2019-02-14 22:50:16 -06:00
f30d53c21c
Merge branch 'develop' into user-banning
...
# Conflicts:
# backend/grant/utils/pagination.py
2019-02-14 22:25:03 -06:00
1d811bb7d3
BE: user banning + silencing + pagination
2019-02-14 22:11:47 -06:00
030ac64391
Fix migration
2019-02-14 19:08:48 -05:00
31345c57b6
Merge develop in
2019-02-14 19:08:18 -05:00
16ed593304
Merge branch 'develop' into zcash-milestones
...
# Conflicts:
# frontend/client/modules/create/utils.ts
2019-02-13 14:38:52 -06:00
AMStrix
William O'Beirne
Daniel Ternyak