Commit Graph

321 Commits

Author SHA1 Message Date
Will O'Beirne 560f63847e
More considerations for anonymous contributions on the frontend. 2019-02-25 14:46:47 -05:00
Will O'Beirne a2d89f2910
Pose a warning to user before contributing anonymously. Handle anonymous user in user row. 2019-02-25 14:26:02 -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
AMStrix 0b2676563a fe: Placeholder loading state & use it for profile tabs + RFPs list (#255) 2019-02-23 16:46:35 -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
William O'Beirne c35b62b6c4
Email subscription fixes (#243)
* Lookup user email subscription settings by email instead of hoping a user is passed.

* Functioning unsubscribe URLs
2019-02-23 15:33:19 -05:00
Will O'Beirne 115b127962
Initial pass at anon contributions on frontend. 2019-02-23 15:31:07 -05:00
William O'Beirne ae62b726ce
Rip sprout out. (#254) 2019-02-23 15:19:33 -05:00
William O'Beirne b93348820c
Redirect to proposal if you try to edit and its not in draft state. (#242) 2019-02-21 17:07:55 -05:00
Will O'Beirne 6f50a7ae28
Merge develop in. 2019-02-21 12:17:48 -05:00
Daniel Ternyak 95c1f26153
Merge branch 'develop' into comment-moderation 2019-02-20 15:51:55 -06:00
Daniel Ternyak d128d110e6
Merge branch 'develop' into milestone-validation 2019-02-20 15:44:30 -06:00
Will O'Beirne 55687a81af
More granular milestone errors. 2019-02-20 16:34:05 -05:00
Daniel Ternyak 5a7235ab49
Merge branch 'develop' into comment-moderation 2019-02-19 16:46:03 -06:00
Daniel Ternyak 58ebdeb9fa
Merge branch 'develop' into proposal-unlink 2019-02-19 16:36:59 -06:00
Will O'Beirne e05b210b29
Removes non-existent help link. 2019-02-19 16:56:25 -05:00
Will O'Beirne ebc4b8ceee
Stricter milestone validaiton. Dont try to be smart with percentages. 2019-02-19 16:42:40 -05:00
Daniel Ternyak f960351e10
Merge branch 'develop' into handle-hydrated-rfp 2019-02-19 14:42:15 -06:00
Will O'Beirne 5163d87172
Add link for unlinking proposals from requests. 2019-02-19 14:48:51 -05:00
Daniel Ternyak 9516d78190
Merge branch 'develop' into fix-body-more 2019-02-19 13:35:13 -06:00
Will O'Beirne 03865a9ff2
Use ref instead of random id 2019-02-19 14:08:27 -05:00
Will O'Beirne 4755949496
Convert hydrated bounty to BN 2019-02-19 13:58:18 -05:00
Aaron 054b49ecbb
Merge branch 'develop' into comment-moderation 2019-02-19 12:57:06 -06:00
Daniel Ternyak eecfbd3b3d
Merge branch 'develop' into comment-moderation 2019-02-19 10:24:13 -06:00
Daniel Ternyak ceefe0c403
Merge branch 'develop' into rfp-detail 2019-02-18 23:11:24 -06:00
Aaron 8ef9a7e5e4
comment reporting for moderation 2019-02-18 16:35:21 -06:00
Aaron 1a87cadc4d
Merge branch 'develop' into comment-moderation
# Conflicts:
#	backend/grant/utils/pagination.py
#	frontend/client/components/Proposal/Comments/index.tsx
2019-02-18 15:36:31 -06:00
Aaron e8c7dad87f
be & admin moderation & reporting for proposal comments 2019-02-18 15:31:20 -06:00
Daniel Ternyak 00b4a2fbc8
remove empty space 2019-02-18 12:12:25 -06:00
Daniel Ternyak 6183420a9d
Show tags and brief on RFP detail 2019-02-18 12:08:20 -06: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 5e2fdbfea4
Use Modal to present social share option instead of direct pop-up 2019-02-17 15:57:57 -06:00
Daniel Ternyak 75ca7667d8
Refactor CopyInput out into it's own component 2019-02-17 15:57:06 -06:00
Daniel Ternyak 39250211b6
Merge branch 'proposal-and-comment-pagination' into modal-sharing-links 2019-02-17 15:01:06 -06:00
Daniel Ternyak 0ac4c0591d
rename and simplify user profile validation function 2019-02-17 14:36:17 -06:00
Daniel Ternyak 5fb6f4c36a
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into fix-edit-profile 2019-02-17 13:56:09 -06:00
Daniel Ternyak edc5ce54d4
Merge branch 'develop' into proposal-and-comment-pagination 2019-02-17 13:49:41 -06:00
Aaron da889a4f58
paginate comments & "All" stages filter in frontend 2019-02-16 19:33:57 -06:00
William O'Beirne 1be2c5c945
Add bounty banner to campaign block. Reflect bounty in funded amount. Fix some of the cases that opens up. (#213) 2019-02-16 12:32:26 -05:00
Will O'Beirne cbe0ed659c
Add refund address to settings, editable on the account page. 2019-02-16 11:49:32 -05:00
AMStrix be259af0cd
Merge branch 'develop' into redux-alien-auth-events 2019-02-16 08:50:37 -06:00
Aaron 5554f18273
remove commented code 2019-02-15 21:43:32 -06:00
AMStrix 877bc53332 Milestone & Arbiter adjustments (#211)
* ms emails: fix link underline extra space

* fe: team member no arbiter ms action verbiage

* BE: no proposal matching changes after funding + pull proposal state changing into model funcs

* when funding reached with immediate payout skip MS to ACCEPTED (waiting for payment)

* email: fix another trailing link space

* arbiter may not be team-member

* add proposal hybrid property is_failed, true if not funded past deadline

* do not allow setting arbiter on failed proposals

* fix matching and arbiter related tests
2019-02-15 22:35:25 -05:00
Aaron f489b093f6
scripts were getting rendered to html twice, causing double init 2019-02-15 21:28:06 -06:00
Aaron 00dedfbfc0
trigger redux auth state update based on custom auth header 2019-02-15 21:07:41 -06:00
Daniel Ternyak f2c2b70967
Fix 'Edit Profile' form being always disabled; remove email 2019-02-15 13:31:08 -06:00
Daniel Ternyak d01827ec43
Merge branch 'develop' into user-banning 2019-02-15 12:12:18 -06:00