6c8469664a
Merge branch 'chore/elixir-1.11' into 'develop'
...
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
4 years ago
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
49b43e668e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
4 years ago
fa6ad67397
Merge branch 'tesla-get-to-pleroma' into 'develop'
...
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
4 years ago
bc4d9c4ffc
Merge branch 'hide-muted-chats' into 'develop'
...
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
4 years ago
ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
4 years ago
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
92d252f364
Poll Schema: Update and fix.
4 years ago
f09bb814a9
Changelog: Add info about poll view changes
4 years ago
1cfc3278c0
Poll View: Always return `voters_count`.
4 years ago
ba3f3a5a56
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
...
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social
Closes #2270
See merge request pleroma/pleroma!3115
4 years ago
f7a3dcd320
Merge branch 'patch-4' into 'develop'
...
ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled
Closes #2217
See merge request pleroma/pleroma!3089
4 years ago
c37118e6f2
Conversations: A few refactors
4 years ago
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
4 years ago
179936609f
favicon: Update to pleroma logo, provided by @shpuld
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
4 years ago
0d8cc0905a
Merge branch 'fix/get_report_with_notes' into 'develop'
...
Permit fetching individual reports with notes preloaded
See merge request pleroma/pleroma!3118
4 years ago
0fd2830fe1
Merge branch 'chore/deps-from-git' into 'develop'
...
Ensure URLs for git repos end in .git for older git clients like on CentOS 7
See merge request pleroma/pleroma!3119
4 years ago
2f2281fdf1
Ensure URLs for git repos end in .git for older git clients like on CentOS 7
4 years ago
53dd048590
Test the note is returned when fetching a single report
4 years ago
7efc074ead
Permit fetching individual reports with notes preloaded
4 years ago
be52819a11
Hide chats from muted users
4 years ago
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
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
4 years ago
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
4 years ago
9fbe9ef774
Merge branch 'tesla-get-to-pleroma' into 'develop'
...
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
4 years ago
8f00d90f91
Use Pleroma.HTTP instead of Tesla
...
Closes #2275
As discovered in the issue, captcha used Tesla.get instead of
Pleroma.HTTP. I've also grep'ed the repo and changed the other place
where this was used.
4 years ago
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
4 years ago
37e8e8bf8e
Merge branch 'idempotency-key-optimistic-posting' into 'develop'
...
Add `idempotency_key` to the chat message entity
Closes #2126
See merge request pleroma/pleroma!3015
4 years ago
8e41baff40
Add idempotency_key to the chat_message entity.
4 years ago
d1698267a2
Fix credo warning
4 years ago
a2a7a1f2ff
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
4fbdd1c8a1
Merge branch 'remove-unused-aliases' into 'develop'
...
Remove unused aliases
See merge request pleroma/pleroma!3111
4 years ago
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
1a98476f48
Remove unused aliases
4 years ago
1042c30fa5
ConversationViewTest: fix test
4 years ago
d63ec02f31
ConversationView: fix formatting
4 years ago
0552a08dfd
ConversationControllerTest: fix test, fix formatting
4 years ago
5591dc0248
Add entry in changelog
4 years ago
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
4 years ago
630eb0f939
ConversationViewTest: fix test #2
4 years ago
149589c842
ConversationViewTest: fix test
4 years ago
390a12d4c8
ConversationControllerTest: fix test
4 years ago
241bd061fc
ConversationView: add current user to conversations, according to Mastodon behaviour
4 years ago
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
4 years ago
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
4 years ago
a326a56371
Merge branch 'fix/frontend-cli-docs' into 'develop'
...
Fix formatting and typos in "Managing frontends" guide
See merge request pleroma/pleroma!3098
4 years ago
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
4 years ago
6d7dc1241c
Merge branch 'mutes-blocks-pagination' into 'develop'
...
Support pagination of blocks and mutes
Closes #642
See merge request pleroma/pleroma!3080
4 years ago
8b3650998b
Merge branch 'fix/mrf-keyword-description' into 'develop'
...
Improve Keyword descriptions for AdminFE
See merge request pleroma/pleroma!3110
4 years ago
feld