Commit Graph

112 Commits

Author SHA1 Message Date
Danny Skubak 8cfec5de5d Remove Categories (#63)
* remove category from admin

* remove category from frontend, add likes to proposal card view

* make category nullable in backend, remove from views

* add db migration

* remove category from frontend rfp

* update tests

* remove category from admin proposal

* remove category from rfp put

* remove moment

* remove moment
2019-11-13 17:23:36 -06:00
Danny Skubak ed6d98ceec Milestone Estimate in Days (#59)
* init admin milestone estimate in days

* init frontend milestone estimate in days

* init backend milestone estimate in days

* fix bugs

* fix bugs

* fix tests

* add tests

* add milestone_deadline email to examples

* fix type errors

* fix tests

* remove comment

* temp prep for merge

* restore changes, update tests

* add db migration

* add tests and comments for set_v2_date_estimates
2019-11-13 16:38:17 -06:00
Danny Skubak 25e43a34ff Update Accepted Without Funding (#35)
* backend - init endpoints and model changes

* backend - add tests

* admin - add change to accepted with funding functionality

* backend - fix tests
2019-10-23 16:44:19 -05:00
Danny Skubak 85c21d4cbf apply style directly to buttons (#39) 2019-10-23 16:34:31 -05:00
Danny Skubak 5799ffab19 Proposal Subscription (#31)
* init proposal subscribe be and fe

* add subscription email templates

* wire up subscription emails

* email subscribers on proposal milestone, update, cancel

* disallow subscriptions if email not verified

* update spelling, titles

* disallow proposal subscribe if user is team member

* hide subscribe if not signed in, is team member, canceled

* port follow from grant-base

* remove subscribed

* convert subscribed to follower

* backend - update tests

* frontend - fix typings

* finish follower port

* update comment

* fix email button display issues

* remove loading on AuthButton to prevent two spinners
2019-10-23 16:34:10 -05:00
Danny Skubak fb6b9b5af7 Proposal Lifecycle & Crowdfunding (#23)
* add proposal versioning

* remove deadlines

* update proposal lifecycle for admin

* update proposal lifecycle for backend

* update proposal lifecycle for frontend

* fix tests

* remove acceptedWithFunding

* fix lint, remove commented code

* remove commented code

* refactor backend to provide isVersionTwo

* refactor backend to provide isVersionTwo

* Revert "refactor backend to provide isVersionTwo"

This reverts commit e3b9bc661081e482326f83fa6aa517cf6bdebe6c.

* use isVersionTwo in admin

* add acceptedWithFunding

* trigger ci

* remove "version"

* remove "version"

* remove rejected from campaign block
2019-10-16 22:43:20 -05:00
Danny Skubak 746398c59b Proposal Versioning (#21)
* add proposal versioning

* refactor backend to provide isVersionTwo

* trigger ci

* remove "version"
2019-10-11 14:51:10 -05:00
dependabot[bot] 8bbc325342
Bump js-yaml from 3.12.0 to 3.13.1 in /admin
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-08-21 22:16:52 +00:00
dependabot[bot] a33b4d8bd1
Bump axios from 0.18.0 to 0.18.1 in /admin
Bumps [axios](https://github.com/axios/axios) from 0.18.0 to 0.18.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.18.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.18.0...v0.18.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-08-21 21:43:49 +00:00
Daniel Ternyak 0ba477847a
Dependencies Update (#469)
* Update dependencies across all modules

* bump only minor point on axios for /blockchain
2019-08-21 15:36:37 -05:00
AMStrix 8819ee3035 Rework Contribution Privacy (#456)
* rework contribution privacy
- add ProposalContribution.privacy
- remove ProposalContribution.no_refund
- anonymous contribution only if not logged in
- logged in contributions can be optionally attributed
- refunds can happen if a user has  a refund address

* admin: upgrade react-easy-state (had memory leak)

* be: filter users private contributions for others

* Adjust copy to be more accurate.

* Add copy for setting refund addresses (#458)
2019-06-11 21:49:14 -05:00
Daniel Ternyak 0c3164ca42
Admin Milestone Rendering (#442)
* add support for milestones in admin proposal review view

* prettier

* prettier

* tweak data displayed

* move milestones
2019-05-28 16:33:49 -06:00
Aaron c0904d9c00
admin: remove commented code 2019-05-27 20:07:29 -05:00
Aaron 0cc79ad645
admin: comment ProposalDetail delete fns to apease tsc 2019-05-27 15:19:08 -05:00
Aaron 0c94c11bd5
admin: separate sourcemaps for production build 2019-05-27 15:17:55 -05:00
Aaron 17da8c15d8
admin: remove delete btn from ProposalDetail 2019-05-27 14:52:19 -05:00
Aaron 0c2303aaa6
admin: add STAGE_NOT_CANCELED filters to links from Home 2019-05-27 14:45:38 -05:00
Aaron 62ffd30208
admin: add proposal STAGE_NOT_CANCELED filter 2019-05-27 14:16:48 -05:00
Aaron 381722de74
admin notifications 2019-04-16 12:38:14 -05:00
Will O'Beirne bd5662dee3
Enforce SSL on admin 2019-03-22 15:39:51 -04:00
AMStrix ad844263dd Several bugs (#378)
* #375 admin long lines in proposal Detail card

* #371 comment_reply & proposal_comment email url typo

* #367 fix link to RFP from Proposal create, just use id

* #368 profile avatar removal, allow_none on /user PUT
2019-03-14 20:55:13 -05:00
AMStrix d4368b2f25 admin: proposal published shows 'n/a' when datePublished is 0 (#361) 2019-03-14 12:47:42 -04:00
William O'Beirne 9d0591918e Require refund address or confirm donation (#354)
* Add API check to disallow unsetting refund address.

* Require either refund address to be set or explicit consent for a donation. Dont have them show up as refundable in admin.

* Show donations on financials page

* Continue after entry

* Consider no_refund when checking for duplicate contribution.

* Fix types.

* Add a filter for all contributions that are considered donations. Update financial query to include donations.

* Elaborate in message.
2019-03-13 18:36:24 -05:00
AMStrix a043c2dfa6 XSS and Reduced Markdown for Admin (#355) 2019-03-13 18:35:22 -05:00
AMStrix 1ae519e251 Address TODOs (#349)
* todos: simple ones, removals & modifications to NOTE

* rem-todo: reduced markdown images are removed by sanitizer

* be todo: add user validation to create

* be todo: improve test_invide_api tests

* be todo: remove todo comment

* fe todo: set error messages on reducers

* fe todo: upgrade and enable react-helmet

* todos - remove uneeded

* fe todos: remove unecessary

* be: fix remaining staking contribution calculation
2019-03-13 16:39:50 -05:00
AMStrix c291d41d4e Admin financials (#310)
* admin: financials basics

* BE: allow missing emailSettings on user settings EP

* admin: add webpack import loader for ant-design-pro (for styles loading)

* BE: admin financials reporting

* admin: financials page

* admin financials - convert contribution and payout total summations to sql

* Handle some kinda failure case.

* admin: remove "accounting" card from financials
2019-03-12 13:08:16 -04:00
Daniel Ternyak 7235c15862
Merge branch 'develop' into expired-notif 2019-03-11 13:02:01 -04:00
AMStrix a271724266 BE: add SESSION_COOKIE_DOMAIN setting (#311) 2019-03-07 15:04:40 -05:00
William O'Beirne 9c127648c5
Merge branch 'develop' into expired-notif 2019-03-06 17:37:17 -05:00
Will O'Beirne 1973db1330
Notify user if contribution expires. 2019-03-06 15:33:09 -05:00
AMStrix 1d2228a394 Flexible Matching/Bounties + KYC (#277)
* BE: proposal rfp opt in & proposal bounty

* admin: proposal rfp opt in display & modify bounty

* FE: proposal rfp opt in / proposal.contributionBounty

* fix github merge (so close)

* add status field to update_rfp

* handle only showing canel and refund popover correctly

* undo unneeded change

* BE: make sure rfp.bounty is None when it is set to '0' or null during create/update
2019-03-06 14:25:58 -06:00
William O'Beirne 7bbefe8abe Update vulnerable packages (#302)
* Update frontend dependencies.

* Update admin packages.

* Fix content editor with new updates.

* Regenerate lock files.

* Revert "Regenerate lock files."

This reverts commit 93150fcac3.

* Fix tsc
2019-03-06 12:56:01 -06:00
Daniel Ternyak 6aa6ea5624
Merge branch 'develop' into various-fixes 2019-02-27 17:15:12 -06:00
Daniel Ternyak 625a6cab99
don't show popovers, remove delete, add tsc to admin pre-commit 2019-02-27 16:50:53 -06:00
Will O'Beirne 2662e20389
Fix contribution status tag display. 2019-02-25 15:06:30 -05:00
Will O'Beirne 6f7de989e7
Merge branch 'develop' into anonymous-contributions 2019-02-25 11:43:36 -05:00
AMStrix 77e25b1c7c Various fixes (#260)
* remove linkedin social media option

* fix ProfileEdit social media button white-space

* fix default profile tab for non-authed user

* filter out non live proposal contributions for GET user/<id>

* admin: remove 255 char limit on reject_reason
2019-02-25 11:41:00 -05:00
William O'Beirne 4c3a2127a8
Upgrade ant-design-pro to 2.2.1 to fix some dependency issues. (#258) 2019-02-25 11:21:37 -05:00
Will O'Beirne 06add917b5
Merge branch 'develop' into anonymous-contributions 2019-02-23 16:53:59 -05:00
William O'Beirne 8bf7013b0f
Cancel proposal (#253)
* Backend setup for proposal canceling.

* Cancelable in admin, update all states to properly reflect a canceled proposal.

* Replace REFUNDING stage with CANCELED and FAILED to distinguish between the 2

* Fix pending contributions showing up as needing refunds.

* Fix some refund cases.

* Dont show failed & canceled proposals on list view. Hide their filters.

* Show when proposal was canceled.

* Remove edit action, make cancel an explanation to contact support.

* Fix PR comments

* Fix issues from develop merge.
2019-02-23 16:38:06 -05:00
Will O'Beirne eb47e3e0aa
Allow for no user with contributions in admin. 2019-02-22 15:51:46 -05:00
Aaron 165950f803
admin: tsc fix 2019-02-22 10:27:00 -06:00
Aaron 9071f07443
admin MFAuth refactoring & cosmetics 2019-02-22 10:14:07 -06:00
Aaron 35661a0672
admin Settings & reset MFA 2019-02-21 23:22:16 -06:00
Aaron 3f7c90a381
admin: require email verification for admin login/setup 2019-02-21 19:39:37 -06:00
Aaron 43ee574899
Merge branch 'develop' into admin-users
# Conflicts:
#	backend/grant/admin/views.py
2019-02-21 18:44:58 -06:00
Aaron c30fa69152
2fa admin setup + login process 2019-02-21 16:23:46 -06:00
Will O'Beirne a65c061f1d
Add staking column to contribution. Exclude staking contributions from refunds. 2019-02-21 13:02:29 -05:00
Will O'Beirne 6f50a7ae28
Merge develop in. 2019-02-21 12:17:48 -05:00
Aaron f49b58dca4
totp basics + remove old admin env key stuff 2019-02-20 16:35:13 -06:00