aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-11-05Merge branch 'feature/expire-mutes' into 'develop'lain
Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971
2020-11-04AdminEmail: Use AP id as user url.lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
stats-genserver-fix
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/expire-mutes
2020-11-04Merge branch 'features/federation-status' into 'develop'lain
Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
View a remote server's timeline See merge request pleroma/pleroma!2713
2020-11-04Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov
2020-11-04Merge branch '2284-voters-count' into 'develop'Haelwenn
Always return voters_count in polls See merge request pleroma/pleroma!3120
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/federation-status
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-restrict-domain
2020-11-04Merge branch 'hide-muted-chats' into 'develop'lain
Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116
2020-11-04Add `with_muted` param to ChatController.index/2Egor Kislitsyn
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-admin-api
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/local-only-scope
2020-11-04Poll Schema: Update and fix.lain
2020-11-04Poll View: Always return `voters_count`.lain
2020-11-03Conversations: A few refactorslain
2020-11-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
a1batross/pleroma-patch-4
2020-11-02Permit fetching individual reports with notes preloadedMark Felder
2020-11-02Hide chats from muted usersEgor Kislitsyn
2020-11-02Merge branch 'bugfix/poll_replies_count' into 'develop'lain
side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114
2020-11-02Merge branch 'develop' into 'frontend-admin-api'minibikini
# Conflicts: # lib/pleroma/web/router.ex
2020-11-02side_effects: Don’t increase_replies_count when it’s an AnswerHaelwenn (lanodan) Monnier
2020-11-01Merge branch 'tesla-get-to-pleroma' into 'develop'feld
Use Pleroma.HTTP instead of Tesla Closes #2275 See merge request pleroma/pleroma!3113
2020-11-01Use Pleroma.HTTP instead of TeslaEkaterina Vaartis
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.
2020-10-31Merge branch 'feature/account-export' into 'develop'feld
Add account export Closes #847 See merge request pleroma/pleroma!2918
2020-10-31Auth subsystem refactoring and tweaks.Ivan Tashkinov
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
2020-10-31Add idempotency_key to the chat_message entity.eugenijm
2020-10-31Fix credo warningEgor Kislitsyn
2020-10-30Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-30ConversationView: fix formattingAlibek Omarov
2020-10-30ConversationView: fix last_status.account being empty, fix current user ↵Alibek Omarov
being included in group conversations
2020-10-30ConversationView: add current user to conversations, according to Mastodon ↵Alibek Omarov
behaviour
2020-10-30Merge branch 'develop' into 'feature/local-only-scope'minibikini
# Conflicts: # CHANGELOG.md
2020-10-29Merge branch 'issue/2069' into 'develop'Haelwenn
[#2069] unread_conversation_count See merge request pleroma/pleroma!2939
2020-10-29Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'feld
[#2137] admin/users filters See merge request pleroma/pleroma!3016
2020-10-29Add support for install via `file` and `build_url` paramsEgor Kislitsyn
2020-10-29Merge remote-tracking branch 'origin/develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-29Merge remote-tracking branch 'origin/develop' into feature/local-only-scopeEgor Kislitsyn
2020-10-28Fixed User.is_discoverable attribute rendering in Admin API User view.Ivan Tashkinov
2020-10-28@doc fix.Ivan Tashkinov
2020-10-28Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
ostatus-controller-no-auth-check-on-non-federating-instances # Conflicts: # CHANGELOG.md
2020-10-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261Mark Felder
2020-10-28Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-27Merge branch 'feature/autofollowing' into 'develop'feld
autofollowing_nicknames See merge request pleroma/pleroma!3087
2020-10-27Merge branch '2236-no-name' into 'develop'Haelwenn
Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-27FrontStatic plug: excluded invalid urlMaksim Pechnikov
2020-10-27Merge branch 'develop' into 'feature/local-only-scope'minibikini
# Conflicts: # CHANGELOG.md
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:12:41 +0000