Haelwenn
|
99bc175f02
|
Merge branch 'title-injection-change' into 'develop'
Title injection change
See merge request pleroma/pleroma!3132
|
4 years ago |
|
Mark Felder
|
966663c3f8
|
Fix tests for other attachment types
|
4 years ago |
|
Mark Felder
|
2254e5e595
|
Render blurhashes in Mastodon API
|
4 years ago |
|
Mark Felder
|
6fd72e9e85
|
Ingest blurhash for attachments if they were federated
|
4 years ago |
|
lain
|
631def2df2
|
RedirectController: Don't replace title, but inject into the meta
|
4 years ago |
|
feld
|
3cd7ea693f
|
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
|
4 years ago |
|
Alexander Strizhakov
|
f97f24b067
|
making credo happy and test fix
|
4 years ago |
|
Alexander Strizhakov
|
485697d96c
|
config descriptions for custom MRF policies
|
4 years ago |
|
Alexander Strizhakov
|
0c68b9ac13
|
escaping summary and other fields in xml templates
|
4 years ago |
|
lain
|
dd2b3a8da9
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
|
4 years ago |
|
lain
|
4800ee656b
|
Merge branch 'features/federation-status' into 'develop'
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
|
4 years ago |
|
lain
|
5db4c823b2
|
Merge branch 'restrict-domain' into 'develop'
View a remote server's timeline
See merge request pleroma/pleroma!2713
|
4 years ago |
|
Haelwenn
|
9c09ea01aa
|
Merge branch '2284-voters-count' into 'develop'
Always return voters_count in polls
See merge request pleroma/pleroma!3120
|
4 years ago |
|
lain
|
504a829edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
|
4 years ago |
|
lain
|
329aa19c9f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
|
4 years ago |
|
lain
|
bc4d9c4ffc
|
Merge branch 'hide-muted-chats' into 'develop'
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
|
4 years ago |
|
Egor Kislitsyn
|
ca95cbe0b4
|
Add `with_muted` param to ChatController.index/2
|
4 years ago |
|
lain
|
1cfc3278c0
|
Poll View: Always return `voters_count`.
|
4 years ago |
|
lain
|
c37118e6f2
|
Conversations: A few refactors
|
4 years ago |
|
lain
|
91f6c32430
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
|
4 years ago |
|
Mark Felder
|
53dd048590
|
Test the note is returned when fetching a single report
|
4 years ago |
|
Egor Kislitsyn
|
be52819a11
|
Hide chats from muted users
|
4 years ago |
|
lain
|
24ce324973
|
Merge branch 'bugfix/poll_replies_count' into 'develop'
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
4caad4e910
|
side_effects: Don’t increase_replies_count when it’s an Answer
|
4 years ago |
|
feld
|
38b481d112
|
Merge branch 'feature/account-export' into 'develop'
Add account export
Closes #847
See merge request pleroma/pleroma!2918
|
4 years ago |
|
eugenijm
|
8e41baff40
|
Add idempotency_key to the chat_message entity.
|
4 years ago |
|
Egor Kislitsyn
|
a2a7a1f2ff
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
1a98476f48
|
Remove unused aliases
|
4 years ago |
|
Alibek Omarov
|
1042c30fa5
|
ConversationViewTest: fix test
|
4 years ago |
|
Alibek Omarov
|
0552a08dfd
|
ConversationControllerTest: fix test, fix formatting
|
4 years ago |
|
Alibek Omarov
|
9b93eef715
|
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
|
4 years ago |
|
Alibek Omarov
|
630eb0f939
|
ConversationViewTest: fix test #2
|
4 years ago |
|
Alibek Omarov
|
149589c842
|
ConversationViewTest: fix test
|
4 years ago |
|
Alibek Omarov
|
390a12d4c8
|
ConversationControllerTest: fix test
|
4 years ago |
|
Haelwenn
|
131f3219e6
|
Merge branch 'issue/2069' into 'develop'
[#2069] unread_conversation_count
See merge request pleroma/pleroma!2939
|
4 years ago |
|
feld
|
1cce1bd729
|
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
[#2137] admin/users filters
See merge request pleroma/pleroma!3016
|
4 years ago |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
4 years ago |
|
Ivan Tashkinov
|
ba50dc05a8
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
d2b140a525
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
|
4 years ago |
|
Egor Kislitsyn
|
4a2d7a7a5d
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Haelwenn
|
d8d4bd15d0
|
Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
|
4 years ago |
|
Mark Felder
|
f2b74f60f0
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Maksim Pechnikov
|
d28f72a55a
|
FrontStatic plug: excluded invalid url
|
4 years ago |
|
Mark Felder
|
cbe41408e4
|
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
|
4 years ago |
|
Mark Felder
|
291189357b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Mark Felder
|
9e54ef086b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
5aff479951
|
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
|
4 years ago |
|
lain
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
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 |
