zecfoundation
/
zcash-grant-system
mirror of https://github.com/ZcashFoundation/zcash-grant-system.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
364 Commits 10 Branches 21 Tags 9.5 MiB
Commit Graph

364 Commits

Author SHA1 Message Date
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
William O'Beirne 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
AMStrix 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
Daniel Ternyak 73bbd191d9
Merge pull request #116 from grant-project/task-scheduler 
Task scheduling groundwork
 2019-01-29 16:58:49 -06:00
Daniel Ternyak 25c622360d
fix test 2019-01-29 16:43:04 -06:00
Daniel Ternyak 2deb8c8cfa
PR review additions 2019-01-29 16:21:06 -06:00
Daniel Ternyak 357517278d
Merge branch 'develop' into task-scheduler 2019-01-29 13:29:40 -06:00
Daniel Ternyak 63dc9fbd09
Merge pull request #115 from grant-project/require-email-verification 
Require email verification before important actions
 2019-01-29 13:29:26 -06:00
Daniel Ternyak f1ddc7d0cf
PR review adjustments 2019-01-28 21:00:55 -06:00
Daniel Ternyak 1e8b63d2a1
fix test 2019-01-28 19:06:24 -06:00
Daniel Ternyak 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
Daniel Ternyak 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
Daniel Ternyak f9237c8544
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into require-email-verification 2019-01-28 15:48:29 -06:00
Daniel Ternyak eecb6cdabc
Merge pull request #113 from grant-project/remove-profile 
Keep user email addresses private
 2019-01-28 15:47:57 -06:00
Daniel Ternyak 5b985e7fd7
Merge branch 'develop' into remove-profile 2019-01-28 15:45:36 -06:00
Daniel Ternyak 77c02502be
Fix schema and add test 2019-01-28 15:34:57 -06:00
Daniel Ternyak e1d351762a
Merge pull request #102 from grant-project/explorer-url-env-var 
Environment variable for explorer URL
 2019-01-28 15:21:38 -06:00
Daniel Ternyak 18bab43a65
Merge branch 'develop' into explorer-url-env-var 2019-01-28 15:21:24 -06:00
Daniel Ternyak b9a88d7276
MVP task architecture 2019-01-27 22:59:15 -06:00
Daniel Ternyak 7e41de9c81
Styling to Create proposal error page 2019-01-27 21:16:04 -06:00
Daniel Ternyak b607163fce
Really get tests working 2019-01-27 21:09:31 -06:00
Daniel Ternyak 50c2812208
really fix tests 2019-01-27 20:51:05 -06:00
Daniel Ternyak c4736b18a2
fix tests 2019-01-27 20:20:11 -06:00
Daniel Ternyak 6eea4eb61e
Merge branch 'remove-profile' into require-email-verification 2019-01-27 20:12:12 -06:00
Daniel Ternyak 55820746ab
undo 2019-01-27 20:10:49 -06:00
Daniel Ternyak 09c49ca44f
undo 2019-01-27 20:09:58 -06:00
Daniel Ternyak 85c50a47c1
Prevent publishing proposal without email verification + refactor 2019-01-27 20:04:11 -06:00
Daniel Ternyak b0a5a8e03d
Handle comment prevention without email verification 2019-01-27 20:03:38 -06:00
Daniel Ternyak 893101b480
Revert "Don't duplicate UserSchema schema, use" 
This reverts commit 6f38b8c8fa.
 2019-01-27 16:43:03 -06:00
Daniel Ternyak 494b03ec7d
Revert "Don't duplicate UserSchema schema, use" 
This reverts commit 6f38b8c8fa.
 2019-01-27 16:42:02 -06:00
Daniel Ternyak 6f38b8c8fa
Don't duplicate UserSchema schema, use 2019-01-27 16:33:27 -06:00
Daniel Ternyak 4d84f11f78
Add tests 2019-01-27 16:30:15 -06:00
Daniel Ternyak 01d61fce9f
Undo errouneous reformats 2019-01-27 16:17:09 -06:00
Daniel Ternyak c3370076be
Undo errouneous reformats 2019-01-27 16:16:12 -06:00
Daniel Ternyak 97db9d69f9
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into remove-profile 2019-01-27 16:13:49 -06:00
Daniel Ternyak 5ecf3d83fb
Partition UserSchema into SelfUserSchema (mostly used to power /me/ endpoint) and UserSchema (used everywhere else). 2019-01-27 16:13:12 -06:00
Daniel Ternyak 236d5b1ccf
Merge pull request #105 from grant-project/change-email 
Settings redesign + change email + change password conf email
 2019-01-27 16:10:53 -06:00
Daniel Ternyak 5f606d6204
merge 'develop' into 'remove-profile 2019-01-27 15:44:16 -06:00
Daniel Ternyak 3bfabaa6ed
Merge pull request #107 from grant-project/email-template-redesign 
Email & admin branding replacement
 2019-01-24 18:12:02 -06:00
Will O'Beirne 656bbd04ae
Replace admin instances too. 2019-01-24 15:17:36 -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 af9486ef52
Keep new email in the field after changing it. 2019-01-24 14:49:04 -05:00
Will O'Beirne 3654bcb854
Send notif email to old email address on email change. 2019-01-24 14:47:22 -05:00
William O'Beirne 69fefdb2ea
Merge branch 'develop' into change-email 2019-01-24 14:29:26 -05:00
Will O'Beirne 8d15a473fc
Adjusted settings mobile behavior. Fixed tsc error. 2019-01-24 14:19:33 -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
Will O'Beirne b6e921879e
Rework settings page frontend. Add account tab for email changes. 2019-01-23 17:28:27 -05:00
Daniel Ternyak 05857f6edb
Merge pull request #101 from grant-project/better-loader 
Consistent centered loader component
 2019-01-23 16:05:36 -06:00
Daniel Ternyak 52199935fe
Merge branch 'develop' into better-loader 2019-01-23 16:03:23 -06:00