feld [Wed, 18 Nov 2020 21:16:12 +0000 (21:16 +0000)]
Merge branch 'revert-
da4660d2' into 'develop'
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
feld [Wed, 18 Nov 2020 20:32:30 +0000 (20:32 +0000)]
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
This reverts merge request !2955
feld [Wed, 18 Nov 2020 18:57:47 +0000 (18:57 +0000)]
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
lain [Wed, 18 Nov 2020 18:33:48 +0000 (18:33 +0000)]
Merge branch 'fix/webpush-and-emojireact' into 'develop'
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
lain [Wed, 18 Nov 2020 18:27:30 +0000 (18:27 +0000)]
Apply 1 suggestion(s) to 1 file(s)
lain [Wed, 18 Nov 2020 17:51:57 +0000 (17:51 +0000)]
Merge branch 'frontend-admin-api' into 'develop'
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
lain [Wed, 18 Nov 2020 17:32:13 +0000 (18:32 +0100)]
Changelog: Move api info to api heading.
feld [Tue, 17 Nov 2020 23:16:17 +0000 (23:16 +0000)]
Merge branch 'update/admin-fe-
20201117' into 'develop'
Update AdminFE
See merge request pleroma/pleroma!3157
Mark Felder [Tue, 17 Nov 2020 23:01:34 +0000 (17:01 -0600)]
Update AdminFE build to pleroma/admin-fe@
5b38aea2790686647a39f505864331bb9838e20d
Mark Felder [Tue, 17 Nov 2020 22:18:22 +0000 (22:18 +0000)]
Add test for POST when push is disabled
Also group together the tests verifiying failure when disabled
Mark Felder [Tue, 17 Nov 2020 21:37:17 +0000 (21:37 +0000)]
Revert adding extra alert types here
Mark Felder [Tue, 17 Nov 2020 21:34:18 +0000 (21:34 +0000)]
Fix incorrect test description
Mark Felder [Tue, 17 Nov 2020 20:33:30 +0000 (20:33 +0000)]
Credo
Mark Felder [Tue, 17 Nov 2020 20:18:51 +0000 (20:18 +0000)]
Test that we ignore invalid subscription alert types separately.
Mark Felder [Tue, 17 Nov 2020 20:14:38 +0000 (20:14 +0000)]
Ensure all supported push notification subscription alert types are tested
Mark Felder [Tue, 17 Nov 2020 19:51:37 +0000 (19:51 +0000)]
Synchronize reaction notification text with PleromaFE's style
Mark Felder [Tue, 17 Nov 2020 20:21:48 +0000 (20:21 +0000)]
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
Mark Felder [Tue, 17 Nov 2020 19:15:11 +0000 (19:15 +0000)]
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
Mark Felder [Tue, 17 Nov 2020 19:06:30 +0000 (19:06 +0000)]
Spelling
Mark Felder [Tue, 17 Nov 2020 19:05:36 +0000 (19:05 +0000)]
Document the API extensions for push subscriptions
Mark Felder [Tue, 17 Nov 2020 18:33:40 +0000 (18:33 +0000)]
Allow subscribing for pleroma:emoji_reaction push notifications
Mark Felder [Fri, 13 Nov 2020 23:01:53 +0000 (17:01 -0600)]
Add capability for emoji reaction push notifications
lain [Tue, 17 Nov 2020 15:44:20 +0000 (16:44 +0100)]
Docs: Add info about frontend install error response
lain [Tue, 17 Nov 2020 15:43:07 +0000 (16:43 +0100)]
FrontendController: Return error on installation error.
Mark Felder [Tue, 17 Nov 2020 15:28:46 +0000 (15:28 +0000)]
Document fixing the pleroma.user delete_activities mix task
Mark Felder [Tue, 17 Nov 2020 15:15:53 +0000 (15:15 +0000)]
Need to start web_resp cache or mix task fails
feld [Tue, 17 Nov 2020 14:58:33 +0000 (14:58 +0000)]
Merge branch 'remove/fedsockets' into 'develop'
Remove FedSockets
See merge request pleroma/pleroma!3155
rinpatch [Tue, 17 Nov 2020 14:52:08 +0000 (14:52 +0000)]
Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'
Specify the architecture for arm gitlab jobs
See merge request pleroma/pleroma!3139
Egor Kislitsyn [Tue, 17 Nov 2020 14:34:04 +0000 (18:34 +0400)]
Merge branch 'develop' into frontend-admin-api
rinpatch [Tue, 17 Nov 2020 14:28:30 +0000 (17:28 +0300)]
Remove FedSockets
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
lain [Tue, 17 Nov 2020 14:16:53 +0000 (14:16 +0000)]
Merge branch 'chores/note-handling-move' into 'develop'
Chores/note handling move
See merge request pleroma/pleroma!3122
lain [Tue, 17 Nov 2020 14:08:45 +0000 (14:08 +0000)]
Merge branch 'feature/local-only-scope' into 'develop'
Add local-only statuses
Closes #75 and #1483
See merge request pleroma/pleroma!2289
lain [Tue, 17 Nov 2020 14:01:38 +0000 (15:01 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
rinpatch [Tue, 17 Nov 2020 13:24:01 +0000 (13:24 +0000)]
Merge branch 'fix/debian-install-libmagic-typo' into 'develop'
Debian installation guide: fix libmagic header package name
See merge request pleroma/pleroma!3154
rinpatch [Tue, 17 Nov 2020 13:11:37 +0000 (16:11 +0300)]
Debian installation guide: fix libmagic header package name
It's libmagic-dev in both Ubuntu and Debian.
Reported in private by NaiJi.
rinpatch [Tue, 17 Nov 2020 12:55:09 +0000 (12:55 +0000)]
Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'
.gitattributes: Treat js/css/source maps as binary files
See merge request pleroma/pleroma!3153
rinpatch [Tue, 17 Nov 2020 12:42:51 +0000 (12:42 +0000)]
Merge branch 'chores/tesla_1.4.0' into 'develop'
mix.exs: Update tesla to 1.4.0
See merge request pleroma/pleroma!3152
rinpatch [Tue, 17 Nov 2020 12:40:42 +0000 (12:40 +0000)]
Merge branch 'sync-stable/2.2.0' into 'develop'
Import stable commits into develop after releasing 2.2.0
Closes #2275, #1516, #2257, #2242, #1668, and #2236
See merge request pleroma/pleroma!3151
rinpatch [Tue, 17 Nov 2020 12:38:28 +0000 (15:38 +0300)]
.gitattributes: Treat js/css/source maps as binary files
This prevents `git grep` from showing the matching line and diffs from
being shown by default.
rinpatch [Tue, 17 Nov 2020 12:21:46 +0000 (15:21 +0300)]
CHANGELOG.md: Use a period after every bullet point for unreleased sections
It has been the de-facto style for a while now, however it is not
enforced, so there were some entries that didn't use it.
rinpatch [Tue, 17 Nov 2020 12:20:57 +0000 (15:20 +0300)]
CHANGELOG.md: Add back an entry for S3 fix
Haelwenn [Tue, 17 Nov 2020 12:16:54 +0000 (12:16 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3127
rinpatch [Tue, 17 Nov 2020 12:14:35 +0000 (15:14 +0300)]
mix.exs: bump development version to 2.2.50 after 2.2.0 release
rinpatch [Tue, 17 Nov 2020 12:10:58 +0000 (15:10 +0300)]
Import stable commits into develop after releasing 2.2.0
Updates the frontend bundle and syncs the changelog.
lain [Tue, 17 Nov 2020 12:11:39 +0000 (13:11 +0100)]
ActivityPubController: Don't return local only objects
Haelwenn (lanodan) Monnier [Tue, 17 Nov 2020 12:09:56 +0000 (13:09 +0100)]
mix.exs: Update tesla to 1.4.0
lain [Tue, 17 Nov 2020 11:42:55 +0000 (12:42 +0100)]
Gitlab CI: Specify image architecture for arm64 images
Guy Sheffer [Tue, 10 Nov 2020 13:39:17 +0000 (13:39 +0000)]
Added translation using Weblate (Hebrew)
lain [Tue, 17 Nov 2020 11:14:50 +0000 (11:14 +0000)]
Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'
Fix S3 uploads with Elixir 1.11
See merge request pleroma/pleroma!3148
lain [Tue, 17 Nov 2020 11:12:20 +0000 (11:12 +0000)]
Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'
Use absolute URLs to thumbnail and background in /api/v1/instance
See merge request pleroma/pleroma!3149
Mark Felder [Mon, 16 Nov 2020 21:29:15 +0000 (21:29 +0000)]
Use absolute URLs to thumbnail and background in /api/v1/instance
Mark Felder [Mon, 16 Nov 2020 19:54:02 +0000 (19:54 +0000)]
Document S3 and Elixir 1.11 compat fix
Mark Felder [Mon, 16 Nov 2020 19:51:44 +0000 (19:51 +0000)]
Fix S3 uploads with Elixir 1.11
Haelwenn [Sat, 14 Nov 2020 21:43:07 +0000 (21:43 +0000)]
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
Haelwenn (lanodan) Monnier [Sat, 14 Nov 2020 21:27:13 +0000 (22:27 +0100)]
pleroma.instance: Fix Exiftool module name
lain [Fri, 13 Nov 2020 15:19:09 +0000 (16:19 +0100)]
Gitlab CI: Change tags bag to arm32
lain [Fri, 13 Nov 2020 13:48:40 +0000 (14:48 +0100)]
Gitlab CI: Alpine is alpine
lain [Fri, 13 Nov 2020 13:35:47 +0000 (13:35 +0000)]
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
Ilja [Fri, 13 Nov 2020 13:35:46 +0000 (13:35 +0000)]
Make notifs view work for reports
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
lain [Fri, 13 Nov 2020 13:31:46 +0000 (13:31 +0000)]
Merge branch 'docs/otp-tuning' into 'develop'
First draft of tips for optimizing BEAM
See merge request pleroma/pleroma!3123
lain [Fri, 13 Nov 2020 13:23:24 +0000 (14:23 +0100)]
Gitlab CI: Specify arm32v7 image for arm32 builds
rinpatch [Fri, 13 Nov 2020 10:32:16 +0000 (10:32 +0000)]
Merge branch 'fix/oban-in-database-config' into 'develop'
remove PurgeExpiredActivity from Oban db config
See merge request pleroma/pleroma!3137
Alexander Strizhakov [Fri, 13 Nov 2020 06:07:08 +0000 (09:07 +0300)]
remove PurgeExpiredActivity from Oban db config
feld [Thu, 12 Nov 2020 22:41:00 +0000 (22:41 +0000)]
Merge branch 'majic-dep' into 'develop'
Install file-dev in Dockerfile build stage
See merge request pleroma/pleroma!3135
Michael Walker [Thu, 12 Nov 2020 22:20:17 +0000 (22:20 +0000)]
Install file-dev in Dockerfile build stage
This is required by the majic, added in #2534.
rinpatch [Thu, 12 Nov 2020 12:34:48 +0000 (12:34 +0000)]
Merge branch 'release/2.2.0' into 'stable'
Release/2.2.0
See merge request pleroma/secteam/pleroma!19
rinpatch [Wed, 28 Oct 2020 15:08:23 +0000 (18:08 +0300)]
Fix object spoofing vulnerability in attachments
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects.
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
Haelwenn [Thu, 12 Nov 2020 08:50:26 +0000 (08:50 +0000)]
Merge branch 'title-injection-change' into 'develop'
Title injection change
See merge request pleroma/pleroma!3132
feld [Wed, 11 Nov 2020 22:37:16 +0000 (22:37 +0000)]
Merge branch 'feature/ingest-blurhash' into 'develop'
Ingest blurhash for attachments if they were federated
Closes #2294
See merge request pleroma/pleroma!3133
Mark Felder [Wed, 11 Nov 2020 22:17:35 +0000 (16:17 -0600)]
Fix tests for other attachment types
rinpatch [Wed, 11 Nov 2020 20:28:15 +0000 (23:28 +0300)]
rinpatch [Wed, 11 Nov 2020 20:12:52 +0000 (23:12 +0300)]
Polish the changelog a bit and specify release date
Mark Felder [Wed, 11 Nov 2020 19:39:02 +0000 (13:39 -0600)]
Ingest blurhash field during transmogrification
Mark Felder [Wed, 11 Nov 2020 18:51:13 +0000 (12:51 -0600)]
Render blurhashes in Mastodon API
Mark Felder [Wed, 11 Nov 2020 18:27:51 +0000 (12:27 -0600)]
Ingest blurhash for attachments if they were federated
Egor Kislitsyn [Wed, 11 Nov 2020 16:42:05 +0000 (20:42 +0400)]
Fix markdown
Egor Kislitsyn [Wed, 11 Nov 2020 16:39:57 +0000 (20:39 +0400)]
Change endpoint path
lain [Wed, 11 Nov 2020 16:19:09 +0000 (17:19 +0100)]
Changelog: Add info about title injection
lain [Wed, 11 Nov 2020 16:17:41 +0000 (17:17 +0100)]
Bundled FE: Remove title tag
feld [Wed, 11 Nov 2020 16:15:57 +0000 (16:15 +0000)]
Merge branch 'mrf-config-descriptions' into 'develop'
little changes for MRF config descriptions
See merge request pleroma/pleroma!3131
Egor Kislitsyn [Wed, 11 Nov 2020 16:12:35 +0000 (20:12 +0400)]
Remove FrontendInstallerWorker
lain [Wed, 11 Nov 2020 16:10:59 +0000 (17:10 +0100)]
RedirectController: Don't replace title, but inject into the meta
Egor Kislitsyn [Wed, 11 Nov 2020 15:53:40 +0000 (19:53 +0400)]
Merge branch 'develop' into frontend-admin-api
Alexander Strizhakov [Wed, 11 Nov 2020 15:49:15 +0000 (18:49 +0300)]
little changes for MRF config descriptions
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
Egor Kislitsyn [Wed, 11 Nov 2020 15:12:46 +0000 (19:12 +0400)]
Fix formatting
Egor Kislitsyn [Wed, 11 Nov 2020 14:47:57 +0000 (18:47 +0400)]
Add `local` visibility
feld [Wed, 11 Nov 2020 13:48:03 +0000 (13:48 +0000)]
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
Alexander Strizhakov [Sat, 19 Sep 2020 18:25:01 +0000 (21:25 +0300)]
changes after rebase
Alexander Strizhakov [Wed, 11 Nov 2020 07:48:03 +0000 (10:48 +0300)]
making credo happy and test fix
Alexander Strizhakov [Wed, 11 Nov 2020 07:10:57 +0000 (10:10 +0300)]
fix for adminFE
- revert UserAllowPolicy description
- MRF descriptions order
feld [Tue, 10 Nov 2020 16:44:23 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:17 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:08 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:00 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Alexander Strizhakov [Tue, 10 Nov 2020 16:18:53 +0000 (19:18 +0300)]
config descriptions for custom MRF policies
lain [Tue, 10 Nov 2020 11:04:19 +0000 (11:04 +0000)]
Merge branch '2260-wrong-report-link' into 'develop'
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
lain [Tue, 10 Nov 2020 10:05:15 +0000 (10:05 +0000)]
Merge branch 'fix/html-title-load' into 'develop'
Fix title on load of Pleroma HTML, fixes #2281
Closes #2281
See merge request pleroma/pleroma!3125
lain [Tue, 10 Nov 2020 09:34:13 +0000 (09:34 +0000)]
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
Escaping in xml templates
Closes #2291
See merge request pleroma/pleroma!3126
Alexander Strizhakov [Tue, 10 Nov 2020 07:44:22 +0000 (10:44 +0300)]
escaping summary and other fields in xml templates
Haelwenn [Mon, 9 Nov 2020 09:14:41 +0000 (09:14 +0000)]
Merge branch 'remove/release-env' into 'develop'
Remove release_env
See merge request pleroma/pleroma!3124
projects / akkoma / log