rinpatch [Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)]
Merge branch 'fix/remove_auto_nsfw' into 'develop'
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
rinpatch [Fri, 19 Mar 2021 08:36:26 +0000 (08:36 +0000)]
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372
Haelwenn [Tue, 16 Mar 2021 01:54:43 +0000 (01:54 +0000)]
Merge branch 'update_open_api_spex' into 'develop'
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
rinpatch [Mon, 15 Mar 2021 09:35:46 +0000 (09:35 +0000)]
Merge branch 'feature/object-hashtags-rework' into 'develop'
Hashtags extraction from objects. Background migration infrastructure.
Closes #1840 and #2455
See merge request pleroma/pleroma!3213
Haelwenn (lanodan) Monnier [Mon, 15 Mar 2021 05:43:12 +0000 (06:43 +0100)]
Add support for actor icon being a list (Bridgy)
Haelwenn [Sun, 14 Mar 2021 08:09:22 +0000 (08:09 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3370
Ben Is [Thu, 11 Mar 2021 13:51:22 +0000 (13:51 +0000)]
Translated using Weblate (Italian)
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
Ivan Tashkinov [Fri, 12 Mar 2021 09:25:18 +0000 (12:25 +0300)]
[#3213] Code formatting fix.
Ivan Tashkinov [Fri, 12 Mar 2021 09:18:11 +0000 (12:18 +0300)]
[#3213] Background migration infrastructure refactoring.
Extracted BaseMigrator and BaseMigratorState.
Ivan Tashkinov [Fri, 12 Mar 2021 05:49:25 +0000 (08:49 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
rinpatch [Thu, 11 Mar 2021 19:14:59 +0000 (19:14 +0000)]
Merge branch 'improve-gitlab-ci' into 'develop'
Execute mix deps.get earlier and avoid duplicate invocations if possible
See merge request pleroma/pleroma!3369
Mark Felder [Thu, 11 Mar 2021 15:40:40 +0000 (09:40 -0600)]
Execute mix deps.get earlier and avoid duplicate invocations if possible
feld [Wed, 10 Mar 2021 23:14:46 +0000 (23:14 +0000)]
Merge branch 'fix/spec-build' into 'develop'
Ensure we fetch deps during spec-build stage
See merge request pleroma/pleroma!3368
Mark Felder [Wed, 10 Mar 2021 22:37:24 +0000 (16:37 -0600)]
Revert "See if switching to same image as releases fixes the build"
This reverts commit
502d166b7e44e36a94974df4770de6c6a239ad75.
Mark Felder [Wed, 10 Mar 2021 22:19:18 +0000 (16:19 -0600)]
See if switching to same image as releases fixes the build
Mark Felder [Wed, 10 Mar 2021 19:03:14 +0000 (13:03 -0600)]
Ensure we fetch deps during spec-build stage
Ivan Tashkinov [Wed, 10 Mar 2021 04:48:50 +0000 (07:48 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
Haelwenn [Wed, 10 Mar 2021 03:24:40 +0000 (03:24 +0000)]
Merge branch 'openapi/admin/user' into 'develop'
Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355
Ivan Tashkinov [Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
Ivan Tashkinov [Sun, 7 Mar 2021 08:33:21 +0000 (11:33 +0300)]
[#3213] Performance optimization of filtering by hashtags ("any" condition).
Egor Kislitsyn [Fri, 5 Mar 2021 11:51:29 +0000 (15:51 +0400)]
Update OpenApiSpex dependency
Egor Kislitsyn [Thu, 4 Mar 2021 17:13:53 +0000 (21:13 +0400)]
Add UserOperation to Redoc
Ivan Tashkinov [Wed, 3 Mar 2021 20:09:30 +0000 (23:09 +0300)]
[#3213] ActivityPub hashtags filtering refactoring. Test fix.
lain [Wed, 3 Mar 2021 15:07:50 +0000 (15:07 +0000)]
Merge branch 'mergeback/2.3.0' into 'develop'
Mergeback/2.3.0
See merge request pleroma/pleroma!3360
lain [Wed, 3 Mar 2021 14:35:25 +0000 (15:35 +0100)]
Changelog: Re-add application support
lain [Wed, 3 Mar 2021 14:33:06 +0000 (15:33 +0100)]
Revert "StatusController: Deactivate application support for now."
This reverts commit
024c11c18d289d4acd65d749f939ad3684f31905.
lain [Wed, 3 Mar 2021 12:56:40 +0000 (13:56 +0100)]
Changelog, mix: merge in stable
Haelwenn [Wed, 3 Mar 2021 00:57:39 +0000 (00:57 +0000)]
Merge branch 'fix-migration' into 'develop'
Fix migration in cases where database name has a hyphen
See merge request pleroma/pleroma!3359
Mark Felder [Wed, 3 Mar 2021 00:17:32 +0000 (18:17 -0600)]
Fix migration in cases where database name has a hyphen
Haelwenn [Tue, 2 Mar 2021 20:48:40 +0000 (20:48 +0000)]
Merge branch 'fix/inconsistent-reference' into 'develop'
MastoAPI Status View: make consistently named object references
See merge request pleroma/pleroma!3358
Haelwenn [Tue, 2 Mar 2021 20:47:21 +0000 (20:47 +0000)]
Merge branch 'fix/useless-header' into 'develop'
Test: remove useless header on the get request
See merge request pleroma/pleroma!3357
Mark Felder [Tue, 2 Mar 2021 20:14:38 +0000 (14:14 -0600)]
Make the object reference in both render("show.json", _) functions consistently named
Mark Felder [Tue, 2 Mar 2021 20:04:50 +0000 (14:04 -0600)]
Remove useless header on the get request
lain [Tue, 2 Mar 2021 19:54:30 +0000 (19:54 +0000)]
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0
See merge request pleroma/pleroma!3354
feld [Tue, 2 Mar 2021 18:40:35 +0000 (18:40 +0000)]
Merge branch 'application-to-generator' into 'develop'
Status application field: test improvements
See merge request pleroma/pleroma!3356
Mark Felder [Tue, 2 Mar 2021 18:33:32 +0000 (12:33 -0600)]
Actually test viewing status after ingestion
Mark Felder [Tue, 2 Mar 2021 18:29:16 +0000 (12:29 -0600)]
Test both ingestion of post in the status controller and the correct response during the view
Mark Felder [Tue, 2 Mar 2021 17:37:37 +0000 (11:37 -0600)]
Fix build_application/1 match
Egor Kislitsyn [Tue, 2 Mar 2021 16:49:17 +0000 (20:49 +0400)]
Add OpenAPI spec for AdminAPI.UserController
lain [Tue, 2 Mar 2021 16:03:14 +0000 (17:03 +0100)]
Mix: Update linkify.
lain [Tue, 2 Mar 2021 14:03:16 +0000 (15:03 +0100)]
Linting.
lain [Tue, 2 Mar 2021 13:42:11 +0000 (14:42 +0100)]
Changelog: Remove application support line.
lain [Tue, 2 Mar 2021 13:40:47 +0000 (14:40 +0100)]
StatusController: Deactivate application support for now.
Some more things to discuss about, so we'll remove it from 2.3.0
Ivan Tashkinov [Tue, 2 Mar 2021 05:26:30 +0000 (08:26 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
lain [Mon, 1 Mar 2021 20:13:43 +0000 (21:13 +0100)]
Mix: Update version number
lain [Mon, 1 Mar 2021 20:12:26 +0000 (21:12 +0100)]
Update changelog
Mark Felder [Mon, 22 Feb 2021 22:19:08 +0000 (16:19 -0600)]
Document user agent leak fix
Alex Gleason [Thu, 25 Feb 2021 03:37:30 +0000 (21:37 -0600)]
user_agent_mock --> request_mock
Alex Gleason [Mon, 22 Feb 2021 20:46:59 +0000 (14:46 -0600)]
Never forward the client's user-agent through the media proxy
lain [Mon, 1 Mar 2021 19:21:52 +0000 (19:21 +0000)]
Merge branch 'update-frontend-2021-03-01' into 'develop'
Update frontend
See merge request pleroma/pleroma!3353
lain [Mon, 1 Mar 2021 19:04:53 +0000 (20:04 +0100)]
Update frontend
Haelwenn [Mon, 1 Mar 2021 17:51:15 +0000 (17:51 +0000)]
Merge branch 'application-to-generator' into 'develop'
ActvitityStreams application field should be called "generator"
See merge request pleroma/pleroma!3352
Mark Felder [Mon, 1 Mar 2021 17:29:10 +0000 (11:29 -0600)]
Store application details in the object under the generator key, not application key
feld [Sun, 28 Feb 2021 19:01:01 +0000 (19:01 +0000)]
Merge branch 'feld-develop-patch-26755' into 'develop'
Update CHANGELOG.md
See merge request pleroma/pleroma!3351
feld [Sun, 28 Feb 2021 18:46:03 +0000 (18:46 +0000)]
Update CHANGELOG.md
lain [Sun, 28 Feb 2021 16:53:05 +0000 (16:53 +0000)]
Merge branch 'fix/warning-in-test' into 'develop'
warning fix
See merge request pleroma/pleroma!3350
lain [Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)]
Merge branch 'features/reports-enhancements' into 'develop'
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
Alexander Strizhakov [Sun, 28 Feb 2021 16:41:25 +0000 (19:41 +0300)]
warning fix
lain [Sun, 28 Feb 2021 16:22:22 +0000 (16:22 +0000)]
Merge branch 'admin-api-versioning' into 'develop'
Pleroma APIs versioning
Closes #2509
See merge request pleroma/pleroma!3335
lain [Sun, 28 Feb 2021 16:18:23 +0000 (16:18 +0000)]
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336
lain [Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)]
Merge branch 'feat/client_app_details' into 'develop'
Support application field
See merge request pleroma/pleroma!3311
Mark Felder [Sun, 28 Feb 2021 15:04:29 +0000 (09:04 -0600)]
Simplify migration
Haelwenn (lanodan) Monnier [Mon, 28 Dec 2020 22:21:53 +0000 (23:21 +0100)]
Remove sensitive-property setting #nsfw, create HashtagPolicy
lain [Sat, 27 Feb 2021 19:40:38 +0000 (19:40 +0000)]
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346
lain [Sat, 27 Feb 2021 19:37:08 +0000 (19:37 +0000)]
Merge branch 'fix/repo-terminate' into 'develop'
don't use continue in Stats init for test env
See merge request pleroma/pleroma!3349
Alexander Strizhakov [Sat, 27 Feb 2021 06:39:15 +0000 (09:39 +0300)]
don't use continue in Stats init for test env
Mark Felder [Sat, 27 Feb 2021 00:14:57 +0000 (18:14 -0600)]
Store the client application data in ActivityStreams format
feld [Fri, 26 Feb 2021 16:49:11 +0000 (16:49 +0000)]
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
expires_in in scheduled status params
Closes #2498
See merge request pleroma/pleroma!3315
feld [Fri, 26 Feb 2021 16:47:53 +0000 (16:47 +0000)]
Merge branch 'ecto-rollback-in-test-env' into 'develop'
Possibility to run rollback in test env
See merge request pleroma/pleroma!3212
rinpatch [Fri, 26 Feb 2021 09:21:15 +0000 (09:21 +0000)]
Merge branch 'PestToast-develop-patch-66930' into 'develop'
Removed a command that references "pleroma.env". This file does not seem to be...
See merge request pleroma/pleroma!3347
PestToast [Fri, 26 Feb 2021 01:01:29 +0000 (01:01 +0000)]
Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.
Mark Felder [Thu, 25 Feb 2021 19:08:36 +0000 (13:08 -0600)]
Note our upgrade path for this functionality
Mark Felder [Thu, 25 Feb 2021 19:06:43 +0000 (13:06 -0600)]
Leave a note for future explorers
Mark Felder [Thu, 25 Feb 2021 19:04:08 +0000 (13:04 -0600)]
No need to filter out Mix.env() from the API routes.
Mark Felder [Thu, 25 Feb 2021 16:07:29 +0000 (10:07 -0600)]
Improved recursion through the api route list
Mark Felder [Thu, 25 Feb 2021 15:23:10 +0000 (09:23 -0600)]
Filter out MIX_ENV from route list and add a test
Mark Felder [Thu, 25 Feb 2021 15:06:56 +0000 (09:06 -0600)]
Enum instead of Stream
Mark Felder [Wed, 24 Feb 2021 21:23:45 +0000 (15:23 -0600)]
Attempt to filter out API calls from FrontendStatic plug
Haelwenn [Wed, 24 Feb 2021 18:32:55 +0000 (18:32 +0000)]
Merge branch 'gitignore' into 'develop'
gitignore: Vi and emacs temp files
See merge request pleroma/pleroma!3345
Mark Felder [Wed, 24 Feb 2021 18:11:50 +0000 (12:11 -0600)]
Vi and emacs temp files
Haelwenn [Wed, 24 Feb 2021 17:26:26 +0000 (17:26 +0000)]
Merge branch 'docfix/chat-token' into 'develop'
Update terminology in differences_in_mastoapi_responses.md
See merge request pleroma/pleroma!3344
zonk [Wed, 24 Feb 2021 14:23:56 +0000 (14:23 +0000)]
Update terminology in differences_in_mastoapi_responses.md
Ivan Tashkinov [Tue, 23 Feb 2021 15:11:25 +0000 (18:11 +0300)]
[#3213] `mix pleroma.database rollback` tweaks.
feld [Tue, 23 Feb 2021 14:17:06 +0000 (14:17 +0000)]
Merge branch 'fix/whalebird-url' into 'develop'
Fix URL of Whalebird in docs
See merge request pleroma/pleroma!3339
lain [Tue, 23 Feb 2021 13:53:59 +0000 (13:53 +0000)]
Merge branch 'chore/no-activitypub-sleeps' into 'develop'
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
See merge request pleroma/pleroma!3330
AkiraFukushima [Tue, 23 Feb 2021 12:31:06 +0000 (21:31 +0900)]
Fix URL of Whalebird in docs
Ivan Tashkinov [Tue, 23 Feb 2021 10:58:35 +0000 (13:58 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
Ivan Tashkinov [Tue, 23 Feb 2021 10:52:28 +0000 (13:52 +0300)]
[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
rinpatch [Tue, 23 Feb 2021 10:01:09 +0000 (10:01 +0000)]
Merge branch '2534-pleroma-endpoint-earlier-init' into 'develop'
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer)
Closes #2534
See merge request pleroma/pleroma!3338
Ivan Tashkinov [Mon, 22 Feb 2021 20:41:57 +0000 (20:41 +0000)]
Apply i1t's suggestion(s) to 1 file(s)
Ivan Tashkinov [Mon, 22 Feb 2021 20:26:07 +0000 (23:26 +0300)]
[#3213] `hashtags`: altered `name` type to `text`. `hashtags_objects`: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.
Ivan Tashkinov [Mon, 22 Feb 2021 20:09:41 +0000 (23:09 +0300)]
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).
eugenijm [Mon, 22 Feb 2021 01:26:56 +0000 (04:26 +0300)]
Update the documentation to use make it use /api/v1/pleroma instead of /api/pleroma
Haelwenn (lanodan) Monnier [Sun, 21 Feb 2021 22:41:13 +0000 (23:41 +0100)]
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
eugenijm [Thu, 18 Feb 2021 21:59:06 +0000 (00:59 +0300)]
Reroute /api/pleroma to /api/v1/pleroma
feld [Sat, 20 Feb 2021 23:18:43 +0000 (23:18 +0000)]
Merge branch 'revert/changelog' into 'develop'
Revert changelog entry that leaked from another branch.
See merge request pleroma/pleroma!3334
Mark Felder [Sat, 20 Feb 2021 23:07:12 +0000 (17:07 -0600)]
Revert changelog entry that leaked from another branch.
Haelwenn [Sat, 20 Feb 2021 21:18:04 +0000 (21:18 +0000)]
Merge branch 'fix/filters' into 'develop'
Minor fixes to upload filters
See merge request pleroma/pleroma!3332
Mark Felder [Sat, 20 Feb 2021 20:32:14 +0000 (14:32 -0600)]
Document HeifToJpeg and its requirement of libheif's heic-convert tool
Mark Felder [Sat, 20 Feb 2021 20:28:21 +0000 (14:28 -0600)]
Exiftool also cannot strip from heic files.
projects / akkoma / log