Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs		2019-11-21 16:47:52 +03:00
..
activity_pub	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-21 16:47:52 +03:00
admin_api	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-08 18:30:49 +09:00
auth
channels
common_api	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
federator	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
feed	add subject to atom feed	2019-11-10 11:10:20 +03:00
mailer
mastodon_api	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-21 16:47:52 +03:00
media_proxy
metadata	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
mongooseim	New rate limiter	2019-11-11 12:13:06 +00:00
nodeinfo	Add fieldsLimit to metadata of nodeinfo	2019-11-15 18:52:31 +09:00
oauth	Merge branch 'iss-1376' into 'develop'	2019-11-11 12:27:33 +00:00
ostatus	New rate limiter	2019-11-11 12:13:06 +00:00
pleroma_api/controllers	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
push	Direct messages should provide a distinct push notification subject	2019-10-18 17:51:34 -05:00
rich_media
static_fe	Support redirecting by activity UUID in static FE as well.	2019-11-13 08:22:11 -08:00
streamer	[#1335] User AP ID relations fetching performance optimizations.	2019-11-20 12:19:07 +03:00
templates	Merge branch 'feature/static-fe' into 'develop'	2019-11-11 19:10:44 +00:00
twitter_api	[#1304] Moved remaining fields from User.Info to User.	2019-10-20 13:42:42 +03:00
views	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
web_finger	webfinger: stop pulling Salmon data out of WebFinger	2019-10-18 14:50:09 +00:00
xml
chat_channel.ex
controller_helper.ex
endpoint.ex	Set better Cache-Control header for static content	2019-11-06 16:41:19 +03:00
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
metadata.ex
oauth.ex
rel_me.ex	add missing tesla mocks	2019-11-04 15:18:32 +00:00
router.ex	Merge branch 'bugfix/1395-email-activation' into 'develop'	2019-11-15 14:11:48 +00:00
translation_helpers.ex
uploader_controller.ex
web.ex