Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: v5.6.5 #4922

Merged
merged 21 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2e8ffeb
feat(campaign): add and remove featured articles to campaign
gitwoz Oct 21, 2024
499e3e1
chore: correct translations
gitwoz Oct 21, 2024
6db96fa
feat(campaign): add CampaignArticleNotice
gitwoz Oct 22, 2024
6be50c9
Merge branch 'develop' into feat/campaign-featured-articles
gitwoz Oct 23, 2024
47e4b1d
feat(ipfs): revise ipfs gateways and fixed resolve
gitwoz Oct 23, 2024
958c0af
Merge pull request #4910 from thematters/feat/ipfs-gws
robertu7 Oct 23, 2024
2278efd
Merge branch 'develop' into feat/campaign-featured-articles
gitwoz Oct 24, 2024
8d70616
Merge pull request #4908 from thematters/feat/campaign-featured-articles
gitwoz Oct 24, 2024
b9fab6d
feat(campaign): show featured label
gitwoz Oct 24, 2024
dca5614
Merge pull request #4911 from thematters/feat/featued-label-campaign
robertu7 Oct 25, 2024
251e86f
feat(campaign): revise copy and show label on featured feed
gitwoz Oct 25, 2024
2c6a465
chore(copy): revise apply campaign copy
gitwoz Oct 28, 2024
e9beb66
Merge pull request #4912 from thematters/fix/copy-label
robertu7 Oct 28, 2024
c8fa0a1
fix(copy): correct campaign label copy
gitwoz Oct 29, 2024
7e5f534
Merge pull request #4920 from thematters/fix/campaign-copy
pauljusti Oct 29, 2024
6553816
chore(release):v5.6.5
gitwoz Oct 29, 2024
bd087fe
Merge pull request #4921 from thematters/release/v5.6.5
pauljusti Oct 29, 2024
ff8d175
refactor: remove unused scrollbar correction
gitwoz Oct 29, 2024
29d9ea7
Merge pull request #4925 from thematters/fix/remove-unused-scrollbar-fix
pauljusti Oct 29, 2024
18bec85
feat(campaign): skip avatar shuffling if it does not exceed the max c…
gitwoz Oct 29, 2024
f1103f0
Merge pull request #4924 from thematters/fix/campaign-shuffle-avatar
pauljusti Oct 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions lang/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,9 @@
"defaultMessage": "liked your deleted moment",
"description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
},
"5SgH7l": {
"defaultMessage": "The article has been added to the Featured"
},
"5UglrB": {
"defaultMessage": "Successfully delivered"
},
Expand Down Expand Up @@ -1341,9 +1344,6 @@
"defaultMessage": "Topics",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
},
"KkHQZ+": {
"defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
},
"KlJEP9": {
"defaultMessage": "Wallet connected",
"description": "src/components/Forms/WalletAuthForm/Connect.tsx"
Expand Down Expand Up @@ -1659,6 +1659,9 @@
"Q8Qw5B": {
"defaultMessage": "Description"
},
"QFCfA7": {
"defaultMessage": "Add featured on Free Write"
},
"QQSdHP": {
"defaultMessage": "View More"
},
Expand Down Expand Up @@ -1731,6 +1734,10 @@
"Rc4Oij": {
"defaultMessage": "Firebolt"
},
"RkyEBL": {
"defaultMessage": "Featured",
"description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
},
"RnKPVm": {
"defaultMessage": "{articleCount} articles"
},
Expand Down Expand Up @@ -2168,6 +2175,9 @@
"ZEMcZ6": {
"defaultMessage": "Article Management"
},
"ZN1IzT": {
"defaultMessage": "Remove featured from Free Write"
},
"ZNK0I9": {
"defaultMessage": "liked your comment"
},
Expand Down Expand Up @@ -2669,6 +2679,9 @@
"defaultMessage": "Reviewing...",
"description": "type:apply"
},
"jXDxa6": {
"defaultMessage": "The article has been removed from the Featured"
},
"jiB0Z2": {
"defaultMessage": "Unable to bind wallet",
"description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
Expand Down Expand Up @@ -2760,6 +2773,9 @@
"defaultMessage": "Last step: Set Matters ID",
"description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
},
"l0tvVM": {
"defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
},
"l2eEyp": {
"defaultMessage": "Transaction Password successfully changed."
},
Expand Down Expand Up @@ -2813,6 +2829,10 @@
"ll/ufR": {
"defaultMessage": "Trending"
},
"lo8eLY": {
"defaultMessage": "Your article {articleTitle} has been listed as a feature of Free Write in 7 days. Come and view more wonderful articles!",
"description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
},
"lqdpsm": {
"defaultMessage": "Back to subscribe"
},
Expand Down
26 changes: 23 additions & 3 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,9 @@
"defaultMessage": "liked your deleted moment",
"description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
},
"5SgH7l": {
"defaultMessage": "The article has been added to the Featured"
},
"5UglrB": {
"defaultMessage": "Successfully delivered"
},
Expand Down Expand Up @@ -1341,9 +1344,6 @@
"defaultMessage": "Topics",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
},
"KkHQZ+": {
"defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
},
"KlJEP9": {
"defaultMessage": "Wallet connected",
"description": "src/components/Forms/WalletAuthForm/Connect.tsx"
Expand Down Expand Up @@ -1659,6 +1659,9 @@
"Q8Qw5B": {
"defaultMessage": "Description"
},
"QFCfA7": {
"defaultMessage": "Add featured on Free Write"
},
"QQSdHP": {
"defaultMessage": "View More"
},
Expand Down Expand Up @@ -1731,6 +1734,10 @@
"Rc4Oij": {
"defaultMessage": "Firebolt"
},
"RkyEBL": {
"defaultMessage": "Featured",
"description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
},
"RnKPVm": {
"defaultMessage": "{articleCount} articles"
},
Expand Down Expand Up @@ -2168,6 +2175,9 @@
"ZEMcZ6": {
"defaultMessage": "Article Management"
},
"ZN1IzT": {
"defaultMessage": "Remove featured from Free Write"
},
"ZNK0I9": {
"defaultMessage": "liked your comment"
},
Expand Down Expand Up @@ -2669,6 +2679,9 @@
"defaultMessage": "Reviewing...",
"description": "type:apply"
},
"jXDxa6": {
"defaultMessage": "The article has been removed from the Featured"
},
"jiB0Z2": {
"defaultMessage": "Unable to bind wallet",
"description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
Expand Down Expand Up @@ -2760,6 +2773,9 @@
"defaultMessage": "Last step: Set Matters ID",
"description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
},
"l0tvVM": {
"defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
},
"l2eEyp": {
"defaultMessage": "Transaction Password successfully changed."
},
Expand Down Expand Up @@ -2813,6 +2829,10 @@
"ll/ufR": {
"defaultMessage": "Trending"
},
"lo8eLY": {
"defaultMessage": "Your article {articleTitle} has been listed as a feature of Free Write in 7 days. Come and view more wonderful articles!",
"description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
},
"lqdpsm": {
"defaultMessage": "Back to subscribe"
},
Expand Down
26 changes: 23 additions & 3 deletions lang/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,9 @@
"defaultMessage": "喜欢你已删除的动态",
"description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
},
"5SgH7l": {
"defaultMessage": "作品已添加至自由写精选"
},
"5UglrB": {
"defaultMessage": "送出成功"
},
Expand Down Expand Up @@ -1341,9 +1344,6 @@
"defaultMessage": "标签",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
},
"KkHQZ+": {
"defaultMessage": "现在报名,写作之旅将于数天后开始,活动细则可查看公告。(报名确认通常需要几分钟审核时间,之后你的头像将出现在作者之中)"
},
"KlJEP9": {
"defaultMessage": "钱包已绑定",
"description": "src/components/Forms/WalletAuthForm/Connect.tsx"
Expand Down Expand Up @@ -1659,6 +1659,9 @@
"Q8Qw5B": {
"defaultMessage": "描述"
},
"QFCfA7": {
"defaultMessage": "添加到自由写精选"
},
"QQSdHP": {
"defaultMessage": "查看更多"
},
Expand Down Expand Up @@ -1731,6 +1734,10 @@
"Rc4Oij": {
"defaultMessage": "火闪电"
},
"RkyEBL": {
"defaultMessage": "精华",
"description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
},
"RnKPVm": {
"defaultMessage": "{articleCount} 篇文章"
},
Expand Down Expand Up @@ -2168,6 +2175,9 @@
"ZEMcZ6": {
"defaultMessage": "作品管理"
},
"ZN1IzT": {
"defaultMessage": "从自由写精华中移除"
},
"ZNK0I9": {
"defaultMessage": "喜欢你的评论"
},
Expand Down Expand Up @@ -2669,6 +2679,9 @@
"defaultMessage": "报名处理中⋯",
"description": "type:apply"
},
"jXDxa6": {
"defaultMessage": "作品已从自由写精华中移除"
},
"jiB0Z2": {
"defaultMessage": "无法绑定钱包",
"description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
Expand Down Expand Up @@ -2760,6 +2773,9 @@
"defaultMessage": "最后一步:设置 Matters ID",
"description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
},
"l0tvVM": {
"defaultMessage": "现在报名,写作之旅将于数天后开始,活动细则可查看公告。"
},
"l2eEyp": {
"defaultMessage": "交易密码重置成功"
},
Expand Down Expand Up @@ -2813,6 +2829,10 @@
"ll/ufR": {
"defaultMessage": "热门"
},
"lo8eLY": {
"defaultMessage": "你的作品 {articleTitle} 已被列为七日书精选之作,快来看看更多精彩好文!",
"description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
},
"lqdpsm": {
"defaultMessage": "回到订阅"
},
Expand Down
26 changes: 23 additions & 3 deletions lang/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,9 @@
"defaultMessage": "喜歡你已刪除的動態",
"description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
},
"5SgH7l": {
"defaultMessage": "作品已添加至自由寫精華"
},
"5UglrB": {
"defaultMessage": "送出成功"
},
Expand Down Expand Up @@ -1341,9 +1344,6 @@
"defaultMessage": "標籤",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
},
"KkHQZ+": {
"defaultMessage": "現在報名,寫作之旅將於數天後開始,活動細則可查看公告。(報名確認通常需要幾分鐘審核時間,之後你的頭像將出現在作者之中)"
},
"KlJEP9": {
"defaultMessage": "錢包已綁定",
"description": "src/components/Forms/WalletAuthForm/Connect.tsx"
Expand Down Expand Up @@ -1659,6 +1659,9 @@
"Q8Qw5B": {
"defaultMessage": "描述"
},
"QFCfA7": {
"defaultMessage": "添加到自由寫精華"
},
"QQSdHP": {
"defaultMessage": "查看更多"
},
Expand Down Expand Up @@ -1731,6 +1734,10 @@
"Rc4Oij": {
"defaultMessage": "火閃電"
},
"RkyEBL": {
"defaultMessage": "精華",
"description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
},
"RnKPVm": {
"defaultMessage": "{articleCount} 篇文章"
},
Expand Down Expand Up @@ -2168,6 +2175,9 @@
"ZEMcZ6": {
"defaultMessage": "作品管理"
},
"ZN1IzT": {
"defaultMessage": "从自由寫精華中移除"
},
"ZNK0I9": {
"defaultMessage": "喜歡你的評論"
},
Expand Down Expand Up @@ -2669,6 +2679,9 @@
"defaultMessage": "報名處理中⋯",
"description": "type:apply"
},
"jXDxa6": {
"defaultMessage": "作品已從自由寫精華中移除"
},
"jiB0Z2": {
"defaultMessage": "無法綁定錢包",
"description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
Expand Down Expand Up @@ -2760,6 +2773,9 @@
"defaultMessage": "最後一步:設置 Matters ID",
"description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
},
"l0tvVM": {
"defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
},
"l2eEyp": {
"defaultMessage": "交易密碼重置成功"
},
Expand Down Expand Up @@ -2813,6 +2829,10 @@
"ll/ufR": {
"defaultMessage": "熱門"
},
"lo8eLY": {
"defaultMessage": "你的作品 {articleTitle} 已被列為七日書精選之作,快來看看更多精彩好文!",
"description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
},
"lqdpsm": {
"defaultMessage": "回到訂閱"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "matters-web",
"version": "5.6.4",
"version": "5.6.5",
"description": "codebase of Matters' website",
"author": "Matters <hi@matters.town>",
"engines": {
Expand Down
3 changes: 3 additions & 0 deletions public/static/icons/24px/star.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 1 addition & 10 deletions src/common/enums/csp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,19 +143,10 @@ const CONNECT_SRC = [
'*.alchemy.com',

// IPFS Gateways
'gateway.ipfs.io/ipfs/',
'gw3.io/ipfs/',
'cloudflare-ipfs.com/ipfs/',
'ipfs.io/ipfs/',
'*.cf-ipfs.com',
'cf-ipfs.com/ipfs/',
'4everland.io/ipfs/',
'*.4everland.io',
'storry.tv/ipfs/',
'*.storry.tv',
'ipfs.runfission.com/ipfs/',
'konubinix.eu/ipfs/',
'starbase.gw3.io/ipfs/',
'*.gw3.io',
]

const FRAME_SRC = [
Expand Down
1 change: 1 addition & 0 deletions src/common/enums/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ export enum TEST_ID {
NOTICE_MOMENT_MENTIONED = 'notice/moment-mentioned',
NOTICE_MOMENT_LIKED = 'notice/moment-liked',
NOTICE_COLLECTION_TITLE = 'notice/collection/title',
NOTICE_CAMPAIGN_ARTICLE_FEATURED = 'notice/campaign-article-featured',
// me
ME_WALLET_TRANSACTIONS_ITEM = 'me/wallet/transactions/item',
ME_WALLET_TRANSACTIONS_ITEM_AMOUNT = 'me/wallet/transactions/item/amount',
Expand Down
1 change: 1 addition & 0 deletions src/common/styles/variables/colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
--color-free-write-green-text: #398449;
--color-free-write-green-bg: #d9f8dd;
--color-free-write-green-bg-hover: #bdf4c4;
--color-free-write-green-label: #94d09c;

/* others */
--color-noir: #000;
Expand Down
Loading
Loading