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
05372e572b
PR feedback fixes.
2019-02-20 16:44:12 -05: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
47f827693d
mileston payout emails + some bug fixes
2019-02-13 14:30:58 -06:00
fd9a4c5393
full payout flow operational
2019-02-13 10:54:46 -06:00
380eec005e
payout endpoints + redux actions + ms UX refactors
2019-02-11 23:10:09 -06:00
ce0ce4feef
fix migration history
2019-02-11 17:03:39 -06:00
dc92d3f297
Merge branch 'develop' into zcash-milestones
...
# Conflicts:
# backend/grant/proposal/models.py
# backend/grant/utils/enums.py
# frontend/client/modules/create/utils.ts
# frontend/stories/props.tsx
# frontend/types/proposal.ts
2019-02-11 16:51:31 -06:00
f2e685b1d6
Merge branch 'develop' into finalize-categories
2019-02-11 16:47:07 -06:00
72c3d6b507
join arbiter filter queries + use flush to get proposal.id on create
2019-02-11 15:59:29 -06:00
4e5c0eaea7
BE: more milestone fields
2019-02-11 15:08:51 -06:00
7d6d38552c
remove DApp category
2019-02-10 16:15:36 -06:00
f15c110f92
Merge branch 'develop' into arbiter-management
2019-02-10 15:53:29 -06:00
5ec50718dd
fix indentation bug
2019-02-09 22:03:55 -06:00
9831bc03db
BE: more robust arbiter + arbiter status + arbiter accept email code
2019-02-09 20:58:40 -06:00
2dcc1c8cad
Merge branch 'develop' into resend-verification
2019-02-08 15:18:31 -05:00
9d82140c48
Fix parser error by parsing unix with 'datetime' instead of dateutil
2019-02-08 15:12:44 -05:00
2a0e12194c
Add resend button to email settings
2019-02-08 14:57:54 -05:00
74fba18f99
Fix contribution matching. Add deets to rfp detail admin.
2019-02-08 14:11:52 -05:00
Will O'Beirne
Daniel Ternyak
Aaron