13e8936ade
Merge branch 'develop' into homepage-image-load
2019-03-06 17:46:20 -06:00
e9a052870c
Change homepage splash image to background image that keeps its place before loading.
2019-03-06 18:39:44 -05:00
9d51e325ec
BNify RFPs
2019-03-06 18:21:12 -05:00
312818d71a
New footer ( #300 )
...
* Finalize design and layout.
* Change about page to redirect.
2019-03-06 15:50:32 -06:00
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
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
2019-03-06 12:56:01 -06:00
bbf7b3eab0
FE: convert profile comment dateCreated to milliseconds
2019-03-05 11:40:25 -06:00
c600404540
FE: use Markdown for Profile comments
2019-03-05 11:35:40 -06:00
2097cd60a4
Merge branch 'develop' into default-funding-proposals
2019-03-05 10:44:12 -06:00
a5ca90874f
Update Payment.tsx
2019-03-04 19:20:33 -06:00
f7488d4018
Merge branch 'develop' into require-sapling-payout
2019-03-04 19:18:10 -06:00
78e86763bb
Merge branch 'develop' into mobile-menu-fixes
2019-03-04 17:04:29 -06:00
fe504e47e4
Merge branch 'develop' into rfp-bounty-fixes
2019-03-04 16:44:49 -06:00
937d894645
Require sapling payout address.
2019-03-04 15:02:51 -05:00
9363d53378
Prevent overflow x on homepage.
2019-03-04 14:45:03 -05:00
454dcbc901
Default browse proposals filter to funding require proposals.
2019-03-04 14:31:05 -05:00
831488d54d
Highlight active page correctly.
2019-03-04 14:09:37 -05:00
d5e059a474
Close drawer on navigation.
2019-03-04 14:02:07 -05:00
2cc5ade673
Sort homepage rfps by bounty. Fix admin views and some bounty logic.
2019-03-04 13:52:57 -05:00
5e6b46f8f4
Merge branch 'develop' into homepage-redesign
2019-02-27 17:11:42 -06:00
20e8480d14
PR review
2019-02-27 17:09:36 -06:00
063dbdde7c
Don't show sign up if they're signed in.
2019-02-26 17:13:57 -05:00
c5463aea1e
i18n the homepage.
2019-02-26 17:08:04 -05:00
e9576b26a2
Size tweak
2019-02-26 16:40:19 -05:00
c7186ca567
Responsive for other sections.
2019-02-26 16:36:07 -05:00
39102f6164
Responsive home intro
2019-02-26 16:23:36 -05:00
3f7cbbc4df
SSR fetch, fix some states for requests loading.
2019-02-26 16:10:09 -05:00
378765ebce
Initial pass at homepage full width. Not yet responsive or using localization.
2019-02-26 15:58:25 -05:00
828be6ca01
Fix tsc
2019-02-26 12:41:39 -05:00
560f63847e
More considerations for anonymous contributions on the frontend.
2019-02-25 14:46:47 -05:00
a2d89f2910
Pose a warning to user before contributing anonymously. Handle anonymous user in user row.
2019-02-25 14:26:02 -05:00
6f7de989e7
Merge branch 'develop' into anonymous-contributions
2019-02-25 11:43:36 -05:00
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
4c3a2127a8
Upgrade ant-design-pro to 2.2.1 to fix some dependency issues. ( #258 )
2019-02-25 11:21:37 -05:00
06add917b5
Merge branch 'develop' into anonymous-contributions
2019-02-23 16:53:59 -05:00
0b2676563a
fe: Placeholder loading state & use it for profile tabs + RFPs list ( #255 )
2019-02-23 16:46:35 -05:00
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
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
115b127962
Initial pass at anon contributions on frontend.
2019-02-23 15:31:07 -05:00
ae62b726ce
Rip sprout out. ( #254 )
2019-02-23 15:19:33 -05:00
b93348820c
Redirect to proposal if you try to edit and its not in draft state. ( #242 )
2019-02-21 17:07:55 -05:00
6f50a7ae28
Merge develop in.
2019-02-21 12:17:48 -05:00
95c1f26153
Merge branch 'develop' into comment-moderation
2019-02-20 15:51:55 -06:00
d128d110e6
Merge branch 'develop' into milestone-validation
2019-02-20 15:44:30 -06:00
55687a81af
More granular milestone errors.
2019-02-20 16:34:05 -05:00
5a7235ab49
Merge branch 'develop' into comment-moderation
2019-02-19 16:46:03 -06:00
58ebdeb9fa
Merge branch 'develop' into proposal-unlink
2019-02-19 16:36:59 -06:00
e05b210b29
Removes non-existent help link.
2019-02-19 16:56:25 -05:00
ebc4b8ceee
Stricter milestone validaiton. Dont try to be smart with percentages.
2019-02-19 16:42:40 -05:00
f960351e10
Merge branch 'develop' into handle-hydrated-rfp
2019-02-19 14:42:15 -06:00
5163d87172
Add link for unlinking proposals from requests.
2019-02-19 14:48:51 -05:00
9516d78190
Merge branch 'develop' into fix-body-more
2019-02-19 13:35:13 -06:00
03865a9ff2
Use ref instead of random id
2019-02-19 14:08:27 -05:00
4755949496
Convert hydrated bounty to BN
2019-02-19 13:58:18 -05:00
054b49ecbb
Merge branch 'develop' into comment-moderation
2019-02-19 12:57:06 -06:00
eecfbd3b3d
Merge branch 'develop' into comment-moderation
2019-02-19 10:24:13 -06:00
ceefe0c403
Merge branch 'develop' into rfp-detail
2019-02-18 23:11:24 -06:00
8ef9a7e5e4
comment reporting for moderation
2019-02-18 16:35:21 -06:00
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
e8c7dad87f
be & admin moderation & reporting for proposal comments
2019-02-18 15:31:20 -06:00
00b4a2fbc8
remove empty space
2019-02-18 12:12:25 -06:00
6183420a9d
Show tags and brief on RFP detail
2019-02-18 12:08:20 -06:00
d51877d1e3
Update all profile tabs to use placeholders with both titles and subtitles
2019-02-17 16:37:11 -06:00
5e2fdbfea4
Use Modal to present social share option instead of direct pop-up
2019-02-17 15:57:57 -06:00
75ca7667d8
Refactor CopyInput out into it's own component
2019-02-17 15:57:06 -06:00
39250211b6
Merge branch 'proposal-and-comment-pagination' into modal-sharing-links
2019-02-17 15:01:06 -06:00
0ac4c0591d
rename and simplify user profile validation function
2019-02-17 14:36:17 -06:00
5fb6f4c36a
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into fix-edit-profile
2019-02-17 13:56:09 -06:00
edc5ce54d4
Merge branch 'develop' into proposal-and-comment-pagination
2019-02-17 13:49:41 -06:00
da889a4f58
paginate comments & "All" stages filter in frontend
2019-02-16 19:33:57 -06:00
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
cbe0ed659c
Add refund address to settings, editable on the account page.
2019-02-16 11:49:32 -05:00
be259af0cd
Merge branch 'develop' into redux-alien-auth-events
2019-02-16 08:50:37 -06:00
5554f18273
remove commented code
2019-02-15 21:43:32 -06:00
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
f489b093f6
scripts were getting rendered to html twice, causing double init
2019-02-15 21:28:06 -06:00
00dedfbfc0
trigger redux auth state update based on custom auth header
2019-02-15 21:07:41 -06:00
f2c2b70967
Fix 'Edit Profile' form being always disabled; remove email
2019-02-15 13:31:08 -06:00
d01827ec43
Merge branch 'develop' into user-banning
2019-02-15 12:12:18 -06:00
ac3bfb66c8
Tags for list view, bold bounty and matching on detail view.
2019-02-15 12:46:50 -05:00
f30d53c21c
Merge branch 'develop' into user-banning
...
# Conflicts:
# backend/grant/utils/pagination.py
2019-02-14 22:25:03 -06:00
1d811bb7d3
BE: user banning + silencing + pagination
2019-02-14 22:11:47 -06:00
31345c57b6
Merge develop in
2019-02-14 19:08:18 -05:00
16ed593304
Merge branch 'develop' into zcash-milestones
...
# Conflicts:
# frontend/client/modules/create/utils.ts
2019-02-13 14:38:52 -06:00
47f827693d
mileston payout emails + some bug fixes
2019-02-13 14:30:58 -06:00
fd9a4c5393
full payout flow operational
2019-02-13 10:54:46 -06:00
c47c69ea3c
tsc fixes
2019-02-11 23:42:21 -06:00
380eec005e
payout endpoints + redux actions + ms UX refactors
2019-02-11 23:10:09 -06:00
dc92d3f297
Merge branch 'develop' into zcash-milestones
...
# Conflicts:
# backend/grant/proposal/models.py
# backend/grant/utils/enums.py
# frontend/client/modules/create/utils.ts
# frontend/stories/props.tsx
# frontend/types/proposal.ts
2019-02-11 16:51:31 -06:00
ac5bef5c6f
FE: rework milestones first pass
2019-02-11 15:22:40 -06:00
7d6d38552c
remove DApp category
2019-02-10 16:15:36 -06:00
f15c110f92
Merge branch 'develop' into arbiter-management
2019-02-10 15:53:29 -06:00
c4b7e281a5
Merge branch 'develop' into comment-placeholder
2019-02-10 13:34:36 -06:00
536a98694c
handle not signed in users
2019-02-10 13:33:02 -06:00
7a036058f6
FE: more robust arbiter + arbiter accept email validation code page
2019-02-09 21:03:19 -06:00
2a0e12194c
Add resend button to email settings
2019-02-08 14:57:54 -05:00
263764255b
Frontend for new RFP fields.
2019-02-08 14:02:34 -05:00
fee2708334
Replace placeholder comment blocker with disabled markdown input and message
2019-02-08 11:14:16 -06:00
d11fa489d5
Remove comments option from updates ( #177 )
2019-02-08 11:18:58 -05:00
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
Daniel Ternyak
Will O'Beirne
AMStrix