Hazelnoot
9c301fa5aa
Merge branch 'misskey-develop' into merge/2025-03-24
...
# Conflicts:
# .github/workflows/api-misskey-js.yml
# .github/workflows/changelog-check.yml
# .github/workflows/check-misskey-js-autogen.yml
# .github/workflows/get-api-diff.yml
# .github/workflows/lint.yml
# .github/workflows/locale.yml
# .github/workflows/on-release-created.yml
# .github/workflows/storybook.yml
# .github/workflows/test-backend.yml
# .github/workflows/test-federation.yml
# .github/workflows/test-frontend.yml
# .github/workflows/test-misskey-js.yml
# .github/workflows/test-production.yml
# .github/workflows/validate-api-json.yml
# package.json
# packages/backend/package.json
# packages/backend/src/server/api/ApiCallService.ts
# packages/backend/src/server/api/endpoints/drive/files/create.ts
# packages/frontend-shared/js/url.ts
# packages/frontend/package.json
# packages/frontend/src/components/MkFileCaptionEditWindow.vue
# packages/frontend/src/components/MkInfo.vue
# packages/frontend/src/components/MkLink.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNotes.vue
# packages/frontend/src/components/MkPageWindow.vue
# packages/frontend/src/components/MkReactionsViewer.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/components/MkUrlPreview.vue
# packages/frontend/src/components/MkUserPopup.vue
# packages/frontend/src/components/global/MkPageHeader.vue
# packages/frontend/src/components/global/MkUrl.vue
# packages/frontend/src/components/global/PageWithHeader.vue
# packages/frontend/src/pages/about-misskey.vue
# packages/frontend/src/pages/announcements.vue
# packages/frontend/src/pages/antenna-timeline.vue
# packages/frontend/src/pages/channel.vue
# packages/frontend/src/pages/instance-info.vue
# packages/frontend/src/pages/note.vue
# packages/frontend/src/pages/page.vue
# packages/frontend/src/pages/role.vue
# packages/frontend/src/pages/tag.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user-list-timeline.vue
# packages/frontend/src/pages/user/followers.vue
# packages/frontend/src/pages/user/following.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/pages/user/index.vue
# packages/frontend/src/ui/deck.vue
# packages/misskey-js/generator/package.json
# pnpm-lock.yaml
# scripts/changelog-checker/package-lock.json
# scripts/changelog-checker/package.json
2025-04-29 15:54:11 -04:00
syuilo
d6ae4c980b
feat(frontend): タイトルバーを表示できるように
2025-04-29 09:43:15 +09:00
Julia
d10fdfe973
Merge commit from fork
...
* SP-2025-03.1 always wrap icon&thumbnail URLs
if they're not HTTP URLs, the frontend won't be able to display them
anyway (`<img src="mailto:…">` or '<div stile="background-image:
url(nntp:…)">` aren't going to work!), so let's always run them through the
media proxy, which will fail harder (fetching a `javascript:` URL
won't do anything in the backend, might do something in the frontend)
and will always protect the client's address in cases like `gemini:`
where the browser could try to fetch
* SP-2025-03.2 use object binding for more styles
interpolating a random (remote-controlled!) string into a `style`
attribute is a bad idea; using VueJS object binding, we should get
proper quoting and therefore safe parse failures instead of CSS
injections / XSS
* SP-2025-03.3 slightly more robust "self" URL handling
parse URLs instead of treating them as strings; this is still not
perfect, but the `URL` class only handles full URLs, not relative
ones, so there's so way to ask it "give me a URL object that
represents this resource relative to this base URL"
notice that passing very weird URLs to `MkUrl` and `MkUrlPreview` will
break the frontend (in dev mode) because there's an untrapped `new
URL(…)` that may explode; production builds seem to safely ignore the
error, though
---------
Co-authored-by: dakkar <dakkar@thenautilus.net>
2025-04-29 08:15:54 +09:00
dakkar
4981e5ba36
Merge branch 'develop' into merge/2025-03-24
2025-04-28 15:31:28 +01:00
Julia Johannesen
ac905118cc
Merge branch 'stable' into merge-stable-into-develop
2025-04-27 16:19:44 -04:00
Julia Johannesen
35df3944c1
Update summaly
2025-04-27 13:31:27 -04:00
Julia Johannesen
0bb4e57b0c
Security fixes
...
Co-Authored-By: dakkar <dakkar@thenautilus.net>
2025-04-27 13:05:09 -04:00
Hazelnoot
a4dd19fdd4
merge upstream again
2025-04-24 14:23:45 -04:00
Hazelnoot
ac894986f9
Merge branch 'develop' into merge/2025-03-24
...
# Conflicts:
# CONTRIBUTING.md
# packages/backend/src/core/activitypub/models/ApPersonService.ts
2025-04-24 13:07:41 -04:00
Marie
4f64803ef2
merge: make MOTD html unescaped. (requires discussion?) ( !759 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/759
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2025-04-15 07:45:51 +00:00
anatawa12
d5fe6e36ae
fix: avatarId が null のときにも avatarUrl が non null 担ってることがある問題 ( #15833 )
2025-04-15 16:10:17 +09:00
Hazelnoot
91fb75dece
Merge branch 'develop' into merge/2025-03-24
2025-04-13 13:07:24 -04:00
Zlendy
ce26d8d3cb
feat: Allow injection of raw HTML strings inside <head>
2025-04-11 22:56:26 +02:00
Hazelnoot
6ac37b4d6c
lint and type fixes
2025-04-01 20:47:04 -04:00
Hazelnoot
d272d6f224
fix software name in boot.embed.js, boot.js, and error.js
2025-04-01 12:30:35 -04:00
Hazelnoot
d39e4babd1
fix development link in error.pug
2025-04-01 12:29:08 -04:00
Hazelnoot
7ff15816d1
Merge branch 'misskey-develop' into merge/2025-03-24
...
# Conflicts:
# .github/workflows/api-misskey-js.yml
# .github/workflows/changelog-check.yml
# .github/workflows/check-misskey-js-autogen.yml
# .github/workflows/get-api-diff.yml
# .github/workflows/lint.yml
# .github/workflows/locale.yml
# .github/workflows/on-release-created.yml
# .github/workflows/storybook.yml
# .github/workflows/test-backend.yml
# .github/workflows/test-federation.yml
# .github/workflows/test-frontend.yml
# .github/workflows/test-misskey-js.yml
# .github/workflows/test-production.yml
# .github/workflows/validate-api-json.yml
# locales/index.d.ts
# package.json
# packages/misskey-js/generator/package.json
# packages/misskey-js/package.json
# pnpm-lock.yaml
# scripts/changelog-checker/package-lock.json
# scripts/changelog-checker/package.json
2025-04-01 09:59:46 -04:00
syuilo
500a5615f0
enhance(frontend): 壁紙をデッキ設定の一部に
2025-04-01 13:18:49 +09:00
Hazelnoot
a2062c6469
Revert "revert 7bfada9792: enhance: remove bull-board support"
...
This reverts commit d41d77fcd7
2025-03-30 02:14:03 -04:00
Hazelnoot
d41d77fcd7
revert 7bfada9792: enhance: remove bull-board support
2025-03-25 17:25:30 -04:00
Hazelnoot
d8908ef2d8
merge upstream
2025-03-25 16:14:53 -04:00
syuilo
7bfada9792
enhance: remove bull-board support
2025-03-16 13:03:02 +09:00
dakkar
d0a074ac89
fetch linked notes manually, unless we have them in DB - fixes 1006
2025-03-15 19:17:36 +00:00
かっこかり
22228b6756
enhance: OAuth2 (IndieAuth) でロゴが提供されている場合は表示するように ( #15578 )
...
* enhance: OAuthでロゴが提供されている場合は表示するように
* Update Changelog
* refactor
* fix
* fix test
2025-03-06 08:05:14 +00:00
かっこかり
1b44954dcb
enhance(frontend): サーバーエラー画面の多言語対応 ( #15549 )
...
* enhance(frontend): サーバーエラー画面の多言語対応
* indent
2025-02-24 05:23:20 +00:00
かっこかり
4b98b446be
enhance(frontend): クライアントエラー画面の多言語対応 ( #15411 )
...
* enhance(frontend): クライアントエラー画面のマルチリンガル対応
* Update Changelog
* update message
2025-02-08 08:31:28 +00:00
Hazelnoot
f36029f795
Merge branch 'develop' into merge/2024-02-03
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/core/entities/UserEntityService.ts
# packages/frontend/src/_dev_boot_.ts
# packages/misskey-js/src/autogen/types.ts
# sharkey-locales/en-US.yml
2025-02-07 11:57:44 -05:00
Hazelnoot
0d1c993dd2
restore support for local dev using a non-local url
2025-02-06 12:57:44 -05:00
Hazelnoot
8a087e75a5
merge: Improve language detection. ( !871 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/871
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
2025-02-05 13:49:18 +00:00
Hazelnoot
a4e86758c1
merge upstream 2025-02-03
2025-02-03 14:36:09 -05:00
かっこかり
40bfb1be09
fix(backend): お知らせのmetaタグ出力の条件が間違っていたのを修正 ( #15377 )
...
* fix(backend): お知らせのmetaタグ出力の条件が間違っていたのを修正
* Update Changelog
2025-02-01 13:36:10 +09:00
Kinetix
4d91baaa13
Adjust as per suggestions in !877
2025-01-31 10:22:13 -08:00
Kinetix
993532bc1f
Adding robots.txt override via admin control panel
...
This is a requested low priority feature in #418 - I created the changes
to follow similarly to how the Instance Description is handled.
2025-01-28 15:57:45 -08:00
饺子w (Yumechi)
ef29130057
fix(backend): ノートの閲覧にログイン必須にしてもFeedでノートが表示されてしまう問題を修正 ( #15083 )
...
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-01-26 06:03:42 +00:00
かっこかり
35104d87d5
revert(dev): フロントエンド・バックエンドを分離する開発モードを廃止 ( #15284 )
...
* Revert "chore: 開発モードでフロントエンドとバックエンドを独立して起動するようにする（再） (#12593 )"
This reverts commit b0039f0946
2025-01-25 20:58:39 +09:00
piuvas
1080f19e99
generalize current language so we match more broadly on fallback
2025-01-24 18:37:18 -03:00
dakkar
f4537e7092
better name, and other tweaks
2024-12-17 16:45:56 +00:00
dakkar
799cc0d098
pick lints
2024-12-17 10:06:30 +00:00
dakkar
46432161b8
enforce restrictions for user's rss feed
...
if `requireSigninToViewContents` in on, no notes are included in the
feed
notes covered by `makeNotesFollowersOnlyBefore` and
`makeNotesHiddenBefore` are skipped
2024-12-17 09:47:32 +00:00
dakkar
b266a5f9f6
Merge branch 'develop' into feature/2024.10
2024-12-12 17:38:29 +00:00
Hazelnoot
fe37aa2ce8
Add "enable RSS" user privacy toggle
2024-12-12 08:11:55 -05:00
dakkar
6d4ae93592
Merge branch 'develop' into feature/2024.10
2024-12-12 13:04:51 +00:00
おさむのひと
9a44b37d03
fix(backend): アドレス入力で直接ユーザのプロフィールページを表示した際、前提データが足りず描画に失敗する ( #15033 )
...
* fix(backend): アドレス入力で直接ユーザのプロフィールページを表示した際、前提データが足りず描画に失敗する
* fix CHANGELOG.md
2024-12-12 10:47:02 +00:00
かっこかり
074b7b0bee
fix(frontend): 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正 ( #15102 )
...
* Resolve frontend/backend contradiction for home visibility embeds
This now uses the same check from `packages/frontend/src/scripts/get-note-menu.ts`
* Update Changelog
---------
Co-authored-by: CenTdemeern1 <timo.herngreen@gmail.com>
2024-12-10 10:36:03 +09:00
NoriDev
2528508cff
feat: 노트 게시를 예약할 수 있음 ( yojo-art/cherrypick#483 , [ Type4ny-Project/Type4ny@271c872c ]( 271c872c97))
2024-12-09 05:31:03 +01:00
dakkar
9937ff39be
Merge branch 'develop' into feature/2024.10
2024-12-08 19:03:16 +00:00
CenTdemeern1
85bbfd2e2b
Resolve frontend/backend contradiction for home visibility embeds
...
This now uses the same check from `packages/frontend/src/scripts/get-note-menu.ts`
2024-12-08 17:52:26 +01:00
dakkar
eb25238a8e
Merge branch 'develop' into feature/2024.10
2024-11-28 11:17:27 +00:00
dakkar
1626e50fbf
expose video thumbnail to 3rd parties "cards"
2024-11-27 11:23:32 +00:00
おさむのひと
a77ad7a16b
fix(backend): アドレス入力で直接ユーザのプロフィールページを表示した際、前提データが足りず描画に失敗する ( #15033 )
...
* fix(backend): アドレス入力で直接ユーザのプロフィールページを表示した際、前提データが足りず描画に失敗する
* fix CHANGELOG.md
2024-11-23 16:45:05 +09:00
