Commit Graph

18 Commits

Author SHA1 Message Date
Aaron 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
Aaron 2b78a17973
proposal_arbiter email 2019-02-06 14:56:21 -06:00
Will O'Beirne 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
Will O'Beirne 9415992bc1
Remove previews from update and comment emails. 2019-02-04 14:45:38 -05:00
AMStrix 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
Will O'Beirne 1a41012c31
Replace all instances of grant.io and its palette with zf grants branding. 2019-01-24 15:17:24 -05:00
Will O'Beirne 3654bcb854
Send notif email to old email address on email change. 2019-01-24 14:47:22 -05:00
Will O'Beirne f22acfede0
Change password email. 2019-01-24 14:08:15 -05:00
Will O'Beirne 3b9d15e62e
Implement change email & email confirmation. Adjust layout of settings more. 2019-01-24 13:53:26 -05:00
Daniel Ternyak c51e850cb0 Run reformatter on all files (#98) 2019-01-23 10:00:30 -05:00
AMStrix 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
William O'Beirne b65f02a29f
Email admin + more email templates (#37)
* Email admin page with previews.

* Move example args to backend since emails take in Python classes.

* Text version of invite email.

* Proposal approval / rejection emails.

* Back button.

* Contribution confirmed email.
2019-01-09 14:08:25 -05:00
AMStrix 6ea75e6bda User Recovery Flow (#26) 2018-12-17 12:33:33 -06:00
AMStrix 50cc377b48 User Auth Conversion (#19) 2018-12-14 13:36:22 -06:00
William O'Beirne 3b42295097 Team invite email (#237) 2018-12-03 20:45:18 -06:00
Will O'Beirne a3cfbda3e2
Working invitations + deletions. 2018-11-16 11:16:52 -05:00
William O'Beirne cdc3ea0107
Email verification (#172)
* Add email_verification table and endpoints, setup email verification page, adjust emails to actually verify.

* Add User.create method
2018-11-02 12:07:06 -04:00
William O'Beirne e63b03e5c3 Email Scaffolding + Signup Email (#153)
* Scaffolding for emails + signup email.

* Better docs and handling around config
2018-10-19 17:20:51 -05:00