Skip to content

Commit

Permalink
Merge pull request #74 from kokonect-link/develop
Browse files Browse the repository at this point in the history
Release: 13.13.2-cp-4.1.0
  • Loading branch information
noridev authored Jun 20, 2023
2 parents 9f9fc6f + 3661984 commit 28f0522
Show file tree
Hide file tree
Showing 384 changed files with 5,891 additions and 1,920 deletions.
6 changes: 6 additions & 0 deletions .config/docker_example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,12 @@ id: 'aid'
# IP address family used for outgoing request (ipv4, ipv6 or dual)
#outgoingAddressFamily: ipv4

# Cloud Logging
#cloudLogging:
# projectId: example-project-id
# saKeyPath: /path/to/service-account-key.json
# logName: cherrypick

# Proxy for HTTP/HTTPS
#proxy: http://127.0.0.1:3128

Expand Down
6 changes: 6 additions & 0 deletions .config/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ id: 'aid'
# IP address family used for outgoing request (ipv4, ipv6 or dual)
#outgoingAddressFamily: ipv4

# Cloud Logging
#cloudLogging:
# projectId: example-project-id
# saKeyPath: /path/to/service-account-key.json
# logName: cherrypick

# Proxy for HTTP/HTTPS
#proxy: http://127.0.0.1:3128

Expand Down
6 changes: 6 additions & 0 deletions .devcontainer/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,12 @@ id: 'aid'
# IP address family used for outgoing request (ipv4, ipv6 or dual)
#outgoingAddressFamily: ipv4

# Cloud Logging
#cloudLogging:
# projectId: example-project-id
# saKeyPath: /path/to/service-account-key.json
# logName: cherrypick

# Proxy for HTTP/HTTPS
#proxy: http://127.0.0.1:3128

Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: misskey
POSTGRES_DB: cherrypick
volumes:
- postgres-data:/var/lib/postgresql/data
healthcheck:
Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/01_bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ Please include errors from the developer console and/or server log files if you
<!-- Example: Chrome 113.0.5672.126 -->
* Server URL:
<!-- Example: kokonect.link -->
* CherryPick:
13.x.x-cp-4.x.x

### 🛰 Backend (for instance admin)
### 🛰 Backend (for server admin)
<!-- If you are using a managed service, put that after the version. -->

* Installation Method or Hosting Service: <!-- Example: docker compose, k8s/docker, systemd, "CherryPick install shell script", development environment -->
Expand Down
10 changes: 5 additions & 5 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
'packages/sw':
- packages/sw/**/*

'packages/misskey-js':
- packages/misskey-js/**/*
'packages/cherrypick-js':
- packages/cherrypick-js/**/*

'packages/misskey-js:test':
- packages/misskey-js/test/**/*
- packages/misskey-js/test-d/**/*
'packages/cherrypick-js:test':
- packages/cherrypick-js/test/**/*
- packages/cherrypick-js/test-d/**/*
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: API report (misskey.js)
name: API report (cherrypick.js)

on: [push, pull_request]

Expand All @@ -23,14 +23,14 @@ jobs:
run: pnpm i --frozen-lockfile

- name: Build
run: pnpm --filter misskey-js build
run: pnpm --filter cherrypick-js build

- name: Check files
run: ls packages/misskey-js/built
run: ls packages/cherrypick-js/built

- name: API report
run: pnpm --filter misskey-js api-prod
run: pnpm --filter cherrypick-js api-prod

- name: Show report
if: always()
run: cat packages/misskey-js/temp/misskey-js.api.md
run: cat packages/cherrypick-js/temp/cherrypick-js.api.md
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- backend
- frontend
- sw
- misskey-js
- cherrypick-js
steps:
- uses: actions/checkout@v3.3.0
with:
Expand All @@ -62,7 +62,7 @@ jobs:
matrix:
workspace:
- backend
- misskey-js
- cherrypick-js
steps:
- uses: actions/checkout@v3.3.0
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ jobs:
- run: pnpm i --frozen-lockfile
- name: Check pnpm-lock.yaml
run: git diff --exit-code pnpm-lock.yaml
- name: Build misskey-js
run: pnpm --filter misskey-js build
- name: Build cherrypick-js
run: pnpm --filter cherrypick-js build
- name: Build storybook
run: pnpm --filter frontend build-storybook
- name: Publish to Chromatic
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Test (misskey.js)
name: Test (cherrypick.js)

on:
push:
Expand Down Expand Up @@ -38,15 +38,15 @@ jobs:
run: git diff --exit-code pnpm-lock.yaml

- name: Build
run: pnpm --filter misskey-js build
run: pnpm --filter cherrypick-js build

- name: Test
run: pnpm --filter misskey-js test
run: pnpm --filter cherrypick-js test
env:
CI: true

- name: Upload Coverage
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/misskey-js/coverage/coverage-final.json
files: ./packages/cherrypick-js/coverage/coverage-final.json
21 changes: 20 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,24 @@
-->

## 13.x.x (unreleased)

### Client
- Fix: サーバーメトリクスが90度傾いている

## 13.13.2

### General
- エラー時や項目が存在しないときなどのアイコン画像をサーバー管理者が設定できるように
- ロールが付与されているユーザーリストを非公開にできるように
- サーバーの負荷が非常に高いため、ユーザー統計表示機能を削除しました

### Client
- Fix: タブがバックグラウンドでもstreamが切断されないように

### Server
- Fix: キャッシュが溜まり続けないように

## 13.13.1

### Client
Expand Down Expand Up @@ -96,11 +114,12 @@ Meilisearchの設定に`index`が必要になりました。値はMisskeyサー
## 13.12.0

### NOTE
- Node.js 18.6.0以上が必要になりました
- Node.js 18.16.0以上が必要になりました

### General
- アカウントの引っ越し(フォロワー引き継ぎ)に対応
- Meilisearchを全文検索に使用できるようになりました
* 「フォロワーのみ」の投稿は検索結果に表示されません。
- 新規登録前に簡潔なルールをユーザーに表示できる、サーバールール機能を追加
- ユーザーへの自分用メモ機能
* ユーザーに対して、自分だけが見られるメモを追加できるようになりました。
Expand Down
Loading

0 comments on commit 28f0522

Please sign in to comment.