diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000000..3070056da1 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,10 @@ +[gitflow "branch"] + master = v11-lts + develop = develop +[gitflow "prefix"] + feature = feat/ + bugfix = fix/ + release = release/ + hotfix = fix/ + support = chore/ + versiontag = diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0e9308d799..047e8e1ff8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,7 @@ updates: schedule: interval: "daily" open-pull-requests-limit: 99 + target-branch: "develop" labels: - "📦Dependencies" - "🧶JavaScript" @@ -18,6 +19,7 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" + target-branch: "develop" labels: - "📦Dependencies" - "⚓Docker" @@ -26,6 +28,7 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" + target-branch: "develop" labels: - "📦Dependencies" - "⛓Submodules" diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 7b19439d2c..b2f1b00c02 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -59,11 +59,13 @@ jobs: run: docker build . --file Dockerfile --tag $IMAGE_NAME - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin + #run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Push image run: | - IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME + #IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME + IMAGE_ID=ghcr.io/teamblackcrystal/$IMAGE_NAME # Change all uppercase to lowercase IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 459a9269cf..c8cbade308 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [12.x, 14.x, 16.x] + node-version: [12.x, 14.x, 16.x, 17.x] python-version: [3.9] services: diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index edd4fd4af8..51b309d9b4 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - node-version: [12.x, 14.x, 16.x] + node-version: [12.x, 14.x, 16.x, 17.x] services: postgres: diff --git a/CHANGELOG.md b/CHANGELOG.md index 509a5b64d0..c99d46a91c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,13 +17,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - クライアント: メンションにユーザーのアバターを表示するように - インスタンスプロフィールレンダリング ready -- カスタム絵文字エクスポート機能 +- 猫耳動かす AS-3 + +### Changed + +- 通知にブラーと丸みを追加 AS-20 + - firefoxはconfigでブラーを有効にしても正常に動作しない可能性があります +- ウィジェットの丸みを強化 AS-16 ### Fixed +- バッヂにカーソルを合わせた際に説明を出すように +- フォロー申請を有効にした状態でフォローリクエストが来ると メニューにtrueと表示される AS-15 - デスクトップ版で通知が何もないとemptyと出る不具合 AS-10 - YAMLファイルへのバックスペース文字混入対策 - +- 猫耳の色が場所によって違う AS-17 ## [11.37.1-rei0784-5.17.2] 2021-12-07 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 74f1691277..a7f5a55907 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -378,6 +378,10 @@ common: update-available-title: "更新があります" update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。" my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。" + admin-user: "管理者" + lady-user: "お嬢様" + bot-user: "Bot" + cat-user: "猫(=^・・^=)" verified-user: "公式アカウント" premium-user: "プレミアムユーザー" hide-password: "パスワードを隠す" @@ -1392,6 +1396,7 @@ desktop/views/components/ui.header.account.vue: follow-requests: "フォロー申請" admin: "管理" room: "ルーム" + follow-request-true: 新着 desktop/views/components/ui.header.nav.vue: game: "ゲーム" diff --git a/package.json b/package.json index 72d15b10ca..e3daa3e9fe 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "yupix ", "syuilo " ], - "version": "11.37.1-rei0784-5.17.2", + "version": "11.37.1-rei0784-5.18.0", "codename": "malachite", "repository": { "type": "git", @@ -41,7 +41,7 @@ "gulp/gulp-cli/yargs/yargs-parser": "5.0.0-security.0" }, "dependencies": { - "@ayuskey/summaly": "2.4.1-rei0784.3", + "@ayuskey/summaly": "2.5.0-rei0784.3", "@elastic/elasticsearch": "7.16.0", "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-brands-svg-icons": "5.15.4", @@ -117,7 +117,6 @@ "@typescript-eslint/parser": "5.8.0", "@vue/composition-api": "1.4.3", "abort-controller": "3.0.0", - "archiver": "5.3.0", "animejs": "3.2.1", "apexcharts": "3.32.1", "autobind-decorator": "2.4.0", @@ -187,7 +186,6 @@ "langmap": "0.0.16", "loader-utils": "2.0.0", "lodash": "4.17.21", - "mime-types": "2.1.34", "mocha": "9.1.3", "moji": "0.5.1", "ms": "2.1.3", diff --git a/src/client/app/admin/views/dashboard.charts.vue b/src/client/app/admin/views/dashboard.charts.vue index b2ac19efff..b5441fc10b 100644 --- a/src/client/app/admin/views/dashboard.charts.vue +++ b/src/client/app/admin/views/dashboard.charts.vue @@ -496,6 +496,10 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/components/ui.header.notifications.vue b/src/client/app/desktop/views/components/ui.header.notifications.vue index d3316d6a89..d1d9b8a4e4 100644 --- a/src/client/app/desktop/views/components/ui.header.notifications.vue +++ b/src/client/app/desktop/views/components/ui.header.notifications.vue @@ -101,7 +101,9 @@ export default Vue.extend({ right -72px width 300px background $bgcolor - border-radius 4px + border-radius 16px + padding 16px + backdrop-filter blur(10px) box-shadow 0 1px 4px rgba(#000, 0.25) &:before diff --git a/src/client/app/desktop/views/widgets/profile.vue b/src/client/app/desktop/views/widgets/profile.vue index bad1925f69..ca4fae4a93 100644 --- a/src/client/app/desktop/views/widgets/profile.vue +++ b/src/client/app/desktop/views/widgets/profile.vue @@ -54,6 +54,12 @@ export default define({ }); + +