Skip to content

Commit

Permalink
Merge pull request #745 from nexryai/devel
Browse files Browse the repository at this point in the history
v12.24Q1.1
  • Loading branch information
nexryai authored Feb 13, 2024
2 parents 4274c7f + 6180f04 commit d2d6aa8
Show file tree
Hide file tree
Showing 141 changed files with 28,201 additions and 4,809 deletions.
22 changes: 13 additions & 9 deletions .github/workflows/build-image-devel.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
name: Build container image
name: Build Docker image
on:
workflow_dispatch:
push:
branches:
- "devel"
- 'devel'
jobs:
build-image:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
- uses: docker/login-action@v1
- name: Checkout
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: docker/build-push-action@v2
- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ jobs:
node-version: [18.x, 20.x]

steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ jobs:
- 56312:6379

steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

6 changes: 0 additions & 6 deletions .okteto/okteto-pipeline.yml

This file was deleted.

15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## 12.24Q1.1
- Client: エントランスUIの改修
* 背景未設定でもいい感じのデザインになるようにした
- Fix: 弱すぎるパスワードは登録できないようにする
- Fix: ブロックされてるドメインのメールアドレスでも登録できるように見えてしまう問題を修正
- Backend: 補助的なPermissions-PolicyとCSPを設定
* CSPはそのうちまともにしたい
- sw: オフラインの警告はService Workerからは出さないようにする
* ブラウザの警告の方がローカライズされていて詳細も出るので分かりやすいため
- Fix: 標準でテーマ名が虚無になる問題を修正
- 依存関係のアップデート
* Vueを3.4にアップデート
- v12-LTSの一部更新の取り込み
* ノート編集の受信に対応しました

## 12.23Q4.8
- セキュリティの観点からadmin streamingを廃止
- Fix: Botチャレンジを有効にしてもインジケーターが赤いままになる問題を修正
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at syuilotan@yahoo.co.jp. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at nexryai[a_t]sda1.net. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
278 changes: 0 additions & 278 deletions CONTRIBUTING.md

This file was deleted.

5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-alpine3.17 AS builder
FROM node:20-alpine3.19 AS builder

ARG NODE_ENV=production

Expand All @@ -7,12 +7,11 @@ WORKDIR /misskey
COPY . ./

RUN apk add --no-cache ca-certificates git alpine-sdk g++ build-base cmake clang libressl-dev vips-dev python3
RUN git submodule update --init
RUN yarn install
RUN yarn build
RUN rm -rf .git

FROM node:20-alpine3.17 AS runner
FROM node:20-alpine3.19 AS runner

ARG UID="991"
ARG GID="991"
Expand Down
Loading

0 comments on commit d2d6aa8

Please sign in to comment.