af39ac6942
admin refactor - use generic page fn on store where apropo
2019-02-17 14:21:53 -06:00
fe908f449a
Pageable: handle null filters
2019-02-17 14:20:55 -06:00
e8d6f659e8
basic comment pagination + admin moderation
2019-02-17 13:15:40 -06: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
84dd969136
Merge pull request #212 from grant-project/redux-alien-auth-events
...
Handle External Auth Events & Fix Double Loading
2019-02-16 09:05:54 -06:00
be259af0cd
Merge branch 'develop' into redux-alien-auth-events
2019-02-16 08:50:37 -06:00
5554f18273
remove commented code
2019-02-15 21:43:32 -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
f489b093f6
scripts were getting rendered to html twice, causing double init
2019-02-15 21:28:06 -06:00
00dedfbfc0
trigger redux auth state update based on custom auth header
2019-02-15 21:07:41 -06:00
30557e3b9c
Merge pull request #207 from grant-project/user-banning
...
User banning
2019-02-15 13:12:30 -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
813e3b5f93
Merge branch 'develop' into user-banning
2019-02-15 13:53:44 -05:00
9fc9da8c44
Remove Dapp category from Admin ( #208 )
2019-02-15 13:53:27 -05:00
d01827ec43
Merge branch 'develop' into user-banning
2019-02-15 12:12:18 -06:00
fe5632dc75
Merge pull request #179 from grant-project/rfp-fields
...
RFP Fields (matching, bounty, dates)
2019-02-15 12:05:59 -06:00
ac3bfb66c8
Tags for list view, bold bounty and matching on detail view.
2019-02-15 12:46:50 -05: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
7090d3e97b
admin: user pagination + silencing + banning
2019-02-14 22:18:43 -06:00
1d811bb7d3
BE: user banning + silencing + pagination
2019-02-14 22:11:47 -06:00
99f0ec5ba2
Merge branch 'rfp-fields' of github.com:dternyak/zcash-grant-system into rfp-fields
2019-02-14 19:14:31 -05:00
170510e1b8
Set initialValue of matching field on RFPs.
2019-02-14 19:14:03 -05:00
030ac64391
Fix migration
2019-02-14 19:08:48 -05:00
31345c57b6
Merge develop in
2019-02-14 19:08:18 -05:00
90d5cae094
Merge pull request #194 from grant-project/zcash-milestones
...
Zcash milestones
2019-02-14 15:37:12 -06: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
c47c69ea3c
tsc fixes
2019-02-11 23:42:21 -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
55994025c6
Merge pull request #189 from grant-project/finalize-categories
...
Finalize Categories
2019-02-11 16:48:19 -06:00
f2e685b1d6
Merge branch 'develop' into finalize-categories
2019-02-11 16:47:07 -06:00
589702c394
Merge pull request #187 from grant-project/arbiter-management
...
Arbiter management
2019-02-11 16:21:12 -06:00
72c3d6b507
join arbiter filter queries + use flush to get proposal.id on create
2019-02-11 15:59:29 -06:00
ac5bef5c6f
FE: rework milestones first pass
2019-02-11 15:22:40 -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
af5c7ed630
Merge pull request #178 from grant-project/comment-placeholder
...
Show disabled comment form to unverified users
2019-02-10 13:58:02 -06:00
c4b7e281a5
Merge branch 'develop' into comment-placeholder
2019-02-10 13:34:36 -06:00
536a98694c
handle not signed in users
2019-02-10 13:33:02 -06:00
5ec50718dd
fix indentation bug
2019-02-09 22:03:55 -06:00
6a0961a015
disable arbiter button when proposal status not LIVE
2019-02-09 21:18:26 -06:00
7a036058f6
FE: more robust arbiter + arbiter accept email validation code page
2019-02-09 21:03:19 -06:00
5b44f5dcd7
admin: more robust arbiter
2019-02-09 21:00:49 -06:00
9831bc03db
BE: more robust arbiter + arbiter status + arbiter accept email code
2019-02-09 20:58:40 -06:00
Aaron
William O'Beirne
Daniel Ternyak