380eec005e
payout endpoints + redux actions + ms UX refactors
2019-02-11 23:10:09 -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
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
9831bc03db
BE: more robust arbiter + arbiter status + arbiter accept email code
2019-02-09 20:58:40 -06:00
9d82140c48
Fix parser error by parsing unix with 'datetime' instead of dateutil
2019-02-08 15:12:44 -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
33251d678c
Merge branch 'develop' into contribution-admin
2019-02-06 18:53:51 -06:00
9fd60cabaa
Button to create contribution.
2019-02-06 17:24:07 -05:00
e4290c76cf
Contribution create / edit form
2019-02-06 14:01:46 -05:00
a1283f24eb
Allow topping off of partial stake contributions. Fix float innaccuracy errors in python. Allow staking proposals to be deleted.
2019-02-05 20:45:57 -05:00
3f51b4f774
Merge branch 'develop' into proposal-arbiter
2019-02-05 14:46:16 -06:00
2868d93fa1
proposal arbiter BE basics + initial admin work
2019-02-05 14:45:26 -06:00
d696f7978d
Proposal pagination & 404 fix ( #151 )
...
* BE: command to create fake proposals
* BE: pagination system + implemented for GET proposals/
* FE: overlay mode for Loader component
* FE: paginated Proposals
* refactor pagination.py a bit
* Proposals: set search input from store on construction
* admin: switch proposals to new pagination regime
* BE: test adjustments
* set app.proposals.page after fetch in a less-creepy way
* optimictic proposal.detail from proposal.page
* keep api interfacing on the api surface (one-dimentional page filters vs structured)
* rem MOST & LEAST_FUNDED prop sort + rename NEWST & OLDEST
* ProposalPagination fix default sort
2019-02-05 15:34:19 -05:00
08ed3e0417
Address validation ( #156 )
...
* Fix create step query
* Add basic regex validation for addresses to frontend.
* Check with zcash node if address is valid before final proposal submission.
* tsc
* Mock requests where needed. Come up with a function that mocks all blockchain requests.
* Remove print
2019-02-05 15:26:37 -05:00
6310e7ca90
remove old proposal model ENUMs
2019-02-05 11:01:57 -06:00
9415992bc1
Remove previews from update and comment emails.
2019-02-04 14:45:38 -05:00
b920b73a4b
Enforce email verification server side ( #142 )
...
* Add new auth middleware for ensuring user has verified email account.
* Fix test.
2019-02-01 15:43:43 -05:00
c17145986f
Request for Proposal (Pt. 3 - Create & Link Proposals) ( #131 )
...
* Adjust rfp <-> proposal models. Add button to rfp detail page to make linked proposal.
* Add a block that links to the original request. Fix a bunch of preview issues.
* List proposals on RFP.
* Admin view for connected RFPs and proposals
* Fix TSC issues.
* Fix tab badge misalignment
* Redesign list page.
* Resolve PR issues.
2019-02-01 14:13:30 -05:00
f8f3bd1707
Proposal staking ( #134 )
...
* BE: proposal/<id>/stake end-point basics
* BE: proposal staking tests
* add STAKING to ProposalStatusEnum
* BE: incremental staking related changes
* admin: staking status
* FE: proposal staking first pass
* ZCash -> Zcash spelling
* staking contribution confirmed email
* FE: staking related minor style changes
* FE proposal staking env var
* notify user of partially staked proposal contributions
2019-01-31 17:56:16 -05:00
4091deaf2f
Request for Proposal (Pt. 1 - Models & Admin) ( #120 )
...
* Convert constants into enums
* Initial RFP models and views.
* Fix model and enums
* RFP admin fully fleshed out.
* Fix tsc
* Fix tests and tsc
* Fix closed tag display
* Request for Proposal (Pt. 2 - Public View) (#125 )
* RFP list page and backend endpoints. Scaffold of detail view.
* RFP detail view. Fix faulty addRfp action.
* Fix 0 showing up
* PR cleanup
2019-01-30 12:59:15 -05:00
b0d16ace7d
Proposal contribution matching ( #117 )
...
* BE: contribution_matching + admin proposal update end-point + tests
* admin: set proposal matching status
* frontend: contributionMatching
* improve CampaignBlock matching callout - thx Will
* adjust ProposalDetail matching confirmation popover child scope
* contributed & funded Proposal fields (hybrid props) + remove funded derivation from FE
* include "contributed" sum for ProposalDetail view
* fix branched migration revision
2019-01-29 18:50:27 -05:00
2c8a52013c
simplify authorization/validation logic for verified users making proposals. Prevent unverified users from making proposals of any kind
2019-01-28 18:51:10 -06:00
8d8dda46e6
Oofdah. Backend refactoring based on PR review, and adding a more obvious UI for users who haven't yet verified their email before posting comments.
2019-01-28 16:46:04 -06:00
f9237c8544
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into require-email-verification
2019-01-28 15:48:29 -06:00
5b985e7fd7
Merge branch 'develop' into remove-profile
2019-01-28 15:45:36 -06:00
50c2812208
really fix tests
2019-01-27 20:51:05 -06:00
85c50a47c1
Prevent publishing proposal without email verification + refactor
2019-01-27 20:04:11 -06:00
b0a5a8e03d
Handle comment prevention without email verification
2019-01-27 20:03:38 -06:00
5ecf3d83fb
Partition UserSchema into SelfUserSchema (mostly used to power /me/ endpoint) and UserSchema (used everywhere else).
2019-01-27 16:13:12 -06:00
3c8894fb12
Env var-ify the block explorer url
2019-01-23 16:30:03 -05:00
c51e850cb0
Run reformatter on all files ( #98 )
2019-01-23 10:00:30 -05:00
9727134ac0
Run reformatter on all files
2019-01-22 23:35:22 -06:00
0e4626157f
Blockchain watcher bootstrap ( #92 )
...
* Initial work on bootstrap refactor. Still results in delayed bootstrapping and double bootstrapping.
* Remove logging.
* Fix invalid json in body on non-post requests. Reduce error verbosity.
* Adjust error output.
2019-01-21 12:51:49 -05:00
8de3b4e3c8
Email settings + unsubscribe ( #75 )
...
* user subscription_settings utils + tests
* UserSettings user/models updates
* GET /<user_id>/settings endpoint
* PUT /<user_id>/settings + more tests + refactoring
* Email Notifications settings tab
* email subscription verbiage
* email-unsubscribe page + refactors
* hook up send_email for proposal approval + add subscription checks to send_email
* fix merge bug
* Send email on contribution. Dont double-count contributions from the blockchain watcher.
* Proposal contribution email, and fix email admin.
* Send email to team on contribution received.
* Email comment creator of their replies.
* Send comments to proposal creator. Adjust templates for all comment emails.
* Send email on contribution update.
2019-01-16 17:26:44 -05:00
994b680f04
Link to specific tabs from query param ( #71 )
...
* Linkable tabs with scrolling behaior. Replace all tabs with linkable tabs.
* Link to specific tab wherever relevant.
* Fix bad tab name.
2019-01-15 15:19:59 -05:00
311fdb298d
Dont show unconfirmed txs unless its you
2019-01-09 17:54:41 -05:00
5a922cefee
Merge latest develop in.
2019-01-09 16:57:15 -05:00
7a7cbb77c7
Delete expired transactions.
2019-01-09 16:32:51 -05:00
b338fc9d2e
Contributions tab on proposal view.
2019-01-09 15:48:41 -05:00
da537e2498
Calculate funded from confirmed contributions.
2019-01-09 14:45:16 -05:00
f97a8dfb8d
Convert webhook amount to zcash from zats. Order contributions correctly.
2019-01-09 14:35:37 -05:00
7ade6b5715
Merge branch 'develop' into zcash-contributions
2019-01-09 14:08:51 -05:00
57e65e26d5
Rework proposal api a bit, render contributions and their status.
2019-01-09 14:07:50 -05:00
47c695f43b
Proposal Approval Process ( #39 )
...
* endpoints and model support for proposal approval
* admin test + proposal approval tests
* GET user/<id> withPending support
* basic withPending suport for Profile
* change create publish to sumbit for approval
* admin proposal filter by status + some refactoring
* admin: update antd
* backend: admin get single proposal + populate date_approved
* admin: rework Proposals + support approval
* backend: approval process updates
* admin: review count on home + cosmetic
* frontend: proposal approval flow
* Profile ZEC/ZAT adjustments
* fix regression in formatUserFromGet + update error type in users/reducers
* fix merge tsc issues
* publish warning vebiage change
* fix ssr fetchProposal 404 hang bug
* proposals/<id> - limit status non-LIVE to team member, exclude DELETED
* various adjustments to Proposal based on `status`
* remove comments
* Proposal statuses to banner style + fix up CreateFlow - Preview mode
* Proposal tsc fix
2019-01-09 13:23:08 -05:00
00ee2888b4
Convert blockchain microservice to use webhooks instead of websocket. Confirm contributions via webhook.
2019-01-08 17:58:32 -05:00
6066b7adf0
Wipe migrations. Fix tests.
2019-01-08 12:44:54 -05:00
c444e5152d
Hook up blockchain to backend, backend to frontend for contributions.
2019-01-07 01:58:33 -05:00
99fdedb816
Initial work on contribution modal flow and contribution model overhaul.
2019-01-06 17:48:07 -05:00
98d68961b5
Merge develop in.
2019-01-04 14:29:09 -05:00
Aaron
William O'Beirne
Daniel Ternyak