summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-11AdminAPI: fix delete chat messageAlex Gleason
2020-09-11AdminAPI: show chatAlex Gleason
2020-09-11AdminAPI: list messages in a chatAlex Gleason
2020-09-11Refactor with Chat.for_user_query/1Alex Gleason
2020-09-11AdminAPI: list chats for a userAlex Gleason
2020-09-11AdminAPI: delete a chat messageAlex Gleason
2020-09-11MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1Alex Gleason
2020-09-08Merge branch 'release/2.1.1' into 'stable'rinpatch
2.1.1 release See merge request pleroma/secteam/pleroma!13
2020-09-08Merge branch 'bugfix/mock' into 'develop'Haelwenn
mockfix but for non-secteam because gitlab See merge request pleroma/pleroma!2973
2020-09-08pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679rinpatch
2020-09-08Merge branch 'temp-hackney-fix' into 'develop'rinpatch
temp hackney fix See merge request pleroma/pleroma!2951
2020-09-08Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'rinpatch
Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924
2020-09-08CHANGELOG.md: Add 2.1.1 entryrinpatch
2020-09-08mix.exs: bump version to 2.1.1rinpatch
2020-09-08Disable favicon scraping in testsrinpatch
2020-09-08Merge branch 'fix/admin-controller-atom-leak' into 'develop'rinpatch
Fix atom leak in AdminAPIController See merge request pleroma/secteam/pleroma!6
2020-09-08Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956
2020-09-08Merge branch 'develop' into 'develop'lain
Added cmake See merge request pleroma/pleroma!2953
2020-09-08Merge branch 'chore/fast_html-bump' into 'develop'rinpatch
mix.lock: Bump fast_html See merge request pleroma/pleroma!2950
2020-09-08Merge branch 'bugfix/favicon-too-long' into 'develop'rinpatch
instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-08Merge branch 'chore/fast-sanitize-bump' into 'develop'rinpatch
mix.lock: bump fast_sanitize See merge request pleroma/pleroma!2932
2020-09-08Merge branch 'http-fixes' into 'develop'rinpatch
Improvements and fixes for http requests See merge request pleroma/pleroma!2904
2020-09-08Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
Rich media improvements See merge request pleroma/pleroma!2944
2020-09-08Merge branch 'fix/2047-rich-media-parser' into 'develop'rinpatch
RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941
2020-09-08Merge branch 'fix/2087-metadata' into 'develop'rinpatch
Fix/2087 metadata See merge request pleroma/secteam/pleroma!11
2020-09-08Merge branch 'secfix/search-crash' into 'develop'rinpatch
Fix crash done via search See merge request pleroma/secteam/pleroma!12
2020-09-08Merge branch 'fix-searching-following' into 'develop'rinpatch
search: fix 'following' query parameter See merge request pleroma/pleroma!2943
2020-09-08Merge branch 'fix/apc2s-limits' into 'develop'rinpatch
AP C2S: Restrict character limit on Note Closes #2 See merge request pleroma/secteam/pleroma!9
2020-08-28Merge branch 'release/2.1.0' into 'stable'lain
Release/2.1.0 See merge request pleroma/pleroma!2927
2020-08-28Mix: Update versionlain
2020-08-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
2020-08-27Merge branch '2078-list-fixes' into 'develop'Haelwenn
Resolve "List timeline returns incorrectly assigned Account for replies and repeats" Closes #2070 and #2078 See merge request pleroma/pleroma!2923
2020-08-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
2020-08-27Merge branch '2081-deleted-user-chats' into 'develop'lain
ChatController: Don't die if the recipient is gone. Closes #2081 See merge request pleroma/pleroma!2926
2020-08-27ChatController: Don't die if the recipient is gone.lain
2020-08-27Merge branch 'update/admin-fe-20200826' into 'develop'rinpatch
Update AdminFE build in preparation for 2.1.0 release See merge request pleroma/pleroma!2925
2020-08-26Update AdminFE build in preparation for 2.1.0 releaseMark Felder
2020-08-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
2020-08-26Merge branch 'fix/fast_html-build-errors' into 'develop'rinpatch
fix fast_html build errors with gcc 10 by bumping fast_sanitize Closes #2058 See merge request pleroma/pleroma!2922
2020-08-26Changelog: Add info about list fixes.lain
2020-08-26TimelineController: Keys are atoms now.lain
Closes #2078 Closes #2070
2020-08-26fix fast_html build errors with gcc 10 by bumping fast_sanitizerinpatch
Closes #2058
2020-08-26Merge branch '2079-welcome-message-docs' into 'develop'rinpatch
Cheatsheet: Remove misleading example Closes #2079 See merge request pleroma/pleroma!2921
2020-08-26Cheatsheet: Remove misleading examplelain
2020-08-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
2020-08-26Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'lain
release MR template: add a note about merging stable changes back to develop See merge request pleroma/pleroma!2920
2020-08-26release MR template: add a note about merging stable changes back torinpatch
develop
2020-08-25Merge branch 'buildx-multiarch-arm32v7' into 'develop'Haelwenn
Add multiarch support to docker container, fixes pleroma/pleroma-docker-compose#2 Closes pleroma-docker-compose#2 See merge request pleroma/pleroma!2789
2020-08-25Merge branch 'feature/1952-read-muted-notifications' into 'develop'feld
Automatically mark notifications about statuses from muted users and threads as read Closes #1952 See merge request pleroma/pleroma!2893
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 23:31:02 +0000