Commit Graph

803 Commits

Author SHA1 Message Date
William O'Beirne 0069de7fc4 HeaderDetails on proposals and RFPs (#359)
* Set header details on proposal detail pages.

* Add RFP header details
2019-03-14 00:06:22 -05:00
William O'Beirne 1130d9f3be Slugify RFP urls (#358) 2019-03-14 00:06:02 -05:00
William O'Beirne a91269f605 Replace email logo (#357) 2019-03-14 00:05:02 -05:00
Daniel Ternyak 21a2a1f6ba
Add explanation for staking (#356) 2019-03-13 18:36:53 -05: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 e018f11018 Zcash e2e basics (#329)
* e2e: remove more eth related stuff, update cypress

* BE: e2e endpoints and interceptions for emails and blockchain reqs

* e2e: expand browse test for proposals and comments

* e2e: remove old tests, add new ones

* e2e: intercept blockchain_get /contribution/addresses

* be: disable sentry for e2e, add DEBUG to e2e endpoint register conditional

* post-merge adjustments

* fix merge related bug

* post merge issue
2019-03-13 18:36:06 -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 25a71ced1b
Merge pull request #343 from grant-project/batch-emails
Batch (read threaded) emails
2019-03-13 15:19:24 -05:00
Aaron 0f055d6b39
Merge branch 'develop' into batch-emails
# Conflicts:
#	backend/grant/email/send.py
2019-03-13 15:11:54 -05:00
William O'Beirne 0b3bf5e66f Update email from & name (#348) 2019-03-13 14:41:30 -05:00
William O'Beirne 3050caf329 Sentry fixes (#345)
* Upgrade sentry sdk, replace all prints with flask logging.

* Upgrade node sentry to fix circular json error.

* Update frontend sentry versions to maintain parity and nab any fixes.
2019-03-13 14:40:29 -05:00
William O'Beirne 4773c4a4ac Fix contact url (#350)
* Fix contact url

* Remove TODO
2019-03-13 14:20:54 -05:00
William O'Beirne badb9fc23d
Merge branch 'develop' into batch-emails 2019-03-13 13:59:38 -04:00
William O'Beirne 73d087bda7 Rate limits (#342)
* Implemented rate limits for most POST requests.

* Nicer error message for rate limited contributions

* Use error message for drafts and invites, limit invites on frontend.
2019-03-12 22:35:38 -05:00
William O'Beirne c92032e630 Add noscript messages (#341)
* Noscript warnings

* Incomplete sentence.
2019-03-12 22:08:50 -05:00
Aaron eb4767d4cc
Merge branch 'develop' into batch-emails
# Conflicts:
#	backend/grant/proposal/models.py
2019-03-12 20:14:51 -05:00
Aaron d1e2545b49
be: EmailSender Thread for pushing emails sends off the response thread 2019-03-12 20:12:07 -05:00
Daniel Ternyak c5979d5635 Various Fixes (#340)
* copy; ff

* Update PaymentInfo.tsx

* Update Final.tsx

* Update index.tsx
2019-03-12 19:04:32 -04:00
William O'Beirne 79db2b4001 Fix contribution confirmation on subsequent contribution (#336) 2019-03-12 17:20:11 -05:00
Daniel Ternyak 21217c73b6
Create DISCLOSURE.md (#335) 2019-03-12 16:36:17 -05:00
William O'Beirne e160380daa Prevent showing contribution instructions for canceled / expired proposals (#334) 2019-03-12 16:35:15 -05:00
William O'Beirne 500175f5d2 Upgrade sshpk in yarn.lock (#333) 2019-03-12 16:25:38 -05:00
William O'Beirne d4d9f5b2ab Use new logo + update meta tags (#332)
* Replace logo in header and footer.

* Update some meta tags.
2019-03-12 16:13:04 -05:00
William O'Beirne 671e65e145 Upgrade react-mde to 7.0.4 (#331) 2019-03-12 15:14:30 -04:00
William O'Beirne c6ad668d71 Better contribution error displays (#314)
* Handle blockchain_get failures better.

* tsc
2019-03-12 13:10:56 -04: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
Sonya Mann e98f266100 add CoC (#328) 2019-03-12 12:44:16 -04:00
Sonya Mann 403fb09513 change non-attributed contributions language (#316)
* non-attributed contributions copy
2019-03-12 12:38:35 -04:00
Daniel Ternyak ad632dd4f9
Merge pull request #304 from grant-project/expired-notif
Contribution expired notification
2019-03-11 13:07:41 -04:00
Daniel Ternyak 7235c15862
Merge branch 'develop' into expired-notif 2019-03-11 13:02:01 -04:00
William O'Beirne 1905dfe7bf
Frontend error handlers (#312)
* Add componentDidCatch around routes with template, and outside routes at the top level.

* Remove error from ErrorWrap on navigation.
2019-03-08 16:13:13 -05:00
AMStrix a271724266 BE: add SESSION_COOKIE_DOMAIN setting (#311) 2019-03-07 15:04:40 -05:00
Daniel Ternyak b902bdc222
Merge branch 'develop' into expired-notif 2019-03-06 17:47:48 -06:00
Daniel Ternyak aa9465442b
Merge pull request #309 from grant-project/homepage-image-load
Homepage image loading improvement
2019-03-06 17:47:41 -06:00
Daniel Ternyak 13e8936ade
Merge branch 'develop' into homepage-image-load 2019-03-06 17:46:20 -06:00
Daniel Ternyak 008455bd9e
Merge branch 'develop' into expired-notif 2019-03-06 17:43:46 -06:00
Daniel Ternyak 7a3e022935
Merge pull request #307 from grant-project/fix-rehydrate-homepage
Rehydrate RFP bounty BNs
2019-03-06 17:43:35 -06:00
Will O'Beirne e9a052870c
Change homepage splash image to background image that keeps its place before loading. 2019-03-06 18:39:44 -05:00
Will O'Beirne 9d51e325ec
BNify RFPs 2019-03-06 18:21:12 -05:00
William O'Beirne 9c127648c5
Merge branch 'develop' into expired-notif 2019-03-06 17:37:17 -05:00
William O'Beirne 312818d71a New footer (#300)
* Finalize design and layout.

* Change about page to redirect.
2019-03-06 15:50:32 -06:00
Will O'Beirne a9ae245578
Dont add task for anon contributions 2019-03-06 16:39:30 -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 9ad26a4205
Merge pull request #303 from grant-project/revert-random-contribution-id
Revert contribution ids to be incremental.
2019-03-06 12:54:11 -06:00
Will O'Beirne 6b1a856145
Revert contribution ids to be incremental. 2019-03-06 11:16:28 -05:00
Daniel Ternyak 93dd3c0a7e
Merge pull request #299 from grant-project/profile-comment-markdown
Profile Comments Bugs
2019-03-05 12:30:55 -06:00
Aaron bbf7b3eab0
FE: convert profile comment dateCreated to milliseconds 2019-03-05 11:40:25 -06:00