Daniel Ternyak
|
7b365a28c7
|
Address user directly in error messages
|
2019-02-15 13:09:51 -06:00 |
Will O'Beirne
|
6fb576c8a6
|
Fix revision branch.
|
2019-02-15 13:57:04 -05:00 |
William O'Beirne
|
813e3b5f93
|
Merge branch 'develop' into user-banning
|
2019-02-15 13:53:44 -05:00 |
Daniel Ternyak
|
9fc9da8c44
|
Remove Dapp category from Admin (#208)
|
2019-02-15 13:53:27 -05:00 |
Daniel Ternyak
|
d01827ec43
|
Merge branch 'develop' into user-banning
|
2019-02-15 12:12:18 -06:00 |
Daniel Ternyak
|
fe5632dc75
|
Merge pull request #179 from grant-project/rfp-fields
RFP Fields (matching, bounty, dates)
|
2019-02-15 12:05:59 -06:00 |
Will O'Beirne
|
ac3bfb66c8
|
Tags for list view, bold bounty and matching on detail view.
|
2019-02-15 12:46:50 -05:00 |
Aaron
|
0c4cb59262
|
fix migration branch
|
2019-02-14 22:50:16 -06:00 |
Aaron
|
f30d53c21c
|
Merge branch 'develop' into user-banning
# Conflicts:
# backend/grant/utils/pagination.py
|
2019-02-14 22:25:03 -06:00 |
Aaron
|
7090d3e97b
|
admin: user pagination + silencing + banning
|
2019-02-14 22:18:43 -06:00 |
Aaron
|
1d811bb7d3
|
BE: user banning + silencing + pagination
|
2019-02-14 22:11:47 -06:00 |
Will O'Beirne
|
99f0ec5ba2
|
Merge branch 'rfp-fields' of github.com:dternyak/zcash-grant-system into rfp-fields
|
2019-02-14 19:14:31 -05:00 |
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 |