Commit Graph

274 Commits

Author SHA1 Message Date
dakkar d0a2708f91 merge: handle non-ASCII emoji names (!464)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/464

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-02 21:06:10 +00:00
dakkar b6f41a28ed pull in sfm-js that supports non-ascii in emoji names 2024-04-07 16:37:31 +01:00
dakkar f4e89f2e6b bump tmp@0.2.3 - fixes #464
see also https://github.com/raszi/node-tmp/issues/295
2024-03-19 17:13:43 +00:00
dakkar af548d05ca merge upstream for 2024.2.1 2024-03-02 16:36:49 +00:00
Marie 15d2319011
merge: upstream 2024-02-23 13:42:52 +01:00
かっこかり 080a3c20bd
fix: SSR時のmetaをエスケープするように (#13440)
* fix: SSR時のmetaをエスケープするように

* エスケープ方法を変更
2024-02-23 14:10:13 +09:00
tamaina ae27085f69
fix: Bump sharp to 0.33.2 (#13391) 2024-02-21 14:42:37 +09:00
Marie 10bfc61670
merge: upstream 2024-02-19 10:47:42 +01:00
zyoshoka 37959bab1d
refactor(backend): remove/replace deprecated type deps (#13252) 2024-02-16 20:09:07 +09:00
Marie 85355813ad
merge: latest changes 2024-02-09 19:22:06 +01:00
syuilo 7fc1d77893 update deps 2024-02-09 17:10:16 +09:00
Marie 11628e4b6a
merge: upstream 2024-02-03 20:19:44 +01:00
Marie f091b84c6e
chore: change sfm registry and name 2024-02-03 15:01:09 +01:00
syuilo e90dea4be9 update deps 2024-01-30 20:59:44 +09:00
Marie 913dd581ef
merge: upstream 2024-01-25 14:21:42 +01:00
syuilo e8ba0b3f54 enhance(reversi): improve desync handling 2024-01-23 10:51:59 +09:00
Marie fd69a2fbbd
merge: upstream 2024-01-22 19:58:43 +01: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
Marie 013032dd93
fix: downgrade eslint to fix bug
prefer-nullish-coalescing broke in the 6.19.0 update with a funky bug which has an open PR to be fixed https://github.com/typescript-eslint/typescript-eslint/issues/8261
2024-01-21 14:18:47 +01:00
Marie db012fc8c3
merge: upstream (1) 2024-01-21 13:11:23 +01:00
syuilo f4657eb16f update deps 2024-01-21 18:43:01 +09:00
syuilo a637b4e282 feat: reversi
Resolve #12962
2024-01-19 20:51:49 +09:00
Marie 3c2c72539a
chore: update sfm dep 2024-01-09 04:11:41 +01:00
Marie 7552cea69a
merge: upstream 2024-01-09 02:57:57 +01:00
おさむのひと 35ec41fc1e
enhance(backend): テストの高速化 (#12939)
* enhance(backend): テストの高速化

* add ls

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

* 起動方法を揃える

* fix test
2024-01-08 17:43:52 +09:00
tamaina 1d5a0d0777
chore: use @misskey-dev/eslint-plugin (#12860)
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-12-31 15:26:57 +09:00
tamaina 2a33981811
chore: use summaly, browser-image-resizer, and sharp-read-bmp on registry.npmjs.org instead of git (#12856)
* chore: use @misskey-dev/summaly on registry.npmjs.org instead of git

* fix backend dependency

* fic backend dependency

* @misskey-dev/sharp-read-bmp

* fix

* use @misskey-dev/browser-image-resizer
2023-12-31 09:45:35 +09:00
trivernis 5f2e07d81f
Revert unnecessary changes to backend package.json 2023-12-29 20:05:19 +01:00
Trivernis 5af915e17e Merge branch 'develop' into feature/config-dropdir 2023-12-29 20:04:22 +01:00
Marie 18e82c0627
fix: frontend not being able to build 2023-12-28 19:37:22 +01:00
Marie 870f70a683
upd: up sfm.js version 2023-12-28 13:06:11 +01:00
Kagami Sascha Rosylight 544b8106b2
feat(backend/oauth): allow CORS for token endpoint (#12814)
* feat(backend/oauth): allow CORS for token endpoint

* no need to explicitly set origin to `*`

* Update CHANGELOG.md
2023-12-28 09:46:19 +01:00
trivernis 06d110a773
Lock glob to exact package version 10.3.10 2023-12-27 21:02:10 +01:00
Trivernis 8b31c12607 Merge branch 'develop' into feature/config-dropdir 2023-12-27 14:11:42 +01:00
trivernis 64d34f595c
Change loadConfig to load all yaml files in the config directory 2023-12-27 14:09:59 +01:00
Kagami Sascha Rosylight ad346b6f36
feat(backend/oauth): allow CORS for token endpoint (#12814)
* feat(backend/oauth): allow CORS for token endpoint

* no need to explicitly set origin to `*`

* Update CHANGELOG.md
2023-12-27 15:10:24 +09:00
Marie 5bc036180f upd: module versions 2023-12-25 21:37:13 +01:00
Marie 5db583a3eb merge: upstream 2023-12-23 02:09:23 +01:00
zyoshoka 13990279c3
enhance: Unicode 15.0で新たに追加された絵文字をリアクションに使えるように (#12683) 2023-12-18 14:51:29 +09:00
syuilo 507d436699 update mfm-js 2023-12-18 13:22:34 +09:00
syuilo 8a9f4ef441 update deps 2023-12-18 13:14:58 +09:00
Marie c92c2d065f upd: replace mfm with sfm 2023-12-18 03:03:05 +01: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 a2a6a94614 update deps 2023-12-14 18:28:04 +09:00
syuilo aedc1d0ee9 update deps 2023-12-14 13:22:12 +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 582601e90eb771875bdf8aba263da2316a59d01b.

# 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 9c90ff7d06 update deps 2023-12-04 19:40:46 +09:00
syuilo 51cf906b25 update deps 2023-11-27 21:05:20 +09:00