c067d3e9ad
user is_admin field with working migration
2019-02-20 11:35:47 -06:00
5163d87172
Add link for unlinking proposals from requests.
2019-02-19 14:48:51 -05: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
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
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
263764255b
Frontend for new RFP fields.
2019-02-08 14:02:34 -05:00
1d1f3bb007
Admin interface for new fields.
2019-02-08 11:54:20 -05:00
b03a9d3caf
Update RFP model with new fields, api endpoint for editing them.
2019-02-07 15:35:33 -05:00
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
8be5e099f4
Merge branch 'develop' into contribution-admin
2019-02-07 09:36:01 -06:00
8bee1881d7
Add create-proposals script to README ( #163 )
2019-02-07 07:40:32 -05:00
33251d678c
Merge branch 'develop' into contribution-admin
2019-02-06 18:53:51 -06:00
bd9c870e5c
Merge branch 'develop' into stake-topoff
2019-02-06 17:58:45 -06:00
048cda8216
FE: user profile arbitrations tab
2019-02-06 16:37:45 -06:00
9fd60cabaa
Button to create contribution.
2019-02-06 17:24:07 -05:00
2b78a17973
proposal_arbiter email
2019-02-06 14:56:21 -06:00
e4290c76cf
Contribution create / edit form
2019-02-06 14:01:46 -05:00
6fd885c274
order admin arbiter search by display_name
2019-02-06 12:56:08 -06:00
40e73f9ee6
arbiters: admin views + pagination filter imp.
2019-02-06 12:31:53 -06:00
2f3161ae4b
Generecize pageable. List view of contributions.
2019-02-06 12:47:47 -05:00
aeb0932120
Initial crack at admin endpoints.
2019-02-06 11:21:19 -05:00
54e9889090
arbiter & related schema adjustments
2019-02-06 08:31:38 -06:00
eb8c1ec258
add ARBITER proposal filter
2019-02-05 21:30:31 -06:00
Aaron
Will O'Beirne
Daniel Ternyak