Egor Kislitsyn
|
e87901c424
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
ad605e3e16
|
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
|
4 years ago |
|
Haelwenn
|
44b2a137d1
|
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install file-dev in alpine release targets
See merge request pleroma/pleroma!3095
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
ccd1e75e35
|
CI: Install file-dev in alpine release targets
|
4 years ago |
|
Haelwenn
|
fe160330e6
|
Merge branch 'fix/autofollower-suggestions' into 'develop'
Remove suggestions for autofollower_nicknames
See merge request pleroma/pleroma!3088
|
4 years ago |
|
Egor Kislitsyn
|
c1976d5b19
|
Fix credo warnings
|
4 years ago |
|
Egor Kislitsyn
|
98f32cf820
|
Fix tests
|
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 |
|
feld
|
be611b143b
|
Merge branch 'chore/changelogfix' into 'develop'
Fix duplicate Added sections in the changelog
See merge request pleroma/pleroma!3091
|
4 years ago |
|
Mark Felder
|
cb3ee4d543
|
Fix duplicate Added sections in the changelog
|
4 years ago |
|
Mark Felder
|
405f27b4f8
|
The suggestions are problematic as they need to be real local account names
|
4 years ago |
|
feld
|
023f726d7f
|
Merge branch 'refactor/discoverable_user_field' into 'develop'
Change user.discoverable field to user.is_discoverable
See merge request pleroma/pleroma!3078
|
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 |
|
feld
|
5703fb6d2a
|
Merge branch 'issue/2009' into 'develop'
[#2009] fixed install docs (release env)
See merge request pleroma/pleroma!2854
|
4 years ago |
|
Maksim Pechnikov
|
2030ffd490
|
fix test
|
4 years ago |
|
Maksim Pechnikov
|
cf53e300f8
|
added generate the release env to `pleroma.instance gen`
|
4 years ago |
|
Maksim Pechnikov
|
595da6080d
|
fixed install docs
|
4 years ago |
|
Maksim Pechnikov
|
2f6bbd53b5
|
fix docs
|
4 years ago |
|
Maksim
|
e2333f757a
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Maksim
|
499df7b73a
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Maksim Pechnikov
|
14054cd004
|
update task messages
|
4 years ago |
|
Maksim Pechnikov
|
20e68b30f0
|
added generated `pleroma.env`
|
4 years ago |
|
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
4 years ago |
|
feld
|
b48724afcd
|
Merge branch 'docs-indigenous' into 'develop'
Change handle and url of contact person for Indigenous client
See merge request pleroma/pleroma!3082
|
4 years ago |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
4 years ago |
|
swentel
|
42112b842c
|
Change handle and url of contact person for Indigenous client
|
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 |
|
Haelwenn
|
9a85ec0da0
|
Merge branch 'refactor/locked_user_field' into 'develop'
Change user.locked field to user.is_locked
See merge request pleroma/pleroma!3077
|
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
|
8b20c4d275
|
Missed tests
|
4 years ago |
|
Haelwenn
|
481906207e
|
Merge branch 'bugfix/file-consistency-prod' into 'develop'
Move Consistency.FileLocation to ./test
See merge request pleroma/pleroma!3079
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f5d8af1db1
|
Move Consistency.FileLocation to ./test
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
|
4 years ago |
|
Mark Felder
|
09be8cb336
|
Credo
|
4 years ago |
|
Mark Felder
|
40f3cdc030
|
JPEG content_type must be image/jpeg
|
4 years ago |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
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 |
|
feld
|
8b6221d4ec
|
Merge branch 'feature/1822-files-consistency' into 'develop'
Feature/1822 files consistency
Closes #1822
See merge request pleroma/pleroma!2680
|
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
|
3cb9c88837
|
migration and warning for RemoteIp plug rename
|
4 years ago |
|
Alexander Strizhakov
|
5f2071c458
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
bb111465a1
|
credo fix after rebase
|
4 years ago |
|
Alexander Strizhakov
|
7f5dbb0201
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
b081080dd9
|
fixes after rebase
|
4 years ago |
