Hazelnoot 667262dcfb Merge branch 'develop' into merge/2024-02-03 ... # Conflicts: # locales/index.d.ts # packages/backend/src/core/SearchService.ts # packages/frontend/src/pages/search.note.vue # packages/misskey-js/src/autogen/types.ts # sharkey-locales/en-US.yml		2025-02-13 17:04:50 -05:00
..
api	Merge branch 'develop' into merge/2024-02-03	2025-02-13 17:04:50 -05:00
assets
oauth	merge: upstream	2024-02-19 10:47:42 +01:00
web	Merge branch 'develop' into merge/2024-02-03	2025-02-07 11:57:44 -05:00
ActivityPubServerService.ts	Merge branch 'develop' into merge/2024-02-03	2025-02-08 13:16:37 -05:00
FileServerService.ts	move SkRateLimiterService to correct directory	2025-02-05 11:20:26 -05:00
HealthServerService.ts	Misskey® Reactions Buffering Technology™ (#14579)	2024-09-20 21:03:53 +09:00
NodeinfoServerService.ts	upd: add FriendlyCaptcha as a captcha solution	2024-11-02 02:20:35 +01:00
ServerModule.ts	hide restricted edit history from mastodon api (resolves #811)	2025-02-08 13:17:50 -05:00
ServerService.ts	make the listen address configurable - fixes #927	2025-02-10 10:40:06 +00:00
SkRateLimiterService.md	document new rate limit factor calculations	2025-02-05 11:20:25 -05:00
SkRateLimiterService.ts	move SkRateLimiterService to correct directory	2025-02-05 11:20:26 -05:00
WellKnownServerService.ts	fix XRD+XML serialisation of Alias	2024-11-27 10:06:21 +00:00