sergiotarxz/Pleroma
sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Pleroma/test/pleroma/web
History
minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope' 
# Conflicts:
#   CHANGELOG.md
2020-10-30 11:18:55 +00:00
..
activity_pub
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-28 19:03:40 +03:00
admin_api
fix module name
2020-10-22 12:04:23 +03:00
api_spec
…
auth
…
common_api
Add local-only statuses
2020-10-15 18:37:44 +04:00
endpoint
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
2020-10-27 14:37:48 -05:00
fed_sockets
Fix warnings
2020-10-15 16:54:59 +04:00
feed
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-17 13:12:39 +03:00
mastodon_api
Merge branch 'develop' into 'feature/local-only-scope'
2020-10-30 11:18:55 +00:00
media_proxy
…
metadata
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
o_auth
Fix warnings
2020-10-15 16:54:59 +04:00
o_status
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-17 13:12:39 +03:00
pleroma_api
Merge branch 'issue/2069' into 'develop'
2020-10-29 23:39:15 +00:00
plugs
FrontStatic plug: excluded invalid url
2020-10-27 22:59:27 +03:00
preload/providers
update files consistency after rebase
2020-10-13 16:44:00 +03:00
push
JPEG content_type must be image/jpeg
2020-10-13 10:37:24 -05:00
rich_media
changes after rebase
2020-10-13 17:10:34 +03:00
static_fe
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-17 13:12:39 +03:00
twitter_api
…
views
…
web_finger
…
chat_channel_test.exs
…
common_api_test.exs
Merge branch 'develop' into 'feature/local-only-scope'
2020-10-27 18:59:19 +00:00
fallback_test.exs
…
federator_test.exs
…
media_proxy_test.exs
…
metadata_test.exs
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
mongoose_im_controller_test.exs
…
node_info_test.exs
…
rel_me_test.exs
…
streamer_test.exs
…
uploader_controller_test.exs
…
web_finger_test.exs
…