Commit Graph

3863 Commits

Author SHA1 Message Date
mattyatea 0cf3082902 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
2024-02-11 14:46:59 +09:00
かっこかり 0736eea3fd
fix: misskey-jsの型定義生成時にバックエンドの依存パッケージもビルドするように (#13249)
* fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正

* type

* fix: misskey-jsの型定義生成時にバックエンドの依存パッケージもビルドするように

* Revert "type"

This reverts commit bac0951bd1.

* Revert "fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正"

This reverts commit 92b2165828.
2024-02-11 13:24:25 +09:00
syuilo 639f14f713 2024.2.0-beta.11 2024-02-09 17:10:31 +09:00
mattyatea dfd491ff85 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/pages/settings/theme.vue
2024-02-09 10:14:24 +09:00
tamaina c0cb76f0ec chore: use vite@5.1.0 / pnpm@8.15.1 2024-02-08 17:24:51 +00:00
syuilo 2f54a53062 2024.2.0-beta.10 2024-02-05 21:08:05 +09:00
mattyatea a23e9a71bf ui:fix 2024-02-05 14:31:48 +09:00
mattyatea ed7cf7828f 2024.2.0-beta.9-PrisMisskey.2 2024-02-05 13:57:34 +09:00
mattyatea 7579df2da0 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkFoldableSection.vue
#	packages/frontend/src/components/MkPostForm.vue
2024-02-03 21:13:22 +09:00
syuilo 66714d94fc
2024.2.0-beta.9 2024-02-02 21:38:15 +09:00
mattyatea 8a4f29d998 fix: expanded 2024-02-01 00:28:17 +09:00
mattyatea 942b7f1b3c Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiPicker.section.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkFoldableSection.vue
#	packages/frontend/src/components/MkInput.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkSwitch.button.vue
#	packages/frontend/src/components/MkTab.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/MkUserSelectDialog.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/os.ts
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/ui/universal.vue
2024-01-31 19:51:51 +09:00
syuilo eef46ed3c9 2024.2.0-beta.8 2024-01-30 21:00:17 +09:00
mattyatea 89b4cc3822 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
2024-01-25 20:16:33 +09:00
syuilo 5342692b1e 2024.2.0-beta.7 2024-01-24 20:31:05 +09:00
mattyatea 79d2b6fe9e Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
2024-01-24 16:40:37 +09:00
syuilo 2b6bf074c6 2024.2.0-beta.6 2024-01-24 15:20:12 +09:00
syuilo ca9be872a8 2024.2.0-beta.5 2024-01-24 13:55:57 +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
syuilo 298bc34eaf 2024.2.0-beta.4 2024-01-23 10:54:04 +09:00
syuilo 5e307e472d 2024.2.0-beta.3 2024-01-22 18:33:40 +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
syuilo 67f6157d42 2024.2.0-beta.2 2024-01-22 09:30:00 +09:00
syuilo 9eb0468cd2 2024.2.0-beta.1 2024-01-22 09:14:45 +09:00
syuilo f4657eb16f update deps 2024-01-21 18:43:01 +09:00
mattyatea 7c50a574f8 2023.12.2-PrisMisskey.6 2024-01-21 13:43:42 +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 44b8ac135f fix(dev): fix workspace settings 2024-01-20 11:11:20 +09:00
mattyatea 6fa319afc6 Feat: emoji picker profile 2024-01-14 13:54:37 +09:00
mattyatea 158ece67f5 2023.12.2-PrisMisskey.4 2024-01-11 21:52:04 +09:00
mattyatea 56066ae836 fix 2024-01-08 00:53:52 +09:00
mattyatea 4d052272e9 2023.12.2-PrisMisskey.2 2024-01-03 01:28:09 +09:00
mattyatea 8cb7ba0c16 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkPostForm.vue
2023-12-30 09:11:09 +09:00
zyoshoka 7ca0af9e7e
chore(misskey-js): `build-misskey-js-with-types`時に`api-extractor`を走らせるように (#12830) 2023-12-28 13:40:57 +09:00
syuilo d97924890d
2023.12.2 2023-12-28 08:05:35 +09:00
mattyatea d19a4ab8a3 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/backend/src/server/api/stream/ChannelsService.ts
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/mute-block.vue
2023-12-28 04:42:28 +09:00
syuilo f8261a1957
2023.12.1 2023-12-27 21:28:15 +09:00
mattyatea 2a9ddf2bc8 多分動くと思うからリリースしようぜ 2023-12-23 10:44:01 +09:00
syuilo 9c04749359 2023.12.0 2023-12-22 20:59:28 +09:00
syuilo f88ed4dd1a 2023.12.0-beta.6 2023-12-21 11:37:50 +09:00
syuilo 6df9c79bb7 2023.12.0-beta.5 2023-12-16 14:00:46 +09:00
syuilo 2ecc0299b4 update deps 2023-12-16 14:00:27 +09:00
おさむのひと 386fcedf35
(dev-mode) devモードの改善 (#12639)
* fix dev-mode

* fix dev-mode

* fix dev-mode

* fix dev-mode

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-12-14 20:16:02 +09:00
syuilo 364efbe58b 2023.12.0-beta.4 2023-12-14 13:22:54 +09:00
syuilo aedc1d0ee9 update deps 2023-12-14 13:22:12 +09:00
syuilo b72f9186b5 2023.12.0-beta.3 2023-12-09 13:15:30 +09:00
syuilo 319267e096 update deps 2023-12-09 13:02:14 +09:00
おさむのひと b0039f0946
chore: 開発モードでフロントエンドとバックエンドを独立して起動するようにする(再) (#12593)
* [wip]run standalone vite

* [wip]run standalone vite

* some fix (tabler icons, sw, streaming)

* fix theme

* fix run scripts

* favicon

* client-assets

* cssの読み込み順序とCSP設定の変更

* fix lang change

* fix clientManifest

* baseを相対パスにしてドメイン直下とサブディレクトリ配下両方に対応

* 色々修正

* 色々修正

* 色々修正

* fix

* Revert "client-assets"

This reverts commit 582601e90e.

# Conflicts:
#	packages/frontend/vite.config.ts

* 色々修正

* fix

* fix

* add url and proxy to server proxy

* Update packages/frontend/src/index.html

* wip

* Merge remote-tracking branch 'origin/develop' into feat/launch-standalone-frontend

# Conflicts:
#	packages/frontend/src/pages/welcome.entrance.a.vue

* Merge remote-tracking branch 'origin/develop' into feat/launch-standalone-frontend

# Conflicts:
#	packages/frontend/src/pages/welcome.entrance.a.vue

* fix tabler load

* Apply suggestions from code review

* Update packages/frontend/src/index.html

* fix

* fix vite.config.local-dev.ts

* fix CONTRIBUTING.md

---------

Co-authored-by: FruitRiin <nassii74@gmail.com>
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: 果物リン <fruitriin@riinswork.space>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: ozelot <contact@ozelot.dev>
2023-12-08 08:22:08 +09:00
syuilo 920e521176 2023.12.0-beta.2 2023-12-04 20:04:34 +09:00
syuilo 9c90ff7d06 update deps 2023-12-04 19:40:46 +09:00