Mark Felder 8121e46f25 Merge branch 'develop' into activation-meta		2020-07-02 13:01:22 -05:00
..
activity_pub	Merge branch 'fetcher-fixes' into 'develop'	2020-07-02 10:17:51 +00:00
admin_api	Merge develop	2020-06-23 20:56:55 +03:00
api_spec	Fix CastAndValidate plug	2020-06-29 17:33:00 +04:00
auth	…
channels	…
common_api	AccountController: Extract blocking to CommonAPI.	2020-06-25 11:44:04 +02: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	Remove camelCase from the keys	2020-07-02 12:55:08 -05:00
media_proxy	fix test	2020-06-18 05:06:28 +03:00
metadata	…
mongooseim	…
nodeinfo	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
oauth	Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})	2020-06-05 14:48:02 +00:00
ostatus	…
pleroma_api	adding overall count for packs and files	2020-06-19 10:17:24 +03:00
preload	Credo fixes	2020-06-30 11:55:58 +02: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	…
streamer	Streamer: Align announce streaming with polling.	2020-07-02 09:50:26 +02:00
templates	…
twitter_api	…
views	Rename user.settings column	2020-06-30 11:50:53 -05:00
web_finger	…
xml	…
api_spec.ex	…
chat_channel.ex	…
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	Add warning against parsing/reusing MastoFE settings blob	2020-06-22 23:45:29 +02:00
metadata.ex	…
oauth.ex	…
preload.ex	…
rel_me.ex	…
router.ex	Merge branch 'preload-data' into 'develop'	2020-06-25 21:35:39 +00:00
translation_helpers.ex	…
uploader_controller.ex	…
web.ex	…