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

60 Commits

Author SHA1 Message Date
Daniel Ternyak 21a2a1f6ba
Add explanation for staking (#356) 2019-03-13 18:36:53 -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
William O'Beirne 4773c4a4ac Fix contact url (#350) 
* Fix contact url

* Remove TODO
 2019-03-13 14:20:54 -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 e160380daa Prevent showing contribution instructions for canceled / expired proposals (#334) 2019-03-12 16:35:15 -05:00
William O'Beirne c6ad668d71 Better contribution error displays (#314) 
* Handle blockchain_get failures better.

* tsc
 2019-03-12 13:10:56 -04:00
Aaron bbf7b3eab0
FE: convert profile comment dateCreated to milliseconds 2019-03-05 11:40:25 -06:00
Aaron c600404540
FE: use Markdown for Profile comments 2019-03-05 11:35:40 -06:00
Will O'Beirne 828be6ca01
Fix tsc 2019-02-26 12:41:39 -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
AMStrix 0b2676563a fe: Placeholder loading state & use it for profile tabs + RFPs list (#255) 2019-02-23 16:46:35 -05:00
Daniel Ternyak d51877d1e3
Update all profile tabs to use placeholders with both titles and subtitles 2019-02-17 16:37:11 -06:00
Daniel Ternyak 0ac4c0591d
rename and simplify user profile validation function 2019-02-17 14:36:17 -06:00
Daniel Ternyak f2c2b70967
Fix 'Edit Profile' form being always disabled; remove email 2019-02-15 13:31:08 -06:00
Aaron fd9a4c5393
full payout flow operational 2019-02-13 10:54:46 -06:00
Aaron 7a036058f6
FE: more robust arbiter + arbiter accept email validation code page 2019-02-09 21:03:19 -06:00
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 048cda8216
FE: user profile arbitrations tab 2019-02-06 16:37:45 -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 3967358531
Minimum tab heights on proposals and profiles. 2019-02-04 17:39:46 -05:00
AMStrix 1c72178b86 Create and use ExceptionPage for 404s (#138) 
* create & use ExceptionPage for 404s, remove LinkButton

* ExceptionPage: set default 'desc' if not set on props
 2019-02-01 14:25:17 -05:00
William O'Beirne 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
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
Daniel Ternyak 01d61fce9f
Undo errouneous reformats 2019-01-27 16:17:09 -06:00
Daniel Ternyak 5f606d6204
merge 'develop' into 'remove-profile 2019-01-27 15:44:16 -06:00
Daniel Ternyak 61d9b08a02
Remove user email on Profile view 2019-01-23 15:53:29 -06:00
Will O'Beirne da88825c7c
Standardize loader size 2019-01-23 11:35:03 -05:00
Will O'Beirne eddc0671d7
Replace spin with loader everywhere. 2019-01-23 10:15:59 -05:00
Will O'Beirne 32840da648
Grant.io -> ZF Grants 2019-01-22 13:40:20 -05:00
William O'Beirne 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
AMStrix fbbd20ae90 Fix avatar load renegade POST (#58) 2019-01-10 16:51:34 -06:00
Will O'Beirne 6c8ce3f87d
Show send instructions on profile pending contributions. 2019-01-09 17:26:28 -05:00
Will O'Beirne 5a922cefee
Merge latest develop in. 2019-01-09 16:57:15 -05:00
Will O'Beirne 7a7cbb77c7
Delete expired transactions. 2019-01-09 16:32:51 -05:00
Will O'Beirne b338fc9d2e
Contributions tab on proposal view. 2019-01-09 15:48:41 -05:00
Will O'Beirne 57e65e26d5
Rework proposal api a bit, render contributions and their status. 2019-01-09 14:07:50 -05:00
AMStrix 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
William O'Beirne 98d68961b5 Merge develop in. 2019-01-04 14:29:09 -05:00
AMStrix 22f8a0415c Verify User Social via OAuth (#30) 
* BE social oauth verify

* FE social oauth verification

* readme updates

* README social verification setup instructions

* adjust tests socialMedias

* BE add social verify tests

* save changes before leaving to OAuth

* Fix migration.

* Adjust social button styles.

* Remove question mark.

* merge fix

* fix migration branch
 2019-01-02 12:23:02 -06:00
Will O'Beirne f4e918481c
Convert all units to ZEC from ETH. 2018-12-27 12:41:26 -05:00
AMStrix 50cc377b48 User Auth Conversion (#19) 2018-12-14 13:36:22 -06:00
AMStrix 4980670e8c Populate Profile Data (#233) 
* BE profile deets

* BE real user data web3 populate + misc

* FE real profile data
 2018-11-30 17:52:00 -06:00
Will O'Beirne 708eaca511
Merge upstream changes. 2018-11-26 20:29:33 -05:00
Will O'Beirne 02b1260573
Merge in latest changes. 2018-11-26 20:14:00 -05:00
Will O'Beirne f9b4f65ac4
Merge develop in. 2018-11-26 18:47:24 -05:00
Will O'Beirne c51b1e2dab
Finish up user and social media conversions. 2018-11-19 15:23:56 -05:00
Aaron 866be8e62c
alert margin 2018-11-16 21:56:43 -06:00
Aaron 52f1f54442
avatar upload & download 2018-11-16 21:33:25 -06:00
Will O'Beirne d7e4c1c533
Check in user refactor. Incomplete, but computer is crashing routinely. 2018-11-16 18:05:17 -05:00
Will O'Beirne 89c1c3345d
Fix some zeroes, default fields. 2018-11-16 14:23:42 -05:00