forked from mastodon/mastodon
-
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Bump react-intl from 2.9.0 to 6.2.10 #1965
Open
dependabot
wants to merge
24
commits into
handon-production
Choose a base branch
from
dependabot/npm_and_yarn/react-intl-6.2.10
base: handon-production
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Bump react-intl from 2.9.0 to 6.2.10 #1965
dependabot
wants to merge
24
commits into
handon-production
from
dependabot/npm_and_yarn/react-intl-6.2.10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- 検索クエリを分かち書きを行わない言語に最適化 - 形態素解析を行うためにElasticsearch側にkuromojiを導入 - 検索結果をマッチ度順ではなく日付順に変更 Conflicts: app/chewy/statuses_index.rb
- 投票作成時,その選択肢の数の上限を4から16に変更 - 投票作成時,その有効期限をより細かく設定出来るように変更
- Announcement機能をマージ(lindwurm/mastodon) Conflicts: app/javascript/mastodon/components/status.js
[Fix] InstanceTickerを有効にしても自インスタンスではティッカーを表示しない設定を通知欄にも適用 - InstanceTickerを有効にするテーマの場合,はんドンクラブのティッカーは非表示にしていた - これまでは適用範囲がHTL/FTL/LTLのみだったが,今回それに加えてnotificationも追加した [Change] InstanceTickerのURL変更に対応 https://github.com/InstanceTicker/InstanceTicker/issues/11
- ユニークユーザ5人以上で選出されるものを3人以上で選出されるよう変更 Conflicts: app/models/trending_tags.rb
- カスタム絵文字としてユーザのアイコンが使える機能 - 対象はトゥート,投票の選択肢,お知らせ,アカウントプロフィール欄 - 自サーバの人が他サーバのアカウントのプロフィール絵文字を使うことはできる - 他サーバの人がプロフィール絵文字を使うことはできない
- 3.3.0からHTL上にDMを表示するようになった - きもちわるいので3.2.x以前の表示に戻すオプションをつくり,かつそれを初期値に設定した Conflicts: config/locales/simple_form.en.yml Conflicts: config/locales/simple_form.ja.yml Conflicts: app/lib/feed_manager.rb app/services/fan_out_on_write_service.rb Conflicts: app/models/user.rb config/locales/simple_form.en.yml Conflicts: config/locales/simple_form.ja.yml
- LOAD_PATHへの追加を有効化
Conflicts: app/models/media_attachment.rb
- BlackLeadを追加 - CantaDarkを追加 - Mastodonオリジナルのスタイルを復活
Conflicts: config/locales/simple_form.en.yml Conflicts: config/locales/simple_form.ja.yml Conflicts: app/javascript/styles/mastodon/accounts.scss config/i18n-tasks.yml
- 上級者モードが無効で、かつPC表示の場合に、上部ナビバーのレイアウト崩れが発生していた問題を修正 - 上級者モードが無効で、かつPC表示の場合に、右部ナビバーの投稿ボタンの文言がダミー文字列となっていた問題を修正 - 「Handon」テーマのライトモードにおいて、TL上での公開範囲を表すアイコン色が見づらくなっていたため、色を変更 - 「Handon」テーマのBlackLeadにおいて、通知欄のレイアウト崩れが発生していた問題を修正
Bumps [react-intl](https://github.com/formatjs/formatjs) from 2.9.0 to 6.2.10. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/[email protected]) --- updated-dependencies: - dependency-name: react-intl dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
74087eb
to
679047b
Compare
This pull request has merge conflicts that must be resolved before it can be merged. |
679047b
to
da29416
Compare
da29416
to
b65c2a5
Compare
b65c2a5
to
598835d
Compare
598835d
to
11fa77a
Compare
11fa77a
to
9cf0bd6
Compare
90cd3c8
to
bbfd932
Compare
bbfd932
to
2a585eb
Compare
2a585eb
to
9c1c1ed
Compare
9c1c1ed
to
8c9b7ca
Compare
8c9b7ca
to
a9f6f0c
Compare
a9f6f0c
to
0317a1d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
dependencies
Pull requests that update a dependency file
javascript
Pull requests that update Javascript code
rebase needed 🚧
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps react-intl from 2.9.0 to 6.2.10.
Release notes
Sourced from react-intl's releases.
Commits
7082924
build: publish67180d1
fix(@formatjs/intl-enumerator
): fix package.json87470c9
build: publish447dee8
fix(@formatjs/cli
): drop node requirement to 16203e1a7
build: publishdbd5f8f
feat(@formatjs/icu-messageformat-parser
): throw err when trying to flatten a ...f55cd1d
feat(babel-plugin-formatjs): support $t by default663b3e5
chore: reformat984f923
feat(@formatjs/intl-locale
): implement new proposal features for Intl.Locale ...37dd588
docs: fix examples for intl-localematcher (#3993)Maintainer changes
This version was pushed to npm by longlho, a new releaser for react-intl since your current version.
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)