lain
|
d788b41c2e
|
Report fixes.
|
2020-12-22 21:32:11 +01:00 |
|
lain
|
c26583c99e
|
SideEffects: fix test
|
2020-12-22 21:08:11 +01:00 |
|
rinpatch
|
5116859f0e
|
Merge branch 'fix/object-attachment-spoof' into 'develop'
Fix object spoofing vulnerability in attachments
See merge request pleroma/secteam/pleroma!18
|
2020-11-05 16:32:54 +03:00 |
|
Haelwenn
|
4d693b5e54
|
Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
|
2020-11-05 16:32:50 +03:00 |
|
feld
|
48f7e12e6c
|
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
OStatus / Static FE access control fixes
See merge request pleroma/pleroma!3053
|
2020-11-05 16:23:56 +03:00 |
|
rinpatch
|
5f27a39152
|
Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
|
2020-11-05 16:19:44 +03:00 |
|
feld
|
6c8469664a
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
2020-11-04 17:05:21 +03: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 |
|
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 |