Ivan Tashkinov
|
049ece1ef3
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
|
2020-10-17 13:12:39 +03:00 |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
2020-10-15 16:54:59 +04:00 |
|
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
2020-10-15 12:28:25 +02:00 |
|
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
2020-10-14 17:31:45 +00:00 |
|
Alex Gleason
|
b3d6cf9022
|
Merge remote-tracking branch 'upstream/develop' into block-behavior
|
2020-10-13 19:22:32 -05:00 |
|
Mark Felder
|
40f3cdc030
|
JPEG content_type must be image/jpeg
|
2020-10-13 10:37:24 -05:00 |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
2020-10-13 10:08:38 -05:00 |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
2020-10-13 09:54:29 -05:00 |
|
Alexander Strizhakov
|
5f2071c458
|
changes after rebase
|
2020-10-13 16:44:03 +03:00 |
|
Alexander Strizhakov
|
7f5dbb0201
|
changes after rebase
|
2020-10-13 16:44:03 +03:00 |
|
Alexander Strizhakov
|
b081080dd9
|
fixes after rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
f679486540
|
rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
c4c5caedd8
|
changes after rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
b720ad2264
|
files consistency after rebase
|
2020-10-13 16:44:01 +03:00 |
|
Alexander Strizhakov
|
c5efded5fd
|
files consistency for new files
|
2020-10-13 16:44:00 +03:00 |
|
Alexander Strizhakov
|
e33782455d
|
updates after rebase
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
7dffaef479
|
tests consistency
|
2020-10-13 16:35:09 +03:00 |
|