You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Haelwenn 4ac6e6283f Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix' ... # Conflicts: # CHANGELOG.md		4 years ago
..
activity_pub	ActivityPub: Remove `follow` and fix issues.	4 years ago
admin_api	Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`	4 years ago
api_spec	Add OpenAPI spec for PleromaAPI.EmojiAPIController	4 years ago
auth	copyright update	4 years ago
common_api	ActivityPub: Remove `follow` and fix issues.	4 years ago
feed	[#1501] Made user feed contain public and unlisted activities.	4 years ago
instances	Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).	5 years ago
mastodon_api	Merge branch '1723-token-fixes' into 'develop'	4 years ago
media_proxy	fix test	4 years ago
metadata	Add OpenAPI spec for StatusController	4 years ago
mongooseim	Upgrade Comeonin to v5	4 years ago
oauth	Upgrade Comeonin to v5	4 years ago
ostatus	OStatusController: Add Mastodon activity compat route.	4 years ago
pleroma_api	AccountController: Remove unused `update_?` routes.	4 years ago
plugs	Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.	4 years ago
preload	Preloaders: Remove status_net preloader	4 years ago
push	WebPush: Don't break on contentless chat messages.	4 years ago
rich_media	Fix tests	4 years ago
static_fe	StaticFE: Prioritize json in requests.	4 years ago
streamer	Streamer: Don't filter out announce notifications.	4 years ago
twitter_api	Merge branch 'develop' into 'remove-twitter-api'	4 years ago
views	Update Copyrights	5 years ago
web_finger	WebFinger Test: Add back test.	4 years ago
chat_channel_test.exs	Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).	5 years ago
fallback_test.exs	encode data properly	4 years ago
federator_test.exs	moving mrf settings from instance to separate group	4 years ago
masto_fe_controller_test.exs	Rename user.settings column	4 years ago
node_info_test.exs	Nodeinfo: Add chat information back in.	4 years ago
rel_me_test.exs	don't use async with global mocks	4 years ago
uploader_controller_test.exs	Update Copyrights	5 years ago