rinpatch [Thu, 17 Sep 2020 19:09:10 +0000 (19:09 +0000)]
Merge branch 'release/2.1.2' into 'stable'
Release/2.1.2
See merge request pleroma/secteam/pleroma!17
rinpatch [Thu, 17 Sep 2020 18:00:13 +0000 (21:00 +0300)]
rinpatch [Thu, 17 Sep 2020 17:40:52 +0000 (20:40 +0300)]
CHANGELOG.md: Add 2.1.2 entry
rinpatch [Thu, 17 Sep 2020 16:54:41 +0000 (19:54 +0300)]
mix.exs: bump version to 2.1.2
rinpatch [Thu, 10 Sep 2020 18:38:48 +0000 (18:38 +0000)]
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
[#2130] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
rinpatch [Thu, 10 Sep 2020 18:40:54 +0000 (18:40 +0000)]
Merge branch 'fix/streaming-termination-errors' into 'develop'
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
Haelwenn [Tue, 15 Sep 2020 08:25:10 +0000 (08:25 +0000)]
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
lain [Tue, 15 Sep 2020 12:21:38 +0000 (12:21 +0000)]
Merge branch 'reply-visibility-user-guard' into 'develop'
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
rinpatch [Thu, 17 Sep 2020 12:13:36 +0000 (12:13 +0000)]
Merge branch 'bugfix/mrf-ingestion' into 'develop'
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
rinpatch [Mon, 14 Sep 2020 12:48:27 +0000 (12:48 +0000)]
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
rinpatch [Mon, 14 Sep 2020 12:38:00 +0000 (12:38 +0000)]
Merge branch 'feat/rich-media-head' into 'develop'
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
rinpatch [Tue, 8 Sep 2020 17:21:12 +0000 (17:21 +0000)]
Merge branch 'release/2.1.1' into 'stable'
2.1.1 release
See merge request pleroma/secteam/pleroma!13
Haelwenn [Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)]
Merge branch 'bugfix/mock' into 'develop'
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
rinpatch [Tue, 8 Sep 2020 12:34:20 +0000 (15:34 +0300)]
rinpatch [Mon, 7 Sep 2020 12:47:43 +0000 (12:47 +0000)]
Merge branch 'temp-hackney-fix' into 'develop'
temp hackney fix
See merge request pleroma/pleroma!2951
rinpatch [Tue, 8 Sep 2020 12:21:33 +0000 (12:21 +0000)]
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
rinpatch [Tue, 8 Sep 2020 11:21:34 +0000 (14:21 +0300)]
CHANGELOG.md: Add 2.1.1 entry
rinpatch [Tue, 8 Sep 2020 12:08:51 +0000 (15:08 +0300)]
mix.exs: bump version to 2.1.1
rinpatch [Tue, 8 Sep 2020 12:06:53 +0000 (15:06 +0300)]
Disable favicon scraping in tests
rinpatch [Mon, 7 Sep 2020 11:38:15 +0000 (11:38 +0000)]
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
lain [Mon, 7 Sep 2020 10:19:19 +0000 (10:19 +0000)]
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
lain [Fri, 4 Sep 2020 18:19:23 +0000 (18:19 +0000)]
Merge branch 'develop' into 'develop'
Added cmake
See merge request pleroma/pleroma!2953
rinpatch [Fri, 4 Sep 2020 07:17:10 +0000 (07:17 +0000)]
Merge branch 'chore/fast_html-bump' into 'develop'
mix.lock: Bump fast_html
See merge request pleroma/pleroma!2950
rinpatch [Mon, 7 Sep 2020 11:12:30 +0000 (11:12 +0000)]
Merge branch 'bugfix/favicon-too-long' into 'develop'
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
feld [Wed, 2 Sep 2020 17:11:24 +0000 (17:11 +0000)]
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
rinpatch [Mon, 31 Aug 2020 07:22:35 +0000 (07:22 +0000)]
Merge branch 'chore/fast-sanitize-bump' into 'develop'
mix.lock: bump fast_sanitize
See merge request pleroma/pleroma!2932
rinpatch [Wed, 2 Sep 2020 09:36:56 +0000 (09:36 +0000)]
Merge branch 'http-fixes' into 'develop'
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
rinpatch [Wed, 2 Sep 2020 13:46:11 +0000 (13:46 +0000)]
Merge branch 'feat/rich-media-improvements' into 'develop'
Rich media improvements
See merge request pleroma/pleroma!2944
rinpatch [Wed, 2 Sep 2020 09:38:43 +0000 (09:38 +0000)]
Merge branch 'fix/2047-rich-media-parser' into 'develop'
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
rinpatch [Tue, 8 Sep 2020 09:49:27 +0000 (09:49 +0000)]
Merge branch 'fix/2087-metadata' into 'develop'
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
rinpatch [Tue, 8 Sep 2020 09:47:16 +0000 (09:47 +0000)]
Merge branch 'secfix/search-crash' into 'develop'
Fix crash done via search
See merge request pleroma/secteam/pleroma!12
rinpatch [Wed, 2 Sep 2020 06:55:58 +0000 (06:55 +0000)]
Merge branch 'fix-searching-following' into 'develop'
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
rinpatch [Mon, 7 Sep 2020 16:38:16 +0000 (16:38 +0000)]
Merge branch 'fix/apc2s-limits' into 'develop'
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
lain [Fri, 28 Aug 2020 12:17:19 +0000 (12:17 +0000)]
Merge branch 'release/2.1.0' into 'stable'
Release/2.1.0
See merge request pleroma/pleroma!2927
lain [Fri, 28 Aug 2020 09:34:48 +0000 (11:34 +0200)]
Mix: Update version
lain [Fri, 28 Aug 2020 09:33:11 +0000 (11:33 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
Haelwenn [Thu, 27 Aug 2020 17:05:53 +0000 (17:05 +0000)]
Merge branch '2078-list-fixes' into 'develop'
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
lain [Thu, 27 Aug 2020 13:38:03 +0000 (15:38 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
lain [Thu, 27 Aug 2020 11:18:42 +0000 (11:18 +0000)]
Merge branch '2081-deleted-user-chats' into 'develop'
ChatController: Don't die if the recipient is gone.
Closes #2081
See merge request pleroma/pleroma!2926
lain [Thu, 27 Aug 2020 10:13:18 +0000 (12:13 +0200)]
ChatController: Don't die if the recipient is gone.
rinpatch [Thu, 27 Aug 2020 04:11:34 +0000 (04:11 +0000)]
Merge branch 'update/admin-fe-
20200826' into 'develop'
Update AdminFE build in preparation for 2.1.0 release
See merge request pleroma/pleroma!2925
Mark Felder [Wed, 26 Aug 2020 20:43:34 +0000 (15:43 -0500)]
Update AdminFE build in preparation for 2.1.0 release
lain [Wed, 26 Aug 2020 13:58:49 +0000 (15:58 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
rinpatch [Wed, 26 Aug 2020 13:49:52 +0000 (13:49 +0000)]
Merge branch 'fix/fast_html-build-errors' into 'develop'
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
See merge request pleroma/pleroma!2922
lain [Wed, 26 Aug 2020 13:40:00 +0000 (15:40 +0200)]
Changelog: Add info about list fixes.
lain [Wed, 26 Aug 2020 13:37:30 +0000 (15:37 +0200)]
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
rinpatch [Wed, 26 Aug 2020 13:31:02 +0000 (16:31 +0300)]
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
rinpatch [Wed, 26 Aug 2020 13:11:17 +0000 (13:11 +0000)]
Merge branch '2079-welcome-message-docs' into 'develop'
Cheatsheet: Remove misleading example
Closes #2079
See merge request pleroma/pleroma!2921
lain [Wed, 26 Aug 2020 11:53:16 +0000 (13:53 +0200)]
Cheatsheet: Remove misleading example
lain [Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
lain [Wed, 26 Aug 2020 05:50:41 +0000 (05:50 +0000)]
Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'
release MR template: add a note about merging stable changes back to develop
See merge request pleroma/pleroma!2920
rinpatch [Wed, 26 Aug 2020 04:08:02 +0000 (07:08 +0300)]
release MR template: add a note about merging stable changes back to
develop
Haelwenn [Tue, 25 Aug 2020 22:27:19 +0000 (22:27 +0000)]
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
Add multiarch support to docker container, fixes pleroma/pleroma-docker-compose#2
Closes pleroma-docker-compose#2
See merge request pleroma/pleroma!2789
feld [Tue, 25 Aug 2020 21:32:32 +0000 (21:32 +0000)]
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
Haelwenn [Tue, 25 Aug 2020 20:01:43 +0000 (20:01 +0000)]
Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'
Webfinger: Handle bogus ids better.
Closes #2077
See merge request pleroma/pleroma!2919
lain [Tue, 25 Aug 2020 15:35:59 +0000 (17:35 +0200)]
Webfinger: Handle bogus ids better.
lain [Tue, 25 Aug 2020 14:07:07 +0000 (16:07 +0200)]
Mix: Make rc version explicit.
lain [Tue, 25 Aug 2020 13:16:20 +0000 (15:16 +0200)]
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
lain [Tue, 25 Aug 2020 10:34:09 +0000 (10:34 +0000)]
Merge branch 'frontend-bundles-downloads' into 'develop'
frontend install mix tasks
See merge request pleroma/pleroma!2841
lain [Tue, 25 Aug 2020 09:49:44 +0000 (11:49 +0200)]
Description: Update description.
lain [Tue, 25 Aug 2020 09:44:51 +0000 (11:44 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
lain [Tue, 25 Aug 2020 07:41:25 +0000 (07:41 +0000)]
Merge branch 'docs/update-clients' into 'develop'
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
See merge request pleroma/pleroma!2914
Haelwenn (lanodan) Monnier [Mon, 24 Aug 2020 21:13:35 +0000 (23:13 +0200)]
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
feld [Mon, 24 Aug 2020 20:41:33 +0000 (20:41 +0000)]
Merge branch 'feature/add-preload-to-description' into 'develop'
Add Pleroma.Web.Preload to description.exs
See merge request pleroma/pleroma!2913
Angelina Filippova [Mon, 24 Aug 2020 19:43:37 +0000 (22:43 +0300)]
Add Pleroma.Web.Preload to description.exs
feld [Mon, 24 Aug 2020 17:03:18 +0000 (17:03 +0000)]
Merge branch 'relay-fix-admin-fe' into 'develop'
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
lain [Fri, 21 Aug 2020 16:10:30 +0000 (16:10 +0000)]
Merge branch 'features/validators-event' into 'develop'
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
lain [Fri, 21 Aug 2020 08:36:56 +0000 (08:36 +0000)]
Merge branch 'feature/2071-actor-type' into 'develop'
Adding actor type in user show
Closes #2071
See merge request pleroma/pleroma!2910
Alexander Strizhakov [Fri, 21 Aug 2020 07:38:56 +0000 (10:38 +0300)]
adding actor type in user show
Haelwenn (lanodan) Monnier [Thu, 20 Aug 2020 16:41:42 +0000 (18:41 +0200)]
Pipeline Ingestion: Event
lain [Wed, 19 Aug 2020 12:59:41 +0000 (12:59 +0000)]
Merge branch 'features/validators-audio2' into 'develop'
Pipeline Ingestion: Audio (Part 2)
See merge request pleroma/pleroma!2903
lain [Wed, 19 Aug 2020 12:36:42 +0000 (14:36 +0200)]
AudioHandlingTest: Make mock explicit
lain [Wed, 19 Aug 2020 12:10:11 +0000 (14:10 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
lain [Wed, 19 Aug 2020 11:41:00 +0000 (11:41 +0000)]
Merge branch 'fix-arm64' into 'develop'
CI: Fix release builds once more.
See merge request pleroma/pleroma!2907
lain [Wed, 19 Aug 2020 11:37:33 +0000 (13:37 +0200)]
CI: Fix release builds once more.
lain [Wed, 19 Aug 2020 10:56:07 +0000 (10:56 +0000)]
Merge branch 'email-tests' into 'develop'
Fix for sometimes failing email tests
See merge request pleroma/pleroma!2906
Alexander Strizhakov [Wed, 19 Aug 2020 09:57:29 +0000 (12:57 +0300)]
fix for sometimes failing tests
lain [Wed, 19 Aug 2020 09:48:40 +0000 (09:48 +0000)]
Merge branch 'mix-task-fixes' into 'develop'
Fixes for mix tasks
See merge request pleroma/pleroma!2905
Alexander Strizhakov [Wed, 19 Aug 2020 08:06:03 +0000 (11:06 +0300)]
fixes for mix tasks
- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task
Alexander Strizhakov [Wed, 19 Aug 2020 05:55:03 +0000 (08:55 +0300)]
additional changelog entry
Alexander Strizhakov [Wed, 19 Aug 2020 05:40:26 +0000 (08:40 +0300)]
changelog entry
Alexander Strizhakov [Tue, 18 Aug 2020 15:21:34 +0000 (18:21 +0300)]
relay fix for admin-fe
Haelwenn (lanodan) Monnier [Tue, 18 Aug 2020 22:05:48 +0000 (00:05 +0200)]
Pipeline Ingestion: Audio (Part 2)
Haelwenn [Tue, 18 Aug 2020 19:02:33 +0000 (19:02 +0000)]
Merge branch '2064-image-blanking' into 'develop'
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
feld [Tue, 18 Aug 2020 15:57:43 +0000 (15:57 +0000)]
Merge branch 'improve/freebsd-rc-script' into 'develop'
Improve FreeBSD rc script
See merge request pleroma/pleroma!2901
Mark Felder [Tue, 18 Aug 2020 15:24:34 +0000 (10:24 -0500)]
Improve FreeBSD rc script
Passes rclint now, $HOME is dynamic, and properly matches process name for signalling shutdown.
lain [Tue, 18 Aug 2020 12:56:28 +0000 (12:56 +0000)]
Merge branch 'freebsd-docs' into 'develop'
FreeBSD installation process
See merge request pleroma/pleroma!2887
lain [Tue, 18 Aug 2020 12:56:07 +0000 (12:56 +0000)]
Merge branch 'chore/improve-descriptions' into 'develop'
Improve description for mediaproxy cache invalidation settings
See merge request pleroma/pleroma!2891
lain [Tue, 18 Aug 2020 12:37:35 +0000 (14:37 +0200)]
Test config: Default to filename for descriptions
lain [Tue, 18 Aug 2020 12:27:45 +0000 (12:27 +0000)]
Merge branch 'features/validators-audio' into 'develop'
Pipeline Ingestion: Audio
See merge request pleroma/pleroma!2897
lain [Tue, 18 Aug 2020 11:37:28 +0000 (13:37 +0200)]
Transmogrifier Test: Extract audio tests.
lain [Tue, 18 Aug 2020 11:31:42 +0000 (13:31 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
lain [Tue, 18 Aug 2020 11:31:13 +0000 (11:31 +0000)]
Merge branch 'purge-user' into 'develop'
Purge a local user upon deletion, fixes #2062
Closes #2062
See merge request pleroma/pleroma!2898
lain [Tue, 18 Aug 2020 11:24:39 +0000 (13:24 +0200)]
Changelog: Add info about upload description changes
lain [Tue, 18 Aug 2020 11:22:00 +0000 (13:22 +0200)]
Cheatsheet: Add information about filename descriptions
lain [Tue, 18 Aug 2020 11:21:30 +0000 (13:21 +0200)]
Pleroma.Upload: Set default upload name / description based on config.
lain [Tue, 18 Aug 2020 11:01:38 +0000 (11:01 +0000)]
Merge branch 'features/validators_use_ectotypes' into 'develop'
object_validators: Use ecto_types where available
See merge request pleroma/pleroma!2896
lain [Tue, 18 Aug 2020 10:38:13 +0000 (12:38 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
Alex Gleason [Tue, 18 Aug 2020 05:24:28 +0000 (00:24 -0500)]
Test that `POST /api/pleroma/delete_account` purges the user
Alex Gleason [Tue, 18 Aug 2020 05:10:09 +0000 (00:10 -0500)]
Test purging a user with User.delete/1
projects / akkoma / log