Mark Felder
|
e854c35e65
|
Convert tests to all use clear_config instead of Pleroma.Config.put
|
4 years ago |
|
Mark Felder
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
4 years ago |
|
Egor Kislitsyn
|
51d5951c02
|
Test that only author can reblog a private status
|
4 years ago |
|
Egor Kislitsyn
|
1b79dce7bc
|
Fix Reblog API
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
|
4 years ago |
|
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
c4439c630f
|
Bump Copyright to 2021
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
|
4 years ago |
|
lain
|
cf0eb0c1c5
|
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
|
4 years ago |
|
Roger Braun
|
48cd336a72
|
allow external emoji
|
4 years ago |
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
4 years ago |
|
Haelwenn
|
3966add048
|
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
acb03d591b
|
Insert text representation of hashtags into object["hashtags"]
Includes a new mix task: pleroma.database fill_old_hashtags
|
4 years ago |
|
lain
|
fec1ed802e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
|
4 years ago |
|
Egor Kislitsyn
|
0118ccb53c
|
Add `local` visibility
|
4 years ago |
|
lain
|
dd2b3a8da9
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
|
4 years ago |
|
minibikini
|
1bfd8528bb
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
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 |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
4 years ago |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
4 years ago |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
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
|
40f3cdc030
|
JPEG content_type must be image/jpeg
|
4 years ago |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
4 years ago |
|
Alexander Strizhakov
|
7dffaef479
|
tests consistency
|
4 years ago |
