aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-11-11Merge branch 'feature/2222-config-descriptions-for-custom-modules' into ↵feld
'develop' Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128
2020-11-11Moving some background jobs into simple tasksAlexander Strizhakov
- fetching activity data - attachment prefetching - using limiter to prevent overload
2020-11-11making credo happy and test fixAlexander Strizhakov
2020-11-11fix for adminFEAlexander Strizhakov
- revert UserAllowPolicy description - MRF descriptions order
2020-11-10config descriptions for custom MRF policiesAlexander Strizhakov
2020-11-10Merge branch 'fix/html-title-load' into 'develop'lain
Fix title on load of Pleroma HTML, fixes #2281 Closes #2281 See merge request pleroma/pleroma!3125
2020-11-10escaping summary and other fields in xml templatesAlexander Strizhakov
2020-11-08Fix title on load of Pleroma HTMLSean King
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-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 '2236-no-name' into 'develop'Haelwenn
Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101
2020-10-27FrontStatic plug: excluded invalid urlMaksim Pechnikov
2020-10-27Merge branch 'develop' into 'feature/local-only-scope'minibikini
# Conflicts: # CHANGELOG.md
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 17:03:22 +0000