This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2022-10-30 18:15:28 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
admin	Fix account action type validation (#19476)	2022-10-30 02:44:32 +02:00
announcements	…
apps	…
emails	Fix `POST /api/v1/emails/confirmations` not being available after sign-up (#17743)	2022-03-12 04:14:25 +01:00
filters	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
instances	…
lists	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
polls	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
push	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	2021-04-15 05:00:25 +02:00
statuses	Spelling (#17705)	2022-03-06 22:51:40 +01:00
timelines	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
trends	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
accounts_controller_spec.rb	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
announcements_controller_spec.rb	…
apps_controller_spec.rb	Fix app name, website and redirect URIs not having a maximum length (#16042)	2021-04-15 16:28:43 +02:00
blocks_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
bookmarks_controller_spec.rb	…
conversations_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
custom_emojis_controller_spec.rb	…
domain_blocks_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
endorsements_controller_spec.rb	…
favourites_controller_spec.rb	…
filters_controller_spec.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
follow_requests_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
followed_tags_controller_spec.rb	Add ability to follow hashtags (#18809)	2022-07-17 13:49:29 +02:00
instances_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
lists_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
markers_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
media_controller_spec.rb	Add editing for published statuses (#17320)	2022-02-10 00:15:30 +01:00
mutes_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
notifications_controller_spec.rb	Add `types` param to `GET /api/v1/notifications` in REST API (#17767)	2022-03-15 04:11:29 +01:00
polls_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
reports_controller_spec.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
statuses_controller_spec.rb	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
streaming_controller_spec.rb	…
suggestions_controller_spec.rb	…
tags_controller_spec.rb	Add ability to follow hashtags (#18809)	2022-07-17 13:49:29 +02:00