pleroma/lib/pleroma/web
Alexander Strizhakov bfeb33e951 Merge develop
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
..
activity_pub Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop' 2019-05-07 19:37:41 +00:00
admin_api Merge develop 2019-05-08 14:34:36 +00:00
auth Refactored Pleroma.Web.Auth.Authenticator 2019-05-01 13:28:04 +00:00
channels Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
common_api formatter.ex: Add get_emoji_map/1 2019-05-03 16:27:50 +02:00
federator Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
http_signatures de-group alias/es 2019-02-09 16:31:17 +01:00
mastodon_api Refactoring functions for dealing with oauth scopes. 2019-05-08 10:52:13 +00:00
media_proxy Add mediaproxy whitelist capability 2019-04-25 18:11:47 -05:00
metadata typo fix 2019-04-19 07:50:21 +00:00
nodeinfo NodeInfo: Return safe_dm_mentions feature flag. 2019-03-22 11:57:20 +01:00
oauth Refactoring functions for dealing with oauth scopes. 2019-05-08 10:52:13 +00:00
ostatus Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading 2019-04-22 11:27:29 +03:00
push WebPush: Use Object.normalize, rewrite tests so they test reality. 2019-04-29 18:15:30 +02:00
rich_media Add with_body: true to requests relying on max_body: val 2019-04-12 00:16:33 +07:00
salmon [Credo] write large numbers with underscore separation 2019-03-13 04:26:56 +01:00
templates Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' 2019-04-19 07:49:26 +00:00
twitter_api twitterapi: use order constraint to force descending order 2019-05-07 19:33:25 +00:00
views logging: only return ISE reasons in API responses when in dev or test mode 2019-02-20 17:36:47 +00:00
web_finger Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
websub Ecto 3.0.5 migration 2019-03-20 15:59:54 +03:00
xml update copyright years to 2019 2018-12-31 15:41:47 +00:00
chat_channel.ex [Credo] Remove parentesis on argument-less functions 2019-03-13 04:26:56 +01:00
controller_helper.ex Refactoring functions for dealing with oauth scopes. 2019-05-08 10:52:13 +00:00
endpoint.ex make Pleroma.Endpoint use extra_cookie_attrs in config 2019-04-16 22:20:56 +08:00
gettext.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
metadata.ex Use object instead of activity for metadata 2019-01-18 09:32:52 +03:00
oauth.ex Refactoring functions for dealing with oauth scopes. 2019-05-08 10:52:13 +00:00
rel_me.ex Add with_body: true to requests relying on max_body: val 2019-04-12 00:16:33 +07:00
router.ex Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02:00
streamer.ex Credo fixes. 2019-05-03 13:53:17 +02:00
uploader_controller.ex Make credo happy 2019-02-09 14:59:20 +01:00
web.ex Made auth customization be runtime-configurable. 2019-02-28 13:00:54 +03:00