mattyatea
|
1947a53af6
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# README.md
# locales/en-US.yml
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/CustomEmojiService.ts
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/RoleService.ts
# packages/backend/src/core/activitypub/models/ApNoteService.ts
# packages/backend/src/core/activitypub/models/ApPersonService.ts
# packages/backend/src/server/api/endpoints/admin/emoji/update.ts
# packages/frontend/src/components/MkDialog.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkCustomEmoji.vue
# packages/frontend/src/const.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/admin/roles.vue
# packages/frontend/src/pages/admin/security.vue
# pnpm-lock.yaml
|
2024-03-05 16:38:19 +09:00 |
syuilo
|
033d71ee28
|
update deps
|
2024-03-01 13:52:39 +09:00 |
tamaina
|
c1514ce91d
|
(re) update SPDX-FileCopyrightText
Fix #13290
|
2024-02-13 15:59:27 +00:00 |
|
tamaina
|
311c2172d7
|
Revert "update SPDX-FileCopyrightText"
This reverts commit 9b5aeb76d8.
|
2024-02-13 15:50:11 +00:00 |
|
mattyatea
|
5812b15cbd
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# packages/backend/src/core/QueueService.ts
# packages/frontend/src/components/global/MkFooterSpacer.vue
|
2024-02-13 05:48:07 +09:00 |
syuilo
|
9b5aeb76d8
|
update SPDX-FileCopyrightText
|
2024-02-12 11:37:45 +09:00 |
|
mattyatea
|
fea64e8d94
|
Merge remote-tracking branch 'misskey-original/develop' into develop
|
2024-01-27 23:51:55 +09:00 |
おさむのひと
|
b7270c6238
|
fix(dev): pnpm devで依存関係更新が一部反映されない (#13091)
|
2024-01-27 09:18:09 +09:00 |
|
mattyatea
|
78a34d3de3
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# package.json
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/pages/timeline.vue
|
2024-01-23 12:38:56 +09:00 |
|
tamaina
|
af2d81a990
|
perf: (productionの)dependenciesから@typesを削除、reversi/bubble-gameをesbuildにする (#13067)
* perf: (productionの)dependenciesから@typesを削除、reversi/bubble-gameをesbuildにする
* fix
* fix
|
2024-01-23 06:36:44 +09:00 |
|
おさむのひと
|
850d38414e
|
fix: 2024-01-22 10:50時点のdevelopにてCIがコケている (#13060)
* fix: バブルゲームのビルド失敗修正
* fix: api.jsonの定義誤りを修正
* fix: lint.yml(typecheck)
* fix: fix eslint error
* fix: frontend vitest version
* fix: frontend vitest version
* fix:
* fix: cypress
* fix: misskey-js test
* fix: misskey-js tsd(tsdはpakcage.jsonのexportsをサポートしない？)
* fix: conflict
* fix: 間違えて上書きしたところを修正
* fix: 再
* fix: api.json
* fix: api.json
* fix: タイムアウト延長
* Update packages/misskey-js/jest.config.cjs
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
|
2024-01-22 18:01:54 +09:00 |
|
mattyatea
|
f701fbfbeb
|
wakariyasuku
|
2024-01-20 23:02:52 +09:00 |
|
mattyatea
|
4f93ddaf62
|
wakariyasuku
|
2024-01-20 17:30:29 +09:00 |
|
mattyatea
|
f6d3fde92d
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# locales/index.d.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkUserSelectDialog.vue
# packages/frontend/src/components/index.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/avatar-decorations.vue
# packages/frontend/src/pages/settings/mute-block.word-mute.vue
# packages/frontend/src/pages/user/home.vue
# packages/misskey-bubble-game/src/monos.ts
|
2024-01-20 14:54:06 +09:00 |
|
syuilo
|
1de29e5566
|
refactor: migrate to ESM
|
2024-01-20 13:57:03 +09:00 |
|
syuilo
|
f86d0186d2
|
fix(dev): fix pnpm dev
|
2024-01-20 11:18:53 +09:00 |
|
syuilo
|
952386ba8f
|
refactor: extract bubble-game engine as independent package
|
2024-01-20 09:53:26 +09:00 |