rinpatch [Tue, 19 Jan 2021 09:59:24 +0000 (12:59 +0300)]
Merge branch 'stable' into mergeback/2.2.2
Haelwenn [Tue, 19 Jan 2021 02:34:27 +0000 (02:34 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3262
João Rodrigues [Mon, 18 Jan 2021 17:19:16 +0000 (17:19 +0000)]
Translated using Weblate (Portuguese (Portugal))
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pt_PT/
João Rodrigues [Mon, 18 Jan 2021 17:19:01 +0000 (17:19 +0000)]
Added translation using Weblate (Portuguese (Portugal))
feld [Mon, 18 Jan 2021 21:19:14 +0000 (21:19 +0000)]
Merge branch 'fix/reblog-api' into 'develop'
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
feld [Mon, 18 Jan 2021 19:58:30 +0000 (19:58 +0000)]
Merge branch 'refactor/approval_pending_user_field' into 'develop'
Change user.approval_pending field to user.is_approved
See merge request pleroma/pleroma!3090
Mark Felder [Mon, 18 Jan 2021 19:44:59 +0000 (13:44 -0600)]
Mark Felder [Mon, 18 Jan 2021 18:07:37 +0000 (12:07 -0600)]
Document new is_approved attribute
Mark Felder [Mon, 18 Jan 2021 18:05:05 +0000 (12:05 -0600)]
Merge branch 'develop' into refactor/approval_pending_user_field
feld [Mon, 18 Jan 2021 17:54:42 +0000 (17:54 +0000)]
Merge branch 'refactor/confirmation_pending_user_field' into 'develop'
Change user.confirmation_pending field to user.is_confirmed
See merge request pleroma/pleroma!3081
Mark Felder [Mon, 18 Jan 2021 17:31:07 +0000 (11:31 -0600)]
Document new is_confirmed attribute
Mark Felder [Mon, 18 Jan 2021 17:30:06 +0000 (11:30 -0600)]
Keep *Breaking* at the top
Mark Felder [Mon, 18 Jan 2021 17:25:13 +0000 (11:25 -0600)]
Egor Kislitsyn [Mon, 18 Jan 2021 17:01:00 +0000 (21:01 +0400)]
Test that only author can reblog a private status
Egor Kislitsyn [Mon, 18 Jan 2021 16:15:57 +0000 (20:15 +0400)]
Fix Reblog API
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
rinpatch [Mon, 18 Jan 2021 14:33:28 +0000 (14:33 +0000)]
Merge branch 'release/2.2.2' into 'stable'
Release/2.2.2
See merge request pleroma/pleroma!3216
rinpatch [Mon, 18 Jan 2021 14:04:06 +0000 (17:04 +0300)]
rinpatch [Mon, 18 Jan 2021 12:35:15 +0000 (15:35 +0300)]
mix.exs: bump version to 2.2.2
rinpatch [Mon, 18 Jan 2021 13:20:36 +0000 (16:20 +0300)]
CHANGELOG.md: Finalize 2.2.2 changelog
lain [Fri, 8 Jan 2021 13:10:49 +0000 (13:10 +0000)]
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
lain [Sun, 17 Jan 2021 13:11:28 +0000 (13:11 +0000)]
Merge branch 'fix/changelog-entries' into 'develop'
CHANGELOG.md: Remove wrong entries from Unreleased(patch)
See merge request pleroma/pleroma!3258
rinpatch [Sun, 17 Jan 2021 12:55:33 +0000 (15:55 +0300)]
CHANGELOG.md: Remove wrong entries from Unreleased(patch)
Webpush changes are under 2.3.0 milestone and therefore should be
under Unreleased section
The emoji reaction change was introduced in 2.2.1
Alexander Strizhakov [Tue, 22 Dec 2020 14:42:23 +0000 (17:42 +0300)]
update for retired elixir_make package version
feld [Fri, 15 Jan 2021 21:01:16 +0000 (21:01 +0000)]
Merge branch 'fix/attachment-cleanup-queues' into 'develop'
Only run one attachment cleanup job per node
See merge request pleroma/pleroma!3255
Mark Felder [Fri, 15 Jan 2021 20:50:32 +0000 (14:50 -0600)]
Only run one attachment cleanup job per node
The previous limit of 5 was probably causing massing performance issues due to concurrent full table scans.
Mark Felder [Fri, 15 Jan 2021 19:40:30 +0000 (13:40 -0600)]
Revert accidental blank line removal
Mark Felder [Tue, 13 Oct 2020 21:10:00 +0000 (16:10 -0500)]
Document removal of toggle_confirmed
Mark Felder [Tue, 13 Oct 2020 21:07:36 +0000 (16:07 -0500)]
Remove toggle_confirmation; require explicit state change
Also cosmetic changes to make the code clearer
Mark Felder [Tue, 13 Oct 2020 19:29:34 +0000 (14:29 -0500)]
Change user.confirmation_pending field to user.is_confirmed
Mark Felder [Fri, 16 Oct 2020 21:50:44 +0000 (21:50 +0000)]
Further simplify changeset logic
Mark Felder [Fri, 16 Oct 2020 21:44:25 +0000 (21:44 +0000)]
Change user.approval_pending field to user.is_approved
Haelwenn [Fri, 15 Jan 2021 04:44:58 +0000 (04:44 +0000)]
Merge branch 'optimize-command_available' into 'develop'
Optimize Pleroma.Utils.command_available?/1
See merge request pleroma/pleroma!3254
Mark Felder [Thu, 14 Jan 2021 22:58:18 +0000 (16:58 -0600)]
Just validate command is in PATH; forking a shell is wasteful
rinpatch [Thu, 14 Jan 2021 18:29:25 +0000 (18:29 +0000)]
Merge branch 'pleroma-password' into 'develop'
Add password module
See merge request pleroma/pleroma!3253
Lain Soykaf [Thu, 14 Jan 2021 15:01:14 +0000 (16:01 +0100)]
Linting.
Lain Soykaf [Thu, 14 Jan 2021 14:06:16 +0000 (15:06 +0100)]
Pbkdf2: Use it everywhere.
Lain Soykaf [Thu, 14 Jan 2021 13:49:39 +0000 (14:49 +0100)]
Password -> Password.Pbkdf2
Lain Soykaf [Wed, 13 Jan 2021 15:00:12 +0000 (16:00 +0100)]
Linting
lain [Wed, 13 Jan 2021 14:11:11 +0000 (15:11 +0100)]
Password: Replace Pbkdf2 with Password.
lain [Wed, 13 Jan 2021 14:09:01 +0000 (15:09 +0100)]
Password: Add password module
Replaces Pbkdf2.
Haelwenn [Wed, 13 Jan 2021 06:55:12 +0000 (06:55 +0000)]
Merge branch 'chores/bump-copyright' into 'develop'
Bump Copyright to 2021
See merge request pleroma/pleroma!3252
Haelwenn (lanodan) Monnier [Wed, 13 Jan 2021 06:53:44 +0000 (07:53 +0100)]
COPYING: Bump copyright to 2021
Haelwenn (lanodan) Monnier [Wed, 13 Jan 2021 06:49:20 +0000 (07:49 +0100)]
Bump Copyright to 2021
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
feld [Tue, 12 Jan 2021 20:54:30 +0000 (20:54 +0000)]
Merge branch 'fix/backup-url-on-s3' into 'develop'
Standardize base url for uploads
See merge request pleroma/pleroma!3246
rinpatch [Tue, 12 Jan 2021 19:30:44 +0000 (19:30 +0000)]
Merge branch 'chat-message-pagination' into 'develop'
ChatMessages: Fix pagination headers.
See merge request pleroma/pleroma!3250
lain [Tue, 12 Jan 2021 11:59:50 +0000 (12:59 +0100)]
Pagination: Don't be dos'd by random parameters.
Mark Felder [Mon, 11 Jan 2021 20:19:14 +0000 (14:19 -0600)]
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
Mark Felder [Mon, 11 Jan 2021 20:01:31 +0000 (14:01 -0600)]
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
lain [Mon, 11 Jan 2021 14:30:40 +0000 (15:30 +0100)]
ChatMessages: Fix pagination headers.
They used to contain the path parameter `id` as query param,
which would break the link.
Mark Felder [Sun, 10 Jan 2021 15:03:42 +0000 (09:03 -0600)]
Formatting
rinpatch [Sun, 10 Jan 2021 08:40:13 +0000 (08:40 +0000)]
Merge branch 'feat/format-optional-migrations' into 'develop'
.formatter.exs: Format optional migrations
See merge request pleroma/pleroma!3249
rinpatch [Sun, 10 Jan 2021 08:28:41 +0000 (11:28 +0300)]
.formatter.exs: Format optional migrations
(There are no changes to optional migrations since they were manually
formatted in https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3207)
rinpatch [Sun, 10 Jan 2021 08:25:36 +0000 (08:25 +0000)]
Merge branch 'add_some_information_about_setting_up_a_development_environment' into 'develop'
Add some information about setting up a development environment
Closes #1904
See merge request pleroma/pleroma!3207
Ilja [Sun, 10 Jan 2021 08:25:36 +0000 (08:25 +0000)]
Add development section
* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
* index.md
* authentication_authorization.md
* mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md
feld [Sun, 10 Jan 2021 01:34:54 +0000 (01:34 +0000)]
Apply 4 suggestion(s) to 2 file(s)
Mark Felder [Fri, 8 Jan 2021 23:24:19 +0000 (17:24 -0600)]
Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0
Now we should have a correct base URL for S3 hosted objects throughout the codebase.
Mark Felder [Fri, 8 Jan 2021 23:05:55 +0000 (17:05 -0600)]
More places we should be using Upload.base_url
Mark Felder [Fri, 8 Jan 2021 22:43:19 +0000 (16:43 -0600)]
Avoid duplicate Config calls
Mark Felder [Fri, 8 Jan 2021 16:49:12 +0000 (10:49 -0600)]
Apply Upload.base_url for S3
Mark Felder [Fri, 8 Jan 2021 00:34:30 +0000 (18:34 -0600)]
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
lain [Fri, 8 Jan 2021 15:55:48 +0000 (15:55 +0000)]
Merge branch 'guppe-example' into 'develop'
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
lain [Fri, 8 Jan 2021 15:36:42 +0000 (15:36 +0000)]
Merge branch 'confirm-users' into 'develop'
Automatically confirm logged-in users
See merge request pleroma/pleroma!3234
Alex Gleason [Fri, 8 Jan 2021 13:48:19 +0000 (07:48 -0600)]
Merge remote-tracking branch 'upstream/develop' into confirm-users
Alex Gleason [Fri, 8 Jan 2021 13:47:55 +0000 (07:47 -0600)]
Remove ConfirmUserPlug
lain [Fri, 8 Jan 2021 13:10:49 +0000 (13:10 +0000)]
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
lain [Thu, 7 Jan 2021 19:16:58 +0000 (19:16 +0000)]
Merge branch 'backup-ids' into 'develop'
Backups: render ID in API
See merge request pleroma/pleroma!3245
Alex Gleason [Thu, 7 Jan 2021 19:06:22 +0000 (13:06 -0600)]
Backups: render ID in API
lain [Thu, 7 Jan 2021 16:25:39 +0000 (16:25 +0000)]
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236
lain [Thu, 7 Jan 2021 15:20:30 +0000 (16:20 +0100)]
ActivtityPub Test: Add example for guppe actor
lain [Thu, 7 Jan 2021 11:09:18 +0000 (11:09 +0000)]
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
lain [Thu, 7 Jan 2021 10:08:02 +0000 (10:08 +0000)]
Merge branch 'adminapi-user-email' into 'develop'
AdminAPI: return user email
See merge request pleroma/pleroma!3240
lain [Thu, 7 Jan 2021 10:06:39 +0000 (10:06 +0000)]
Merge branch 'upstream/remote-emoji-support' into 'develop'
Upstream external emoji support
See merge request pleroma/pleroma!3238
Alex Gleason [Wed, 6 Jan 2021 21:15:47 +0000 (15:15 -0600)]
Call ConfirmUserPlug from Router, not Endpoint
Alex Gleason [Wed, 6 Jan 2021 17:43:07 +0000 (11:43 -0600)]
Add AdminAPI.AccountViewTest
Alex Gleason [Wed, 6 Jan 2021 17:30:32 +0000 (11:30 -0600)]
AdminAPI: return user email
Roger Braun [Wed, 6 Feb 2019 17:05:34 +0000 (18:05 +0100)]
allow external emoji
feld [Tue, 5 Jan 2021 21:16:33 +0000 (21:16 +0000)]
Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'
Fix proxy and mediaproxy description.exs
See merge request pleroma/pleroma!3219
Mark Felder [Tue, 5 Jan 2021 21:06:00 +0000 (15:06 -0600)]
Remove configurability of upload proxy opts, simplify
lain [Tue, 5 Jan 2021 20:09:29 +0000 (20:09 +0000)]
Merge branch 'fix/emoji-encoding' into 'develop'
URI.encode custom emojis
Closes #2381
See merge request pleroma/pleroma!3235
Mark Felder [Tue, 5 Jan 2021 19:58:49 +0000 (13:58 -0600)]
Add test to validate URLs to custom emojis are properly encoded
Mark Felder [Tue, 5 Jan 2021 19:25:14 +0000 (13:25 -0600)]
Add dinosaur gif from https://gifs.cc
"Our animations are free to be used to enhance your website."
Mark Felder [Tue, 5 Jan 2021 18:25:30 +0000 (12:25 -0600)]
URI.encode custom emojis
lain [Tue, 5 Jan 2021 12:40:45 +0000 (12:40 +0000)]
Merge branch 'fix/pagination-regression' into 'develop'
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
lain [Tue, 5 Jan 2021 12:33:57 +0000 (13:33 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
lain [Tue, 5 Jan 2021 12:31:33 +0000 (12:31 +0000)]
Merge branch '1526-account-aliases' into 'develop'
Resolve "account move from mastodon to pleroma"
Closes #1526
See merge request pleroma/pleroma!3233
lain [Tue, 5 Jan 2021 12:10:14 +0000 (13:10 +0100)]
User: Use ObjectID type to validate also-known-as field
lain [Tue, 5 Jan 2021 11:42:30 +0000 (12:42 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
lain [Tue, 5 Jan 2021 11:36:57 +0000 (11:36 +0000)]
Merge branch 'pleroma-moderation-log-stuff' into 'develop'
AdminAPI: return id for moderation log entries
See merge request pleroma/pleroma!3232
lain [Tue, 5 Jan 2021 11:19:39 +0000 (12:19 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
lain [Tue, 5 Jan 2021 10:48:40 +0000 (11:48 +0100)]
AccountControllerTest: Fix test logic
lain [Tue, 5 Jan 2021 09:48:32 +0000 (10:48 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
Haelwenn [Tue, 5 Jan 2021 00:01:44 +0000 (00:01 +0000)]
Merge branch '2391-async-bugs' into 'develop'
SideEffects.DeleteTest: asyncify.
Closes #2391
See merge request pleroma/pleroma!3231
lain [Mon, 4 Jan 2021 17:40:59 +0000 (18:40 +0100)]
SideEffects.DeleteTest: asyncify.
Replace Mock with Mox, mock out Logger.
Mark Felder [Mon, 4 Jan 2021 17:04:58 +0000 (11:04 -0600)]
Add test to validate profile pagination works with keyset
Mark Felder [Mon, 4 Jan 2021 16:13:17 +0000 (10:13 -0600)]
Do not try to guess which pagination we need by the existence of an :offset param.
Require explicit request to get offset pagination.
lain [Mon, 4 Jan 2021 12:38:31 +0000 (13:38 +0100)]
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
Alex Gleason [Fri, 1 Jan 2021 17:58:42 +0000 (11:58 -0600)]
AdminAPI: return id for moderation log entries
Alex Gleason [Thu, 31 Dec 2020 20:04:51 +0000 (14:04 -0600)]
Migration to confirm previously-logged-in users
feld [Thu, 31 Dec 2020 19:24:49 +0000 (19:24 +0000)]
Merge branch 'fix/reports-ordering' into 'develop'
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
Mark Felder [Thu, 31 Dec 2020 19:15:44 +0000 (13:15 -0600)]
Document reports ordering change
projects / akkoma / log