Merge commit 'f9c58d1309896a81db20eef1715865b8d650b82d' into update-n…

…eko/2024.11.0-fixup

.github/pull_request_template.md

@@ -22,3 +22,4 @@ https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
 - [ ] (If needed) Add story of storybook
 - [ ] (If needed) Update CHANGELOG.md
 - [ ] (If possible) Add tests
+- [ ] (If possible) Publish docker image

.github/workflows/docker-develop.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY_IMAGE: misskey/misskey
+  REGISTRY_IMAGE: nekoplanet/nekoplanet
 
 jobs:
   # see https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
@@ -20,7 +20,7 @@ jobs:
         platform:
           - linux/amd64
           - linux/arm64
-    if: github.repository == 'misskey-dev/misskey'
+    if: github.repository == 'nekoplanet/misskey'
     steps:
       - name: Prepare
         run: |

.github/workflows/docker.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY_IMAGE: misskey/misskey
+  REGISTRY_IMAGE: nekoplanet/nekoplanet
   TAGS: |
     type=edge
     type=ref,event=pr
@@ -26,6 +26,7 @@ jobs:
         platform:
           - linux/amd64
           - linux/arm64
+    if: github.repository == 'nekoplanet/misskey'
     steps:
       - name: Prepare
         run: |

.github/workflows/ok-to-test.yml

@@ -9,7 +9,9 @@ jobs:
   ok-to-test:
     runs-on: ubuntu-latest
     # Only run for PRs, not issue comments
-    if: ${{ github.event.issue.pull_request }}
+    if:
+    - ${{ github.event.issue.pull_request }}
+    - github.repository == 'misskey-dev/misskey'
     steps:
     # Generate a GitHub App installation access token from an App ID and private key
     # To create a new GitHub App:

Changelog-neko.md

