1
0
Commit Graph

4067 Commits

Author SHA1 Message Date
dakkar 75ecbd22e3 use correct source for notficationClickable 2025-05-02 19:30:18 +01:00
Marie d3a07a8c1c merge: save draft early when doing "delete&edit" - fixes #638 (!975)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/975

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2025-05-01 23:06:34 +00:00
Marie f2f3ae0112 merge: collapse renotes of notes created by the logged-in user - fix #1037 (!974)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/974

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2025-05-01 23:04:45 +00:00
Marie d84509b7c3 merge: allow clearing a role's color - fixes #734 (!976)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/976

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2025-05-01 23:02:13 +00:00
Hazelnoot 2d4741603d Merge remote-tracking branch 'origin/merge/2025-03-24' into merge/2025-03-24 2025-05-01 12:07:45 -04:00
Hazelnoot 8dce293dff add setting to disable proxy account (resolves #766) 2025-05-01 12:07:38 -04:00
dakkar bd72de2805 allow clearing a role's color - fixes #734 2025-05-01 14:23:51 +01:00
dakkar 07ff6a890b save draft early when doing "delete&edit" - fixes #638
when the posting form gets shown, the original note is already gone,
and without this change, the note only exists in local variables

now, we save the draft as soon as the form is shown, so clicking on
the "post" (or reply, or quote) button will get you a form with the
draft data
2025-05-01 13:49:12 +01:00
dakkar bc422fe36f collapse renotes of my notes - fix #1037 2025-05-01 13:15:21 +01:00
dakkar 121f555fca fix renoter avatar in SkNote 2025-05-01 13:12:05 +01:00
dakkar 4f26621f6e honour "logo" in titlebar
I'm not completely sure this is a good idea…
2025-05-01 11:53:36 +01:00
dakkar bf80b3d07f fix reactions viewer styling in SkNote* 2025-05-01 11:48:10 +01:00
dakkar 46d1af5c56 fix note display style in timelines 2025-05-01 11:45:09 +01:00
Hazelnoot e7aeb4cdb9 fix type error in timeline.vue 2025-04-30 09:54:14 -04:00
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
Julia 583df3ec63 Merge commit from fork
none of our endpoints will ever contain `..` (they might, maybe, at
some point, contain `.`, as in `something/get.html`?), so every
`Mk:api()` call to an endpoint that contains `..` can't work: let's
reject it outright

Co-authored-by: dakkar <dakkar@thenautilus.net>
2025-04-29 18:06:39 +09:00
syuilo 813b57bbab fix style 2025-04-29 11:20:43 +09: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
syuilo e5fcb5b53f enhance(frontend): disable router view transition
Fix #15723
2025-04-28 21:25:47 +09:00
syuilo cf07e1e4b9 perf(frontend): improve timeline performance 2025-04-28 12:53:58 +09:00
syuilo 4054f1a0c4 🎨 2025-04-28 10:07:23 +09:00
syuilo c99f4dc4ce enhance(frontend): add drive tip 2025-04-28 09:46:41 +09:00
syuilo 7c23e53034 refactor 2025-04-28 09:28:23 +09:00
syuilo e0fd1c8f48 tweak custom-emojis-manager 2025-04-28 08:49:37 +09: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
syuilo 3f08e41818 🎨 2025-04-27 21:14:59 +09:00
syuilo 04b7dd0948 fix(frontend): tweak spacer style 2025-04-27 20:51:57 +09:00
syuilo ee49c42410 fix lint 2025-04-27 20:42:41 +09:00
syuilo 83893ce52f fix syntax errors 2025-04-27 20:04:13 +09:00
syuilo 03e5502d63 add todo 2025-04-27 19:57:19 +09:00
syuilo 0a1ff77f23 perf(frontend): use css-native implementation for spacer rather than vue component 2025-04-27 19:55:56 +09:00
syuilo 0f9dff0521 enhance(frontend): improve usability 2025-04-27 17:43:30 +09:00
syuilo 14d3439a42 enhance(frontend): タイムラインをスワイプで切り替えられるように
Resolve #15722
2025-04-27 17:38:48 +09:00
syuilo 889295d621 fix(frontend): スワイプが効かないなど、不具合の元になるmarginをgapに置き換え 2025-04-27 17:29:17 +09:00
syuilo e24a2362fd refactor(frontend): PageWithHeaderにMkSwiperを持たせるように 2025-04-27 17:16:51 +09:00
syuilo 66187174d4 🎨 2025-04-27 13:41:41 +09:00
syuilo 73b86d9276 enhance(frontend): improve new emojis manager 2025-04-27 13:31:07 +09:00
かっこかり 6a69e4180b fix(frontend): PageWithHeaderからPageHeaderに全Propsが伝わっていなかった問題を修正 (#15858) 2025-04-27 10:46:55 +09:00
syuilo 3b3bb36c49 enhance(frontend): 通知ページをスワイプで切り替えられるように 2025-04-27 10:14:41 +09:00
syuilo 9481b5a6e8 feat: アップロード可能な最大ファイルサイズをロールごとに設定可能に 2025-04-27 09:35:44 +09:00
syuilo 5042a0aa8f fix(frontend): タイムラインでノートが重複して表示されることがあるのを修正
Fix #15870
Close #15874
2025-04-27 09:16:17 +09:00
Hazelnoot d8c6014b20 preserve scroll position in following feed 2025-04-24 15:02:43 -04:00
Hazelnoot a4dd19fdd4 merge upstream again 2025-04-24 14:23:45 -04:00
Marie 8e6e2c47e3 fix/revert some defaults back to sharkey defaults 2025-04-22 23:01:03 +00:00
syuilo c99723b59e fix html 2025-04-19 21:01:51 +09:00
syuilo 96bb36f77e 🎨 2025-04-19 14:42:54 +09:00