rinpatch c75ba63bef Merge branch '1865-media-only' into 'develop' ... Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned" Closes #1865 See merge request pleroma/pleroma!2650		2020-06-22 11:34:07 +00:00
..
activity_pub	Merge branch '1865-media-only' into 'develop'	2020-06-22 11:34:07 +00:00
admin_api	Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url	2020-06-17 13:13:55 -05:00
api_spec	Merge branch 'feature/1854-emoji-pagination' into 'develop'	2020-06-22 08:41:09 +00:00
auth	copyright update	2020-05-18 15:15:51 +03:00
channels
common_api	Merge branch 'global-status-expiration' into 'develop'	2020-06-12 14:14:09 +00:00
federator
feed	Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys	2020-06-05 23:15:10 +04:00
mailer
mastodon_api	Only accounts with Service actor_type are considered as bots	2020-06-19 21:19:00 +02:00
media_proxy	fix test	2020-06-18 05:06:28 +03:00
metadata
mongooseim	Pbkdf2.verify_pass --> AuthenticationPlug.checkpw	2020-05-14 08:57:38 -05:00
nodeinfo
oauth	Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})	2020-06-05 14:48:02 +00:00
ostatus	OStatusController: Add Mastodon activity compat route.	2020-05-22 17:11:59 +02:00
pleroma_api	adding overall count for packs and files	2020-06-19 10:17:24 +03:00
push	WebPush: Don't break on contentless chat messages.	2020-06-06 09:46:07 +02:00
rich_media	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	2020-06-15 16:03:40 +04:00
static_fe	Use atoms as keys in ActivityPub.fetch_* functions options	2020-06-04 21:36:26 +04:00
streamer	ChatMessageReference -> Chat.MessageReference	2020-06-06 11:51:10 +02:00
templates	Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts	2020-06-01 17:38:57 +04:00
twitter_api	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
views	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-06-05 16:53:56 +02:00
web_finger
xml
api_spec.ex
chat_channel.ex	[#2456] Removed support for embedded relationships in account view.	2020-05-10 09:16:48 +03:00
controller_helper.ex	ControllerHelper: Always return id field.	2020-06-13 13:12:43 +02:00
embed_controller.ex
endpoint.ex
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex
metadata.ex
oauth.ex
rel_me.ex
router.ex	added admin api for MediaProxy cache invalidation	2020-06-12 14:49:54 +03:00
translation_helpers.ex
uploader_controller.ex
web.ex