mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-23 22:56:53 +09:00
Code
28,480 Commits 30 Branches 122 Tags 133 MiB
b4998a9e05
Commit Graph

75 Commits

Author SHA1 Message Date
NoriDev
6871f51fb5 Merge remote-branch 'misskey/develop' 2024-09-19 10:26:53 +09:00
かっこかり
ceb4640669
fix(frontend): viteの一時ファイルがgitの変更に含まれないように (#14571) 2024-09-18 19:23:05 +09:00
NoriDev
02d677b4ac Merge remote-branch 'misskey/develop' 2024-09-12 11:04:54 +09:00
KanariKanaru
0c2cfe31a3
Dev: cypressをdev containerで実行可に(e2e-dev-container) (#14526) 2024-09-10 16:33:14 +09:00
NoriDev
c3b237b3b3 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-09-06 11:20:35 +09:00
syuilo
74c93fcebe Update .gitignore 2024-09-05 14:07:36 +09:00
NoriDev
7d09934c0b Merge remote-branch 'misskey/develop' 2024-08-26 19:51:23 +09:00
shika
94b8c00c66
docker-compose.yml, compose.ymlを追跡対象外に追加 (#14345) 2024-08-11 16:27:24 +09:00
NoriDev
444fc93d8b Merge remote-branch 'misskey/develop' 2024-07-27 23:24:38 +09:00
tamaina
a54d043923 chore: ignore misskey-assets (follow-up of #12818 ) 2024-07-18 02:05:40 +09:00
ぬるきゃっと
a6edd50a5d
chore(docker-compose): 推奨の名前にする (#14096) 
* chore(docker-compose): 推奨の名前にする

5c18e329d5/spec.md (compose-file)

* yaml to yml

* fix

* fix
 2024-06-28 11:16:12 +09:00
NoriDev
98369400bc Merge remote-branch 'misskey/develop' 2024-01-22 20:15:41 +09:00
syuilo
cb74b61755 fix api-extractor 2024-01-20 14:01:27 +09:00
NoriDev
d6e8ed0197 Merge remote-branch 'misskey/develop' 2024-01-10 17:30:21 +09:00
おさむのひと
35ec41fc1e
enhance(backend): テストの高速化 (#12939) 
* enhance(backend): テストの高速化

* add ls

* 自動的にマージされるようなので不要

* 起動方法を揃える

* fix test
 2024-01-08 17:43:52 +09:00
NoriDev
5a92456a83 Merge remote-branch 'misskey/develop' 2023-07-07 17:34:23 +09:00
syuilo
e987af4e4f Update .gitignore 2023-07-07 10:49:17 +09:00
NoriDev
0f0e806101 Revert "Update .gitignore" 
This reverts commit e48aabd13e.
 2023-05-26 15:22:35 +09:00
NoriDev
e48aabd13e Update .gitignore 2023-05-26 15:21:35 +09:00
NoriDev
eaacc6b390 空白 2023-05-15 15:57:47 +09:00
NoriDev
a3ea3bba41 Merge remote-branch 'ltlapy/develop-v13' 2023-05-12 20:25:08 +09:00
NoriDev
97c4782014 Merge remote-branch 'upstream/develop' 2023-05-11 20:55:13 +09:00
ltlapy
78db91d63e Bump base into v13.12.1 2023-05-09 16:06:32 +09:00
syuilo
5c08f2b93b
feat: Introduce Meilisearch (#10755) 
* wip

* wip

* Update SearchService.ts

* Update SearchService.ts

* wip

* wip

* Update SearchService.ts

* Update CHANGELOG.md

* wip

* Update SearchService.ts

* Update docker-compose.yml.example
 2023-05-05 08:52:14 +09:00
Acid Chicken (硫酸鶏)
38d0b62167
build(#10336): Storybook & Chromatic & msw (#10365) 
* build(#10336): init

* fix(#10336): invalid name conversion

* build(#10336): load locales and vite config

* refactor(#10336): remove unused imports

* build(#10336): separate definitions and generated codes

* refactor(#10336): remove hatches

* refactor(#10336): module semantics

* refactor(#10336): remove unused common preferences

* fix: typo

* build(#10336): mock assets

* build(#10336): impl `SatisfiesExpression`

* build(#10336): control themes

* refactor(#10336): semantics

* build(#10336): make .storybook as an individual TypeScript project

* style(#10336): use single quote

* build(#10336): avoid intrinsic component names

* chore: suppress linter

* style: typing

* build(#10336): update dependencies

* docs: note about Storybook

* build(#10336): sync

* build(#10336): full reload server on change

* chore: use defaultStore instead

* build(#10336): show popups on Story

* refactor(#10336): remove redundant div

* docs: fix

* build(#10336): interactions

* build(#10336): add an interaction test for `<MkA/>`

* build(#10336): bump storybook

* docs(#10336): mention to pre-build misskey-js

* build(#10336): write stories for `MkAcct`

* build(#10336): write stories for `MkAd`

* build(#10336): fix missing type definition

* build(#10336): use `toHaveTextContent`

* build(#10336): write some stories

* build(#10336): hide internal args

* build(#10336): generate `components/global` stories only

* build(#10336): write stories for `MkMisskeyFlavoredMarkdown`

* fix: conflict errors

* build(#10336): subcomponents on sidebar

* refactor: restore `SatisfiesExpression`

* docs(#10336): note development status

* build(#10336): use chokidar-cli

* docs(#10336): note chokidar-cli mode

* chore(#10336): untrack generated stories files

* fix: pointer handling

* build(#10336): finalize

* chore: add static option to `MkLoading`

* refactor(#10336): bind to local args

* fix: missing case

* revert: restore `SatisfiesExpression`

This reverts commit f246699f38.

* build(#10336): make storybook buildable

* build(#10336): staticify assets

* build(#10336): staticified directory structure

* build(#10336): normalize path for Windows

* ci(#10336): create actions

* build(#10336): ignore tsc errors

* build(#10336): ignore tsc errors

* build(#10336): missing dependencies

* build(#10336): missing dependencies

* build(#10336): use fast-glob

* fix: invalid lockfile

* ci(#10336): increase heap size

* build(#10336): use unpkg for storybook tabler icons

* build(#10336): use unpkg for storybook twemojis

* build(#10336): disable `ProfilePageCat`

* build(#10336): blur `MkA` before interaction ends

* ci(#10336): stabilize

* ci(#10336): fetch-depth

* build(#10336): isChromatic

* ci(#10336): notify on changes

* ci(#10336): fix typo

* ci(#10336): missing working directory

* ci(#10336): skip build

* ci(#10336): fix path

* build(#10336): fails on Windows

* build(#10336): available on Windows

* ci(#10336): disable animation on chromatic

* ci(#10336): add static option to `PageHeader.tabs`

* chore: void

* ci(#10336): change parameters

* docs(#10336): update CONTRIBUTING

* docs(#10336): note about meta overriding and etc.

* ci(#10336): use Chromatic for checks

* ci(#10336): use `pull_request` instead of `pull_request_target` for now

* ci(#10336): use `exitOnceUploaded`

* ci(#10336): reuse built storybook

* ci(#10336): back to `pull_request_target`

* chore: unused dependencies

* style(#10336): reduce prettier indents

* style: note about `TSSatisfiesExpression`
 2023-04-04 09:38:34 +09:00
ltlapy
7a7ac9f645 Bump base to v13.10.3+58f3a2e 2023-04-03 17:14:14 +09:00
Kagami Sascha Rosylight
cee1d5e2d0
chore: integrate misskey-js as a workspace item (git subtree) (#10409) 
* Additional changes for the merge

* api-misskey-js
 2023-03-30 09:33:19 +09:00
Kagami Sascha Rosylight
abdb43c440 Revert "Additional changes for the merge" 
This reverts commit efb5e1d1cc.
 2023-03-25 08:20:34 +01:00
Kagami Sascha Rosylight
efb5e1d1cc Additional changes for the merge 2023-03-25 08:13:30 +01:00
ltlapy
bb72e0a40b Bump base to 13.9.2+87d0f56 2023-03-06 10:29:31 +09:00
tamaina
c54712233c Dev Container周り 
Related to #10201
 2023-03-05 01:06:30 +09:00
ltlapy
bd9761e982 chore: Update .dockerignore and .gitignore 2023-02-23 23:51:41 +09:00
RyotaK
3c7e1ff92e
Dev Containerの設定を追加 (#9872) 
* Dev Containerの設定を追加

* テンプレート生成時に含まれていたコメントを削除

* 起動スクリプトを分割

JSONの中にベタ書きすると長くなるので

* 改行

* Dev Containerの使用方法を追記
 2023-02-12 09:07:56 +09:00
NoriDev
37a860278e Merge remote-branch 'upstream/master' 2023-02-03 23:53:54 +09:00
tamaina
ca7dbd6010 gitignore docker-compose.yml 2023-01-28 11:34:34 +00:00
Masaya Suzuki
bfcd5ea440
Dockerで構築する場合のconfigファイルの雛形追加 (#9577) 2023-01-15 12:11:38 +09:00
syuilo
9384f5399d rename: client -> frontend 2022-12-27 14:36:33 +09:00
Kainoa Kanter
bdbc448d13
refactor: migrate to Yarn Berry (v3.2.1) (#8764) 
* Yarn berry

* Add `.yarn` to dockerignore

* Mention in CHANGELOG

* Update Dockerfile

* Proper upgrade to yarn

* use `"packageManager"`

* Replace `install-packages.js` with workspaces

* Replace `install-packages.js` with workspaces

* Typo

* `corepack enable` for linting

* Remove `packages/*/yarn.lock`

* Improve lint workflow

* Update .github/workflows/lint.yml

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* Update .github/workflows/lint.yml

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* Add `eslint`

* Regenerate yarn.lock

* 🙏‍

* Update lint.yml

🤔

* Fix workflow!

* yarn lint my beloved

* corepack enable for mocha/e2e

* Update CHANGELOG.md

* fix the code that depends on node_modules

* tbh

* tbh

* More yarn workspaces stuff

* 🍀

* Change `browser-image-resizer`

* :finnadie:

* :goberserk:

* :godmode:

* Remove yarnrc for workspaces

* 🙏

* Add proper packages for eslint

* Skip extra install

* New steps for test.yml too

* uhh

* Update .dockerignore

* Update lint.yml

* Update test.yml

* Make client/backend lints seperate workflows

* package.json names

* pnpm = dont change paths

* Fix changelog

* :bowtie:

* I don't know why github workflows hates me...

* test

* ?????

* continue-on-error: true

* Fix yarn.lock

Co-authored-by: ishowta <ishowta@gmail.com>

* add @rollup/pluginutils

* add packageExtensions for chartjs_date-fns

Co-authored-by: acid-chicken <root@acid-chicken.com>

* npm run => yarn

* wip

* yarn node => node

依存関係の記載不足の解消がかなり多いため、yarn nodeは使わない

* fix

* fix http-signature

* fix

* fix

* add packageExtensions

* ✌️

* remove `yarn set version berry`

* yarn install --immutable

Co-authored-by: ishowta <ishowta@gmail.com>

* https://github.com/misskey-dev/misskey/pull/8764#discussion_r885749892

* enable actions/setup-node's global cache

* Update .gitignore

Co-authored-by: iwata <ishowta@gmail.com>

* revival gulp build
66ab7591bf (r885899944)

* fix lockfile

* Update packages/backend/package.json

Co-authored-by: iwata <ishowta@gmail.com>

* remove packagemanager

* `yarn run gulp` in `build` instead of just `gulp`

* Update CHANGELOG.md

* update lockfile

* Add .yarn/cache to gitignore for packages

* ?

* move resolutions

* ✌️

* update lockfie

* update-lockfile

* update yarn.lock

* fix build

* fix

* fix

* fix: add @tensorflow/tfjs

* ダメ

* modify lockfile

* use yarnrc

* update yarnlock

* add jest-mock

* update-lockfile

* update lockfile

* update lockfile

* move jest-mock, update lockfile

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: ishowta <ishowta@gmail.com>
 2022-11-24 15:39:00 +09:00
NoriDev
77e122e784 CherryPick🍒 2022-09-15 20:32:25 +09:00
syuilo
2c2c7d4966 Update .gitignore 2022-08-31 18:24:39 +09:00
syuilo
0e4a111f81 refactoring 
Resolve #7779
 2021-11-12 02:02:25 +09:00
syuilo
91171c559a Update .gitignore 2021-09-19 02:58:17 +09:00
syuilo
36b483d04d Update .gitignore 2021-09-19 02:43:39 +09:00
MeiMei
99955f0af9
Update .gitignore (#6459) 2020-06-07 11:03:29 +09:00
syuilo
f976f32ea9 Update .gitignore 2020-02-01 11:10:30 +09:00
syuilo
45b972c059
MisskeyRoom (#5267) 
* wip

* Add pemcil

* Fix bug

* Update .gitattributes

* Add 🍮

* Better 🍮

* Add color boxes

* Add pc

* Add keyboard

* Add 📦

* Add more 📦

* ✌️

* carpet

* Add plant

* ✌️

* ✌️

* Update room.vue

* Add plant

* ✌️

* ✌️

* ✌️

* ✌️

* ✌️

* 段ボール箱がてかりすぎているのを修正

* Update room.ts

* Render username

* ✌️

* Add new 📦

* Update room.ts

* Remove blender backup files

* Refactor

* Improve performance

* Update room.ts

* Update .gitattributes

* Update room.ts

* Better fan

* Better tissue rendering

* Add 🐧

* Create photoframe2.glb

* chairs

* Add 📖

* fix: HiDPi環境でオブジェクトを選択できない (#5268)

* Better monitor

* ✌️

* Add corkboard

* Add missing blend

* mousepad

* Add missing blend

* Add cube

* 額縁やモニターなどに任意の画像を表示できるように

* Update MisskeyRoom section of CONTRIBUTING.md (#5272)

* Update MisskeyRoom section of CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Refactor

* カスタムテクスチャがずれないように

* Remove debug code

* Update furnitures.json5

* 一部の家具の色を自由に変えられるように

* Update ja-JP.yml

* Type annotation

* 家具の色やテクスチャをすぐ反映するように

* Update room.vue

* Update furnitures.json5

* Add 📺

* Update ja-JP.yml

* 床の色を変えられるように

* 和室にできるように

* Update washitsu

* Use MeshLambertMaterial to improve performance

* Use MeshLambertMaterial

* Fix bug

* Refactor

* Update room.ts

* Fix washitsu

* Update room.vue

* Update washistu

* Use MeshLambertMaterial

* Update room.ts

* Set current property value

* Disable reactivity to improve performance a bit

* Fix bug

* Set current carpet color

* Update ja-JP.yml

* Add rubik-cube (#5278)

* Update ja-JP.yml (#5279)

* Update UI

* ルームの設定を追加

* Add room link

* 家具をドラッグで移動や回転できるように

* esnextにする (#5286)

* Fix moduleResolution

* Use uuid v4

* Fix bug

* マットの色を変えられるように

* ✌️

* 異方性フィルタリングするように

* グラフィックの品質をフィルタリングに反映

* Add bloom effect when ultra graphics

* Add posters

* 🎨
 2019-08-18 14:41:33 +09:00
Aya Morisawa
3c1192d6bf Unignore .vscode/extensions.json (#5208) 2019-07-21 20:27:43 +09:00
Acid Chicken (硫酸鶏)
cbb8edd5ed
Revert "Add yarn.lock to .gitignore (#3408)" 
This reverts commit e8439679a5.
 2019-07-14 10:09:00 +09:00
ql3
81625f9fc5 Update gitignore to ignore config files for Intelij-IDEA (#4933) 2019-05-17 02:31:00 +09:00
syuilo
05b8111c19
Pages (#4811) 
* wip

* wip

* wip

* Update page-editor.vue

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update page-editor.variable.core.vue

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update aiscript.ts

* wip

* Update package.json

* wip

* wip

* wip

* wip

* wip

* Update page.vue

* wip

* wip

* wip

* wip

* more info

* wip fn

* wip

* wip

* wip
 2019-04-29 09:11:57 +09:00