Will O'Beirne
|
170510e1b8
|
Set initialValue of matching field on RFPs.
|
2019-02-14 19:14:03 -05:00 |
|
Will O'Beirne
|
030ac64391
|
Fix migration
|
2019-02-14 19:08:48 -05:00 |
|
Will O'Beirne
|
31345c57b6
|
Merge develop in
|
2019-02-14 19:08:18 -05:00 |
Daniel Ternyak
|
90d5cae094
|
Merge pull request #194 from grant-project/zcash-milestones
Zcash milestones
|
2019-02-14 15:37:12 -06:00 |
Aaron
|
16ed593304
|
Merge branch 'develop' into zcash-milestones
# Conflicts:
# frontend/client/modules/create/utils.ts
|
2019-02-13 14:38:52 -06: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
|
c47c69ea3c
|
tsc fixes
|
2019-02-11 23:42:21 -06:00 |
|
Aaron
|
380eec005e
|
payout endpoints + redux actions + ms UX refactors
|
2019-02-11 23:10:09 -06:00 |
|
Aaron
|
ce0ce4feef
|
fix migration history
|
2019-02-11 17:03:39 -06:00 |
|
Aaron
|
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 |
|
Daniel Ternyak
|
55994025c6
|
Merge pull request #189 from grant-project/finalize-categories
Finalize Categories
|
2019-02-11 16:48:19 -06:00 |
|
Daniel Ternyak
|
f2e685b1d6
|
Merge branch 'develop' into finalize-categories
|
2019-02-11 16:47:07 -06:00 |
|
Daniel Ternyak
|
589702c394
|
Merge pull request #187 from grant-project/arbiter-management
Arbiter management
|
2019-02-11 16:21:12 -06:00 |
|
Aaron
|
72c3d6b507
|
join arbiter filter queries + use flush to get proposal.id on create
|
2019-02-11 15:59:29 -06:00 |
|
Aaron
|
ac5bef5c6f
|
FE: rework milestones first pass
|
2019-02-11 15:22:40 -06:00 |
|
Aaron
|
4e5c0eaea7
|
BE: more milestone fields
|
2019-02-11 15:08:51 -06:00 |
|
Daniel Ternyak
|
7d6d38552c
|
remove DApp category
|
2019-02-10 16:15:36 -06:00 |
|
Daniel Ternyak
|
f15c110f92
|
Merge branch 'develop' into arbiter-management
|
2019-02-10 15:53:29 -06:00 |
|
Daniel Ternyak
|
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 |
|
Daniel Ternyak
|
c4b7e281a5
|
Merge branch 'develop' into comment-placeholder
|
2019-02-10 13:34:36 -06:00 |
|
Daniel Ternyak
|
536a98694c
|
handle not signed in users
|
2019-02-10 13:33:02 -06:00 |
|
Aaron
|
5ec50718dd
|
fix indentation bug
|
2019-02-09 22:03:55 -06:00 |
|
Aaron
|
6a0961a015
|
disable arbiter button when proposal status not LIVE
|
2019-02-09 21:18:26 -06:00 |
|
Aaron
|
7a036058f6
|
FE: more robust arbiter + arbiter accept email validation code page
|
2019-02-09 21:03:19 -06:00 |
|
Aaron
|
5b44f5dcd7
|
admin: more robust arbiter
|
2019-02-09 21:00:49 -06:00 |
|
Aaron
|
9831bc03db
|
BE: more robust arbiter + arbiter status + arbiter accept email code
|
2019-02-09 20:58:40 -06:00 |
|
Daniel Ternyak
|
7215e416a1
|
Merge pull request #181 from grant-project/resend-verification
Resend email verification
|
2019-02-09 15:43:03 -06:00 |
|
William O'Beirne
|
0396c8b248
|
Merge branch 'develop' into rfp-fields
|
2019-02-08 15:22:16 -05:00 |
|
William O'Beirne
|
2dcc1c8cad
|
Merge branch 'develop' into resend-verification
|
2019-02-08 15:18:31 -05:00 |
|
Aaron
|
e54000a1b2
|
Merge branch 'develop' into milestone-payout-flow
|
2019-02-08 14:17:22 -06:00 |
|
William O'Beirne
|
9d82140c48
|
Fix parser error by parsing unix with 'datetime' instead of dateutil
|
2019-02-08 15:12:44 -05:00 |
|
Will O'Beirne
|
2a0e12194c
|
Add resend button to email settings
|
2019-02-08 14:57:54 -05:00 |
|
William O'Beirne
|
230fc0336b
|
Merge branch 'develop' into rfp-fields
|
2019-02-08 14:22:05 -05: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 |
|
Daniel Ternyak
|
fee2708334
|
Replace placeholder comment blocker with disabled markdown input and message
|
2019-02-08 11:14:16 -06: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 |
|
Daniel Ternyak
|
d11fa489d5
|
Remove comments option from updates (#177)
|
2019-02-08 11:18:58 -05:00 |
|
Will O'Beirne
|
b03a9d3caf
|
Update RFP model with new fields, api endpoint for editing them.
|
2019-02-07 15:35:33 -05:00 |
|
Daniel Ternyak
|
92bbbfe506
|
Merge pull request #162 from grant-project/proposal-arbiter
Proposal arbiter
|
2019-02-07 13:16:14 -06: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 |
|
AMStrix
|
136c1ee763
|
Merge pull request #161 from grant-project/contribution-admin
Contribution Admin
|
2019-02-07 09:42:34 -06:00 |
|
AMStrix
|
8be5e099f4
|
Merge branch 'develop' into contribution-admin
|
2019-02-07 09:36:01 -06:00 |
|
Daniel Ternyak
|
8bee1881d7
|
Add create-proposals script to README (#163)
|
2019-02-07 07:40:32 -05:00 |
|
Daniel Ternyak
|
33251d678c
|
Merge branch 'develop' into contribution-admin
|
2019-02-06 18:53:51 -06:00 |
|
Daniel Ternyak
|
b8bc21d5da
|
Merge pull request #159 from grant-project/stake-topoff
Allow topping off of partial stake contributions. Fix float innaccura…
|
2019-02-06 18:53:42 -06:00 |
|
Daniel Ternyak
|
bd9c870e5c
|
Merge branch 'develop' into stake-topoff
|
2019-02-06 17:58:45 -06:00 |