Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
|
KokaKiwi
|
638457ba94
|
MastoFE: Add PWA manifest.
|
5 years ago |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
|
Egor Kislitsyn
|
d3c404af12
|
Add MastoFEController
|
5 years ago |
|
Egor Kislitsyn
|
98d1347a4e
|
Extract status actions from `MastodonAPIController` into `StatusController`
|
5 years ago |
|
Egor Kislitsyn
|
96816ceaa2
|
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
|
5 years ago |
|
kaniini
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
5 years ago |
|
Steven Fuchs
|
aab264db82
|
Streamer refactoring
|
5 years ago |
|
Egor Kislitsyn
|
4b7f1c6995
|
Improve digest email template
|
5 years ago |
|
Roman Chvanikov
|
657277ffc0
|
Resolve conflicts
|
5 years ago |
|
rinpatch
|
92213fb87c
|
Replace Mix.env with Pleroma.Config.get(:env)
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
|
5 years ago |
|
Roman Chvanikov
|
64a2c6a041
|
Digest emails
|
6 years ago |
|
William Pitcock
|
22e2ed235d
|
logging: only return ISE reasons in API responses when in dev or test mode
|
6 years ago |
|
William Pitcock
|
8b08096436
|
logging: improve visibility into ISE errors
|
6 years ago |
|
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
6 years ago |
|
William Pitcock
|
2791ce9a1f
|
add license boilerplate to pleroma core
|
6 years ago |
|
lain
|
4afbef39f4
|
Format the code.
|
7 years ago |
|
Roger Braun
|
2a298d70f9
|
Add very basic oauth and mastodon api support.
|
7 years ago |
|
Roger Braun
|
a93f3421a7
|
Phoenix skeleton
|
8 years ago |
