Ivan Tashkinov
|
1b49b8efe5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
2021-01-31 20:38:58 +03:00 |
Mark Felder
|
e854c35e65
|
Convert tests to all use clear_config instead of Pleroma.Config.put
|
2021-01-26 11:58:43 -06:00 |
|
Ivan Tashkinov
|
694d98be55
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
2021-01-25 21:24:07 +03:00 |
|
Mark Felder
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-25 09:45:06 -06:00 |
|
Ivan Tashkinov
|
2634a16b4c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
2021-01-21 20:20:35 +03:00 |
Egor Kislitsyn
|
51d5951c02
|
Test that only author can reblog a private status
|
2021-01-18 21:01:00 +04:00 |
|
Egor Kislitsyn
|
1b79dce7bc
|
Fix Reblog API
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
|
2021-01-18 20:15:57 +04:00 |
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
2021-01-15 11:24:46 -06:00 |
|
Ivan Tashkinov
|
e350898828
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
2021-01-13 22:11:16 +03:00 |
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/>;'
|
2021-01-13 07:49:50 +01:00 |
lain
|
cf0eb0c1c5
|
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
|
2021-01-07 11:09:18 +00:00 |
Roger Braun
|
48cd336a72
|
allow external emoji
|
2021-01-06 10:13:01 -06:00 |
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
2021-01-04 13:38:31 +01:00 |
Haelwenn
|
3966add048
|
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
|
2020-12-28 12:02:16 +00:00 |
|
Haelwenn (lanodan) Monnier
|
acb03d591b
|
Insert text representation of hashtags into object["hashtags"]
Includes a new mix task: pleroma.database fill_old_hashtags
|
2020-12-22 05:15:34 +01:00 |
|
Ivan Tashkinov
|
ee221277b0
|
Encapsulation of tags / hashtags fetching from objects.
|
2020-12-21 22:54:26 +03:00 |
|
lain
|
fec1ed802e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
|
2020-11-17 15:01:38 +01:00 |
|
Egor Kislitsyn
|
0118ccb53c
|
Add `local` visibility
|
2020-11-11 18:54:01 +04:00 |
|
lain
|
dd2b3a8da9
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
|
2020-11-04 16:51:42 +01:00 |
|
minibikini
|
1bfd8528bb
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 18:59:19 +00:00 |
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
2020-10-22 20:33:52 +00:00 |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
2020-10-22 12:22:08 +02:00 |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
2020-10-17 17:53:47 +03:00 |
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
2020-10-15 18:37:44 +04:00 |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
2020-10-15 16:54:59 +04: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
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
2020-10-13 09:54:29 -05:00 |
Alexander Strizhakov
|
7dffaef479
|
tests consistency
|
2020-10-13 16:35:09 +03:00 |