Haelwenn
|
073ad7e6d9
|
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
|
4 years ago |
|
rinpatch
|
df61071422
|
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
|
4 years ago |
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
4 years ago |
|
Ivan Tashkinov
|
8a68673eed
|
[#3059] Formatting fix.
|
4 years ago |
|
Ivan Tashkinov
|
8a55de1d78
|
[#3059] Fixed Phoenix 1.5 telemetry processing.
|
4 years ago |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
4 years ago |
|
lain
|
e97b254c6b
|
Transmogrifier: Refactor and unify incoming tag handling
|
4 years ago |
|
lain
|
39fd4d7639
|
Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
|
4 years ago |
|
Haelwenn
|
0495a07dc7
|
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
|
4 years ago |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
Haelwenn
|
724e4b7f00
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
4 years ago |
|
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
4 years ago |
|
feld
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
4 years ago |
|
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
4 years ago |
|
Mark Felder
|
ed61002815
|
Undo API breaking changes
|
4 years ago |
|
Mark Felder
|
b001237b79
|
Finish undoing API breakage
|
4 years ago |
|
Mark Felder
|
3242cfef20
|
Undo API breaking changes
|
4 years ago |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
4 years ago |
|
Mark Felder
|
4ead0d564f
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
Mark Felder
|
8bacdc3680
|
Change user.discoverable field to user.is_discoverable
|
4 years ago |
|
Mark Felder
|
9968b7efed
|
Change user.locked field to user.is_locked
|
4 years ago |
|
Alexander Strizhakov
|
4c4ea9a348
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
5f2071c458
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
b081080dd9
|
fixes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
1d0e130cb3
|
fixes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
0f8ab46a0e
|
fix after rebase
|
4 years ago |
|
Alexander Strizhakov
|
207211a2b3
|
update files consistency after rebase
|
4 years ago |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
4 years ago |
|
Alexander Strizhakov
|
3ef4e9d170
|
AdminSecretAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
c497558d43
|
AuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
c1777e7479
|
BasicAuthDecoderPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
970932689f
|
DigestPlug rename
|
4 years ago |
|
Alexander Strizhakov
|
66e0b0065b
|
Cache plug module name
|
4 years ago |
|
Alexander Strizhakov
|
c6baa811d6
|
EnsureAuthenticatedPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
011525a3d1
|
EnsurePublicOrAuthenticatedPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8e301a4c37
|
EnsureUserKeyPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
d6cb1a3b46
|
ExpectAuthenticatedCheckPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
99e4ed21b1
|
ExpectPublicOrAuthenticatedCheckPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8c993c5f63
|
FederatingPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
abc3c7689b
|
HTTPSecurityPlug module name and filename
|
4 years ago |
|
Alexander Strizhakov
|
5cd7030076
|
IdempotencyPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8dfaa54ffc
|
InstanceStatic module name
|
4 years ago |
|
Alexander Strizhakov
|
e2332d92ce
|
LegacyAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
96d320bdfe
|
OAuthPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
a6d8cef33e
|
OAuthScopesPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
15772fda57
|
PlugHelper module name
|
4 years ago |
