Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
		
						commit
						65d7c47647
					
				
					 7 changed files with 10 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -3,6 +3,9 @@
 | 
			
		|||
	"dockerComposeFile": "docker-compose.yml",
 | 
			
		||||
	"service": "app",
 | 
			
		||||
	"workspaceFolder": "/workspace",
 | 
			
		||||
	"features": {
 | 
			
		||||
		"ghcr.io/devcontainers-contrib/features/pnpm:2": {}
 | 
			
		||||
	},
 | 
			
		||||
	"forwardPorts": [3000],
 | 
			
		||||
	"postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh",
 | 
			
		||||
	"customizations": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,7 +16,7 @@ services:
 | 
			
		|||
      - external_network
 | 
			
		||||
 | 
			
		||||
  redis:
 | 
			
		||||
    restart: always
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    image: redis:7-alpine
 | 
			
		||||
    networks:
 | 
			
		||||
      - internal_network
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,6 +4,7 @@ set -xe
 | 
			
		|||
 | 
			
		||||
sudo chown -R node /workspace
 | 
			
		||||
git submodule update --init
 | 
			
		||||
pnpm config set store-dir /home/node/.local/share/pnpm/store
 | 
			
		||||
pnpm install --frozen-lockfile
 | 
			
		||||
cp .devcontainer/devcontainer.yml .config/default.yml
 | 
			
		||||
pnpm build
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								.vscode/settings.json
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.vscode/settings.json
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -5,5 +5,6 @@
 | 
			
		|||
    "typescript.tsdk": "node_modules/typescript/lib",
 | 
			
		||||
    "files.associations": {
 | 
			
		||||
        "*.test.ts": "typescript"
 | 
			
		||||
    }
 | 
			
		||||
    },
 | 
			
		||||
    "jest.autoRun": "off"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -958,6 +958,7 @@ disableFederationWarn: "Dies deaktiviert Föderation, aber alle Notizen bleiben,
 | 
			
		|||
invitationRequiredToRegister: "Diese Instanz ist einladungsbasiert. Du musst einen validen Einladungscode eingeben, um dich zu registrieren."
 | 
			
		||||
emailNotSupported: "Diese Instanz unterstützt das Versenden von Emails nicht"
 | 
			
		||||
postToTheChannel: "In Kanal senden"
 | 
			
		||||
cannotBeChangedLater: "Kann später nicht mehr geändert werden."
 | 
			
		||||
_achievements:
 | 
			
		||||
  earnedAt: "Freigeschaltet am"
 | 
			
		||||
  _types:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -958,6 +958,7 @@ disableFederationWarn: "This will disable federation, but posts will continue to
 | 
			
		|||
invitationRequiredToRegister: "This instance is invite-only. You must enter a valid invite code sign up."
 | 
			
		||||
emailNotSupported: "This instance does not support sending emails"
 | 
			
		||||
postToTheChannel: "Post to channel"
 | 
			
		||||
cannotBeChangedLater: "This cannot be changed later."
 | 
			
		||||
_achievements:
 | 
			
		||||
  earnedAt: "Unlocked at"
 | 
			
		||||
  _types:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -958,6 +958,7 @@ disableFederationWarn: "連合が無効になっとるで。無効にしても
 | 
			
		|||
invitationRequiredToRegister: "今このサーバー招待制になってもうてんねん。招待コードを持っとるんやったら登録できるで。"
 | 
			
		||||
emailNotSupported: "このサーバーはメール配信がサポートされてへんみたいやわ"
 | 
			
		||||
postToTheChannel: "チャンネルに投稿"
 | 
			
		||||
cannotBeChangedLater: "後からは変えられへんで。"
 | 
			
		||||
_achievements:
 | 
			
		||||
  earnedAt: "貰った日ぃ"
 | 
			
		||||
  _types:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue