Haelwenn a8447c3803 Merge branch '1918-avatar-background-header-reset-2' into 'develop' ... Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729		2020-07-08 03:25:30 +00:00
..
activity_pub	Merge branch 'bugfix/peertube-videos' into 'develop'	2020-07-07 09:14:50 +00:00
admin_api	Merge develop	2020-06-23 20:56:55 +03:00
api_spec	Add OpenAPI spec for PleromaAPI.EmojiAPIController	2020-05-18 19:28:46 +04:00
auth	copyright update	2020-05-18 15:15:51 +03:00
common_api	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text	2020-07-03 16:44:31 +02:00
feed	[#1501] Made user feed contain public and unlisted activities.	2020-05-25 23:27:47 +03:00
instances
mastodon_api	AccountController: Allow removal / reset of user images.	2020-07-07 16:53:03 +02:00
media_proxy	fix test	2020-06-18 05:06:28 +03:00
metadata
mongooseim
oauth
ostatus	OStatusController: Add Mastodon activity compat route.	2020-05-22 17:11:59 +02:00
pleroma_api	AccountController: Remove unused update_? routes.	2020-07-07 16:53:20 +02:00
plugs
preload	Preloaders: Remove status_net preloader	2020-07-06 12:24:45 +02:00
push	WebPush: Don't break on contentless chat messages.	2020-06-06 09:46:07 +02:00
rich_media	Fix tests	2020-06-15 16:20:05 +04:00
static_fe	StaticFE: Prioritize json in requests.	2020-06-26 16:27:39 +02:00
streamer	Streamer: Don't filter out announce notifications.	2020-07-04 17:11:37 +02:00
twitter_api
views
web_finger
chat_channel_test.exs
fallback_test.exs	encode data properly	2020-06-03 16:34:03 -04:00
federator_test.exs	moving mrf settings from instance to separate group	2020-06-16 18:32:18 +03:00
masto_fe_controller_test.exs	Rename user.settings column	2020-06-30 11:50:53 -05:00
node_info_test.exs	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
rel_me_test.exs
uploader_controller_test.exs