@@ -0,0 +1,35 @@
+## Unreleased (2024.9.0+neko.rc-2)
+
+### General
+- Feat: 사용자 등록을 승인제로 할 수 있도록
+(pull from 0e2e4c353f6d2fd2cc650007ec2f6a876acde8f7)
+
+### Frontend
+
+### Backend
+
+### misskey-js
+
+### develop
+
+## 2024.9.0+neko-rc
+
+### General
+- Fix: 프론트엔드의 타입 이슈
+- Feat: 노트 수정 기능 부활  
+(cherry-pick from yunochi#4)
+- Feat: 리모트 아바타 데코 연합  
+(cherry-pick from yunochi#1 and 7dc3d230dda0f1ccac7e82e64c0cf4848994e1fc)
+- Style: 기본 폰트 및 스킨셋 변경
+- Feat (locale): 어딘가에 묻혀 있던 로케일 추가
+- 각종 디펜던시 업데이트 및 수정
+
+### Backend
+- 최신 nsfwjs의 import 오류 대응
+
+### Frontend
+- Feat: "다른 계정 추가" 버튼 아래에 "새 계정 추가" 버튼이 살아 있어서 지웠습니다
+- Fix (test): 회원가입 관련 테스트 삭제
+
+### develop
+- QoL: `misskey-js`의 갱신과 이를 적용한 전체 빌드의 자동화 스크립트 추가

chart/files/default.yml

@@ -216,6 +216,9 @@ id: "aidx"
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
+# Proxy remote files (default: true)
+proxyRemoteFiles: true
+
 # Sign to ActivityPub GET request (default: true)
 signToActivityPubGet: true
 

cypress/e2e/basic.cy.ts

@@ -50,49 +50,6 @@ describe('After setup instance', () => {
 
   it('successfully loads', () => {
     cy.visitHome();
-  });
-
-	it('signup', () => {
-		cy.visitHome();
-
-		cy.intercept('POST', '/api/signup').as('signup');
-
-		cy.get('[data-cy-signup]').click();
-		cy.get('[data-cy-signup-rules-continue]').should('be.disabled');
-		cy.get('[data-cy-signup-rules-notes-agree] [data-cy-switch-toggle]').click();
-		cy.get('[data-cy-modal-dialog-ok]').click();
-		cy.get('[data-cy-signup-rules-continue]').should('not.be.disabled');
-		cy.get('[data-cy-signup-rules-continue]').click();
-
-		cy.get('[data-cy-signup-submit]').should('be.disabled');
-		cy.get('[data-cy-signup-username] input').type('alice');
-		cy.get('[data-cy-signup-submit]').should('be.disabled');
-		cy.get('[data-cy-signup-password] input').type('alice1234');
-		cy.get('[data-cy-signup-submit]').should('be.disabled');
-		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
-		cy.get('[data-cy-signup-submit]').should('not.be.disabled');
-		cy.get('[data-cy-signup-submit]').click();
-
-		cy.wait('@signup');
-  });
-
-  it('signup with duplicated username', () => {
-		cy.registerUser('alice', 'alice1234');
-
-		cy.visitHome();
-
-		// ユーザー名が重複している場合の挙動確認
-		cy.get('[data-cy-signup]').click();
-		cy.get('[data-cy-signup-rules-continue]').should('be.disabled');
-		cy.get('[data-cy-signup-rules-notes-agree] [data-cy-switch-toggle]').click();
-		cy.get('[data-cy-modal-dialog-ok]').click();
-		cy.get('[data-cy-signup-rules-continue]').should('not.be.disabled');
-		cy.get('[data-cy-signup-rules-continue]').click();
-
-		cy.get('[data-cy-signup-username] input').type('alice');
-		cy.get('[data-cy-signup-password] input').type('alice1234');
-		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
-		cy.get('[data-cy-signup-submit]').should('be.disabled');
   });
 });
 

locales/ca-ES.yml

@@ -382,6 +382,7 @@ enableLocalTimeline: "Activa la línia de temps local"
 enableGlobalTimeline: "Activa la línia de temps global"
 disablingTimelinesInfo: "Fins i tot si aquestes línies de temps són desactivades, els administradors i els moderadors poden continuar visualitzant per conveniència."
 registration: "Registre"
+enableRegistration: "Permet el registre de nous usuaris"
 invite: "Convida"
 driveCapacityPerLocalAccount: "Capacitat del disc per usuaris locals"
 driveCapacityPerRemoteAccount: "Capacitat del disc per usuaris remots"

locales/en-US.yml

@@ -354,7 +354,7 @@ avatar: "Avatar"
 banner: "Banner"
 displayOfSensitiveMedia: "Display of sensitive media"
 whenServerDisconnected: "When losing connection to the server"
-disconnectedFromServer: "Connection to server has been lost"
+disconnectedFromServer: "I'm so sleepy..."
 reload: "Refresh"
 doNothing: "Ignore"
 reloadConfirm: "Would you like to refresh the timeline?"
@@ -668,6 +668,7 @@ tokenRequested: "Grant access to account"
 pluginTokenRequestedDescription: "This plugin will be able to use the permissions set here."
 notificationType: "Notification type"
 edit: "Edit"
+editConfirm: "Edit note? Some remote servers won't properly display the edited content."
 emailServer: "Email server"
 enableEmail: "Enable email distribution"
 emailConfigInfo: "Used to confirm your email during sign-up or if you forget your password"
@@ -1276,6 +1277,7 @@ confirmWhenRevealingSensitiveMedia: "Confirm when revealing sensitive media"
 sensitiveMediaRevealConfirm: "This might be a sensitive media. Are you sure to reveal?"
 createdLists: "Created lists"
 createdAntennas: "Created antennas"
+noteUpdatedAt: "Edited: {date} {time}"
 fromX: "From {x}"
 genEmbedCode: "Generate embed code"
 noteOfThisUser: "Notes by this user"
@@ -1763,6 +1765,7 @@ _role:
     gtlAvailable: "Can view the global timeline"
     ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
+    canEditNote: "Note editing"
     mentionMax: "Maximum number of mentions in a note"
     canInvite: "Can create instance invite codes"
     inviteLimit: "Invite limit"