aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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'v2.1.0lain
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
2020-08-25Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'Haelwenn
Webfinger: Handle bogus ids better. Closes #2077 See merge request pleroma/pleroma!2919
2020-08-25Webfinger: Handle bogus ids better.lain
2020-08-25Mix: Make rc version explicit.lain
2020-08-25Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0lain
2020-08-25Merge branch 'frontend-bundles-downloads' into 'develop'lain
frontend install mix tasks See merge request pleroma/pleroma!2841
2020-08-25Description: Update description.lain
2020-08-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-25Merge branch 'docs/update-clients' into 'develop'lain
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE See merge request pleroma/pleroma!2914
2020-08-24clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFEHaelwenn (lanodan) Monnier
2020-08-24Merge branch 'feature/add-preload-to-description' into 'develop'feld
Add Pleroma.Web.Preload to description.exs See merge request pleroma/pleroma!2913
2020-08-24Add Pleroma.Web.Preload to description.exsAngelina Filippova
2020-08-24Merge branch 'relay-fix-admin-fe' into 'develop'feld
Relay fix for admin-fe See merge request pleroma/pleroma!2902
2020-08-21Merge branch 'features/validators-event' into 'develop'lain
Pipeline Ingestion: Event See merge request pleroma/pleroma!2909
2020-08-21Merge branch 'feature/2071-actor-type' into 'develop'lain
Adding actor type in user show Closes #2071 See merge request pleroma/pleroma!2910
2020-08-21adding actor type in user showAlexander Strizhakov
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-19Merge branch 'features/validators-audio2' into 'develop'lain
Pipeline Ingestion: Audio (Part 2) See merge request pleroma/pleroma!2903
2020-08-19AudioHandlingTest: Make mock explicitlain
2020-08-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/validators-audio2
2020-08-19Merge branch 'fix-arm64' into 'develop'lain
CI: Fix release builds once more. See merge request pleroma/pleroma!2907
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:44:53 +0000