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

Merge upstream #358

Merged
merged 6 commits into from
Jan 14, 2024
Merged

Merge upstream #358

merged 6 commits into from
Jan 14, 2024

Commits on Jan 14, 2024

  1. 完成 (misskey-dev#12980)

    ikasoba authored Jan 14, 2024
    Configuration menu
    Copy the full SHA
    79a9def View commit details
    Browse the repository at this point in the history
  2. enhance(frontend): Playの説明欄にMFMを使えるように (misskey-dev#12899)

    * (enhance) Playの説明欄にMFMを使えるように
    
    * Update Changelog
    
    * use class for mfm component
    
    * Update packages/frontend/src/pages/flash/flash-edit.vue
    
    Co-authored-by: 1Step621 <[email protected]>
    
    * Update flash.vue
    
    * Update CHANGELOG.md
    
    ---------
    
    Co-authored-by: 1Step621 <[email protected]>
    kakkokari-gtyih and 1STEP621 authored Jan 14, 2024
    Configuration menu
    Copy the full SHA
    12142a2 View commit details
    Browse the repository at this point in the history
  3. fix: isPrivateIpで検証時にipバージョンが一致するかを確認するように (misskey-dev#12988)

    * fix: isPrivateIpで検証時にipバージョンが一致するかを確認するように
    
    * Update CHANGELOG.md
    
    * Update CHANGELOG.md
    GrapeApple0 authored Jan 14, 2024
    Configuration menu
    Copy the full SHA
    ec4e57b View commit details
    Browse the repository at this point in the history
  4. enhance(frontend) 日本語の拡張絵文字辞書を追加 (misskey-dev#12855)

    * Create ja-JP.json
    
    * Update general.vue
    
    * Update ja-JP.json
    
    * Update ja-JP.json
    
    * Update ja-JP.json
    
    * fix
    
    * fix design
    
    * (Add) ひらがな [wip]
    
    * fix lint
    
    * Apply suggestions from code review
    
    Co-authored-by: 1Step621 <[email protected]>
    
    * (add) ja-JP_hira
    
    Co-authored-by: 1Step621 <[email protected]>
    
    * (enhance) 言語名をちゃんと表示するように
    
    ---------
    
    Co-authored-by: 1Step621 <[email protected]>
    kakkokari-gtyih and 1STEP621 authored Jan 14, 2024
    Configuration menu
    Copy the full SHA
    0ea8e0c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c71c454 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4908ee5 View commit details
    Browse the repository at this point in the history