sergiotarxz/Pleroma
sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Pleroma/lib/pleroma/web
History
Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop' 
[#2069] unread_conversation_count

See merge request pleroma/pleroma!2939
2020-10-29 23:39:15 +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
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
2020-10-29 21:06:15 +00:00
api_spec
Merge branch 'develop' into mutes-blocks-pagination
2020-10-19 15:40:03 +04:00
auth
alias alphabetically order
2020-10-13 16:43:59 +03:00
channels
…
common_api
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -05:00
fallback
InstanceStatic module name
2020-10-13 16:43:55 +03:00
fed_sockets
changes after rebase
2020-10-13 16:44:03 +03:00
federator
other files consistency
2020-10-13 16:38:19 +03:00
feed
[#3053] Post-merge fix.
2020-10-17 13:33:57 +03:00
mailer
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
mastodon_api
Merge branch 'issue/2069' into 'develop'
2020-10-29 23:39:15 +00:00
media_proxy
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -05:00
metadata
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
mongoose_im
alias alphabetically order
2020-10-13 16:43:59 +03:00
nodeinfo
…
o_auth
alias alphabetically order
2020-10-13 16:43:59 +03: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 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
plugs
FrontStatic plug: excluded invalid url
2020-10-27 22:59:27 +03:00
preload/providers
fix after rebase
2020-10-13 16:44:00 +03:00
push
more files renamings
2020-10-13 16:38:19 +03:00
rich_media
more files renamings
2020-10-13 16:38:19 +03:00
static_fe
@doc fix.
2020-10-28 19:09:38 +03:00
templates
Fix warnings
2020-10-15 16:54:59 +04:00
twitter_api
alias alphabetically order
2020-10-13 16:43:59 +03:00
views
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
web_finger
FederatingPlug module name
2020-10-13 16:43:55 +03:00
api_spec.ex
OpenAPI: make it possible to generate a spec without starting the app
2020-09-19 16:26:15 +03:00
chat_channel.ex
[#2791] AccountView: renamed :force option to :skip_visibility_check.
2020-07-23 15:08:30 +03:00
common_api.ex
other files consistency
2020-10-13 16:38:19 +03:00
controller_helper.ex
added paginate links to headers for /chats/:id/messages
2020-09-10 12:39:29 +03:00
embed_controller.ex
…
endpoint.ex
Merge branch '1668-prometheus-access-restrictions' into 'develop'
2020-10-27 17:47:56 +00:00
fed_sockets.ex
changes after rebase
2020-10-13 16:44:03 +03:00
federator.ex
other files consistency
2020-10-13 16:38:19 +03:00
gettext.ex
…
instance_document.ex
Return the file content for GET /api/pleroma/admin/instance_document/:document_name
2020-09-17 16:55:53 +03:00
masto_fe_controller.ex
alias alphabetically order
2020-10-13 16:43:59 +03:00
media_proxy.ex
other files consistency
2020-10-13 16:38:19 +03:00
metadata.ex
Metadata: Move restriction check from Feed provider to activated_providers
2020-09-08 20:21:34 +03:00
o_auth.ex
oauth consistency
2020-10-13 16:38:18 +03:00
plug.ex
more files renamings
2020-10-13 16:38:19 +03:00
preload.ex
…
push.ex
more files renamings
2020-10-13 16:38:19 +03:00
rel_me.ex
passing adapter options directly without adapter key
2020-09-07 19:59:17 +03:00
router.ex
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
2020-10-29 21:06:15 +00:00
streamer.ex
changes after rebase
2020-10-13 17:10:34 +03:00
translation_helpers.ex
…
uploader_controller.ex
…
web_finger.ex
more files renamings
2020-10-13 16:38:19 +03:00
xml.ex
more files renamings
2020-10-13 16:38:19 +03:00