aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
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
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
[#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-27Add an API endpoint to install a new frontendEgor Kislitsyn
2020-10-26ActivityPub: Add back debug call + explanation.lain
2020-10-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-namelain
2020-10-26Merge branch 'docs/ap_c2s' into 'develop'Haelwenn
AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056
2020-10-23Merge branch '2242-nsfw-case' into 'develop'rinpatch
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094
2020-10-23User: Correctly handle whitespace names.lain
2020-10-22Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-10-22[#3059] Formatting fix.Ivan Tashkinov
2020-10-22[#3059] Fixed Phoenix 1.5 telemetry processing.Ivan Tashkinov
2020-10-22SideEffects: Correctly handle chat messages sent to yourselflain
2020-10-22fix module nameMaksim Pechnikov
2020-10-22admin api: added user filters by `actor_types`Maksim Pechnikov
2020-10-22admin user search: added filter by `actor_type`Maksim Pechnikov
2020-10-22need_confirmed -> unconfirmedMaksim Pechnikov
2020-10-22added AdminApi.UserControllerMaksim Pechnikov
2020-10-22added 'unconfirmed' filter to admin/usersMaksim Pechnikov
2020-10-21Apply 1 suggestion(s) to 1 file(s)Haelwenn
2020-10-20Fix credo warningsEgor Kislitsyn
2020-10-20Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-20Rename `Pleroma.Backup` to `Pleroma.User.Backup`Egor Kislitsyn
2020-10-19Transmogrifier: Refactor and unify incoming tag handlinglain
2020-10-19Transmogrifier: Downcase incoming Hashtagslain
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19Fix testsEgor Kislitsyn
2020-10-19Merge branch 'develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-19Merge branch 'develop' into feature/local-only-scopeEgor Kislitsyn