logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
DateCommit messageAuthorFiles+-
"published"-related shenanigansHaelwenn (lanodan) Monnier4+9-6
AP C2S: Set published dateHaelwenn (lanodan) Monnier1+2-0
Revert "Transmogrifier: Check object/activity existance for incoming Delete/Undo"Haelwenn (lanodan) Monnier1+5-12
Transmogrifier: Check object/activity existance for incoming Delete/UndoHaelwenn (lanodan) Monnier1+12-5
ConfigController: Remove db-config limit on readingHaelwenn (lanodan) Monnier1+2-2
_notice.html.eex: fixupHaelwenn (lanodan) Monnier1+1-1
profile.html.eex: fixupHaelwenn (lanodan) Monnier1+1-1
static-fe.css: Use .emoji class instead of max-height hackHaelwenn (lanodan) Monnier1+7-5
static_fe/profile.html.eex: Fix formatting, emojify bioHaelwenn (lanodan) Monnier1+1-1
static-fe.css: Do not scale images too muchHaelwenn (lanodan) Monnier1+1-3
StaticFE: center the bioHaelwenn (lanodan) Monnier2+15-1
StaticFE: Change styling & formattingHaelwenn (lanodan) Monnier3+183-9
Add fixtures on honkHaelwenn (lanodan) Monnier5+42-0
mix.exs: custom source_urlHaelwenn (lanodan) Monnier1+2-3
mix.deps: Change Linkify to my branchHaelwenn (lanodan) Monnier6+13-10
rebase.sh: script (legacy)Haelwenn (lanodan) Monnier1+6-0
[PleromaFE] Update frontendHaelwenn (lanodan) Monnier23+353-88
upgrade.sh: CreateHaelwenn (lanodan) Monnier2+41-0
Merge remote-tracking branch 'pleroma/features/ingestion-no-nil' into dev-lanodanHaelwenn (lanodan) Monnier5+8-23
ObjectValidator.stringify_keys: filter out nil valuesHaelwenn (lanodan) Monnier5+8-23
Merge branch 'bugfix/subscriptions-replies' into 'develop'Haelwenn2+7-11
maybe_notify_subscribers: Don't create notifications from ingested messagesHaelwenn (lanodan) Monnier2+7-11
Merge branch 'bugfix/change_password' into 'develop'Haelwenn3+98-101
TwitterAPI: Make change_email require body params instead of queryHaelwenn (lanodan) Monnier3+38-38
Merge branch 'bugfix/object-age-create' into 'develop'Haelwenn2+6-1
TwitterAPI: Make change_password require body params instead of queryHaelwenn (lanodan) Monnier3+60-63
Merge branch 'docs_make_otp_recommendation_clearer' into 'develop'Haelwenn8+25-2
Make the OPT recomendation clearerIlja8+25-2
ObjectAgePolicy: Fix pattern matching on publishedHaelwenn (lanodan) Monnier2+6-1
Merge branch 'fix/streaming-api-for-create-activity' into 'develop'Haelwenn1+3-4
Merge branch 'poll-notification' into 'develop'Haelwenn17+314-28
Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'Haelwenn23+919-175
fix: stream out Create ActivitykPherox1+3-4
Merge branch 'chores/2.4.0-develop' into 'develop'Haelwenn264+1004-735
mix.exs: 2.4.50Haelwenn (lanodan) Monnier1+1-1
Update PleromaFE Bundle (2.4.0)Haelwenn (lanodan) Monnier143+521-257
CHANGELOG.md: Fix instances of 2020 being actually 2021matildepark1+3-3
Improve readabilityEgor Kislitsyn6+33-29
Quarantine placeholdersIlja1+2-2
improve changelog entryIlja1+1-1
Make transparency_exclusions use tuples in admin-feIlja2+6-4
Add key- and valuePlaceholders for quarantined_instances and mrf_simpleIlja4+12-0
Add transparency_exclusions also to the breaking changesIlja1+1-1
Change docsIlja3+18-16
quarantine instances infoIlja2+42-12
Change what nodeinfo returns without breaking backwards compatibilityIlja2+90-28
Return maps in node_infoIlja3+26-3
Add database migrationsIlja3+162-0
Fixed deprecation warning checksIlja2+21-20
config/description.exs: Update quarantine settings to tuplesIlja1+4-4
make linter happyIlja1+2-1
Deprecate transparency_exclusionsIlja2+89-0
config :mrf, :transparency_exclusions works with tumples nowIlja2+2-2
Deprecate and rewrite settings for quarentine settingsIlja2+89-0
Make quarentine work with list of tuples instead of stringsIlja5+18-5
Add tests for setting `:instance, :quarantined_instances`Ilja2+106-0
Make mrfSimple work with tuplesIlja4+123-112
Deprectate strings for SimplePolicyIlja2+138-1
Merge branch 'staff-plug' into 'develop'Haelwenn4+79-5
Merge remote-tracking branch 'pleroma/develop' into staff-plugAlex Gleason365+8571-3153
Release 2.4.0Haelwenn (lanodan) Monnier2+14-9
Update AdminFE bundleHaelwenn (lanodan) Monnier119+467-467
Merge branch 'object-tombstone-visibility' into 'develop'feld1+1-0
Merge branch 'errorview-json-fix' into 'develop'feld2+2-1
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibilityAlex Gleason365+8568-3152
Visibility: check Tombstone objects in visible_for_user?/2Alex Gleason1+1-0
CHANGELOG: fixed JSON error renderingAlex Gleason1+1-0
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fixAlex Gleason365+8568-3152
Add activity+json to Phoenix :format_encoders Fixes ErrorView renderingAlex Gleason1+1-1
Merge branch 'mkljczk-develop-patch-60115' into 'develop'Haelwenn1+3-1
CHANGELOG: Support `poll` notification typeAlex Gleason1+1-0
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixesAlex Gleason365+8565-3151
Poll notification: only notify local usersAlex Gleason2+6-4
Poll notification: trigger PollWorker through common_pipelineAlex Gleason3+40-6
PollWorker defensive checksAlex Gleason1+4-2
Poll notification: notify for polls even when block_from_strangers is setAlex Gleason1+8-2
MastodonAPI: Support poll notificationAlex Gleason14+262-21
Merge branch 'admin-api-users-sort' into 'develop'feld4+59-71
Merge branch 'admin-api-users-date' into 'develop'feld3+6-2
CHANGELOG: AdminAPI return date with usersAlex Gleason1+1-0
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-dateAlex Gleason364+8500-3078
AdminAPI: add date to usersAlex Gleason2+5-2
CHANGELOG: AdminAPI users sortAlex Gleason1+1-0
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sortAlex Gleason364+8500-3078
AdminAPI: sort user results by ID descendingAlex Gleason3+58-71
Moderators: reorganize :admin_api pipeline in RouterAlex Gleason2+9-5
Moderators: add UserIsStaffPlugAlex Gleason2+70-0
Merge branch 'features/ingestion-page' into 'develop'Haelwenn11+249-228
Merge branch 'features/validators-apc2s' into 'develop'Haelwenn5+77-64
AP C2S: Remove restrictions and make it go through pipelineHaelwenn (lanodan) Monnier5+77-64
Merge branch 'update/linkify' into 'develop'feld3+3-2
Update Linkify to fix crash on posts with a URL we failed to parse correctlyMark Felder3+3-2
Merge branch 'remote-deletions' into 'develop'feld6+78-32
fix the fucking list timelines on mastofe/soapbox-femarcin mikołajczak1+3-1
Deletions: change User.purge/1 to defp, add CHANGELOG entryAlex Gleason2+3-1
Merge remote-tracking branch 'pleroma/develop' into remote-deletionsAlex Gleason358+8132-2791
Deletions: don't purge keys so Delete/Undo activities can be signedAlex Gleason2+2-4
Deletions: allow deactivated users to be deletedAlex Gleason4+32-9
Deletions: preserve account status fields during purge, fix checksAlex Gleason2+14-12
Also purge the user in User.perform/2Alex Gleason1+4-0
Deletions: purge the user immediatelyAlex Gleason1+10-15
Correctly purge a remote userAlex Gleason2+28-6
Merge branch 'fix-2686' into 'develop'Haelwenn1+6-4
Activity deletion: fix FunctionClauseError #2686Alex Gleason1+6-4
Merge branch 'ecto-upgrade' into 'develop'feld4+4-8
Upgrade Ecto to v3.6.2, remove deprecated ecto_explainAlex Gleason4+4-8
Merge branch 'bugfix/upload-limit-plug' into 'develop'Haelwenn5+62-2
Merge branch 'docs/dependencies-rewrite' into 'develop'feld8+32-65
Add test on changing [:instance, :upload_limit]Haelwenn (lanodan) Monnier2+57-0
Downgrade Plug to 1.10.x, revert upload_limit tuple to function changeHaelwenn (lanodan) Monnier3+5-2
Merge branch 'cycles-ci-skip' into 'develop'Haelwenn1+5-0
Cycles CI: skip unless Elixir code is modifiedAlex Gleason1+5-0
docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repoHaelwenn (lanodan) Monnier1+1-2
docs: Remove Erlang Solutions repositoryHaelwenn (lanodan) Monnier1+3-9
docs: Use one file to describe dependenciesHaelwenn (lanodan) Monnier7+28-54
Merge branch 'fix/twittercard-video-dimensions' into 'develop'feld6+204-30
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview ProxyMark Felder1+2-0
Merge branch 'cycles-ci' into 'develop'feld2+12-10
Fix compile cycle in Pleroma.Tests.AuthTestControllerAlex Gleason1+2-10
Cycles CI: disable cacheAlex Gleason1+1-0
CI: echo $MIX_ENVAlex Gleason1+1-0
Add cycles test to .gitlab-ci.yml Thank you @jb55@bitcoinhackers.org for the awk syntaxAlex Gleason1+8-0
Merge branch 'refactor/ingestion-activity-context' into 'develop'feld8+105-105
Merge branch 'eblurhash-hex' into 'develop'feld2+2-4
Formatting of the commentMark Felder2+6-6
Add new Twittercard/OGP changesMark Felder1+1-0
Test that videos only get image thumbnails in OGP metadata when we can produce them with Preview ProxyMark Felder1+80-0
CredoMark Felder2+10-8
LintMark Felder2+11-8
Fix incorrectly ordered arguments to the function and not properly merging lists.Mark Felder1+2-1
Metadata.Utils.attachment_url/1 was used in this test tooMark Felder1+2-1
Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.Mark Felder1+15-0
Remove Metadata.Utils.attachment_url/1Mark Felder3+19-14
Use eblurhash 1.1.0 from HexAlex Gleason2+2-4
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressingHaelwenn (lanodan) Monnier8+105-105
Merge branch 'cycles-plug-deps' into 'develop'Haelwenn13+22-57
Merge branch 'cycles-side-effects' into 'develop'Haelwenn1+4-3
Merge branch 'cycles-instances' into 'develop'Haelwenn1+11-6
Refactor skipped plugs into Pleroma.Web functions Speeds up recompilation by reducing compile cyclesAlex Gleason13+22-57
Switch to runtime deps in ActivityPub.SideEffects Speeds up recompilation by reducing compile cyclesAlex Gleason1+4-3
Switch to runtime deps in Pleroma.Instances Speeds up recompilation by limiting compile cyclesAlex Gleason1+11-6
Switch OGP default type from "website" to "article"Mark Felder1+2-2
Merge branch 'cycles-config-loader-redux' into 'develop'feld1+16-16
Merge branch 'cycles-user-view' into 'develop'feld2+10-2
Set the correct height/width if the data is available when generating opengraph metadataMark Felder2+37-5
Create AdminAPI.UserView to avoid compile-time dep Speeds up recompilationAlex Gleason2+10-2
Only use fallback for videos and only add this metadata for images if we really have it.Mark Felder1+22-6
Twittercard metadata for images should also include dimensions if availableMark Felder2+16-8
Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1 Speeds up recompilationAlex Gleason1+16-16
Set the correct height/width if the data is available when generating twittercard metadataMark Felder2+13-5
Merge branch 'metadata-for-all' into 'develop'feld5+57-4
Blurhash varies slightly by computer generating it, so just validate it wasn't nilMark Felder1+4-3
Merge branch 'improve-og-embed' into 'develop'feld3+18-30
Update test names and verify blurhash is correctly generated for imagesMark Felder1+5-3
Add test for AnalyzeMetadata upload filter fetching dimensions from a videoMark Felder2+11-0
Merge branch 'cycles-params' into 'develop'feld7+27-21
Update scope of AnalyzeMetadata featuresMark Felder1+1-1
Support metadata for video files tooMark Felder2+40-1
Fix order of Pleroma.Web.Utils.Params aliasesAlex Gleason3+3-3
Pleroma.Web.Params --> Pleroma.Web.Utils.ParamsAlex Gleason8+22-22
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1 Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.exAlex Gleason7+27-21
Merge branch 'cycles-uploads' into 'develop'feld1+3-3
Merge branch 'cycles-authenticator' into 'develop'feld9+91-75
Create WrapperAuthenticator and simplify Authenticator behaviour Speeds up recompilation by reducing compile-time cyclesAlex Gleason9+91-75
Upload.Filter: use generic types in @spec Speeds up recompilation by reducing compile-time depsAlex Gleason1+3-3
Merge branch 'fix/config-test-warning' into 'develop'feld3+61-64
Merge branch 'pleromapi' into 'develop'feld1+3-0
Merge branch 'cycles-guard' into 'develop'feld3+14-7
Channel name was incorrect. We left it as chat:public for backwards compatibility.Mark Felder1+1-1
Test was named incorrectly and did not executeMark Felder1+0-0
Fix test warningsMark Felder1+20-23
Put custom guards in Web.Utils.Guards Speeds up recompilation by removing a compile-time cycle on AdminAPI.SearchAlex Gleason3+14-7
FormattingMark Felder2+7-2
Merge branch 'fix/prune-hashtags' into 'develop'feld3+29-0
Merge branch 'cycles-mrf-policy' into 'develop'feld29+44-39
Update CHANGELOG.mdfeld1+0-1
Update CHANGELOG.mdfeld1+4-0
Merge branch 'develop' into 'fix/prune-hashtags'feld201+2495-1133
Update CHANGELOG.mdfeld1+1-1
Update CHANGELOG.mdfeld1+1-0
Update lib/mix/tasks/pleroma/database.exfeld1+4-4
Merge branch 'fix/plug_parser_multipart' into 'develop'feld1+1-1
Fix MRF.config_descriptions/0Alex Gleason1+1-1
MRF: create MRF.Policy behaviour separate from MRF module Speeds up recompilation by reducing compile-time depsAlex Gleason29+43-38
Merge branch 'notification-settings-docs-fix' into 'develop'feld1+1-1
Merge branch 'cycles-reverse-proxy' into 'develop'feld3+30-19
Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settingsAlex Gleason1+1-1
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxyAlex Gleason298+7377-2334
ReverseProxy: create Client.Wrapper to call client from config Speeds up recompilation by reducing compile-time cyclesAlex Gleason3+30-19
Merge branch 'chore/otp24-changelog' into 'develop'feld1+1-0
Merge branch 'fix/clear_config_warning' into 'develop'feld1+1-2
Document OTP 24 support so we remember to add it to the official release notes / announcementMark Felder1+1-0
Fix warning for misuse of clear_config/2Mark Felder1+1-2
Merge branch 'tests/openapi-everywhere' into 'develop'Haelwenn17+397-217
Pipeline Ingestion: PageHaelwenn (lanodan) Monnier11+249-228
web endpoint: Use Config.get directly instead of a tupleHaelwenn (lanodan) Monnier1+1-1
Merge branch 'fix/missing-deprecation' into 'develop'feld2+35-1
Merge branch 'bugfix/erlang-24' into 'develop'feld8+100-86
Add missing deprecation warning left out of !2842Mark Felder2+35-1
Improve opengraph embedsio3+13-30
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []Haelwenn (lanodan) Monnier2+12-5
request_builder_test: mode :read got removedHaelwenn (lanodan) Monnier1+26-18
factory: Fix article_factoryHaelwenn (lanodan) Monnier1+2-2
mix: Update pot to ~> 1.0Haelwenn (lanodan) Monnier2+2-2
mix.exs: Apply OTP24 fixes to web_push_encryptionHaelwenn (lanodan) Monnier3+5-4
mix: Update dependenciesHaelwenn (lanodan) Monnier1+4-4
media_proxy: switch from :crypto.hmac to :crypto.macHaelwenn (lanodan) Monnier1+1-1
mix: Switch hackney & gun to releasesHaelwenn (lanodan) Monnier2+11-15
Update all dependenciesHaelwenn (lanodan) Monnier1+40-38
Merge branch 'chore/rename-chat' into 'develop'Haelwenn17+273-144
Merge branch 'chore/cicd_skip_nonsense' into 'develop'rinpatch1+29-0
Don't generate new specs unless they've changed.Mark Felder1+4-0
Skip build, test, analysis/lint when we don't make code changesMark Felder1+25-0
Merge branch 'Snow-develop-patch-01683' into 'develop'feld2+3-2
Update wording for relays in docs and config descriptionMark Felder2+2-2
FormattingMark Felder1+2-1
Merge branch 'cycles-email' into 'develop'feld1+9-2
disableChat / disableShout didn't actually do anything for PleromaFEMark Felder1+0-7
Merge remote-tracking branch 'pleroma/develop' into cycles-emailAlex Gleason270+6532-1883
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint Speeds up recompilation by fixing cycles in UserEmailAlex Gleason1+9-2
Merge branch 'cycles-streaming' into 'develop'feld2+3-7
Merge branch 'cycles-uploader' into 'develop'feld1+2-2
Keep original Shoutbox channel name as chat:public There is no sane / high level workaround for merging users who join shout:public and chat:public.Mark Felder2+2-5
Merge remote-tracking branch 'pleroma/develop' into cycles-uploaderAlex Gleason224+6289-1720
Remove deps from Uploader behaviour Speeds up recompilation by limiting compile-time depsAlex Gleason1+2-2
Merge remote-tracking branch 'pleroma/develop' into cycles-streamingAlex Gleason267+6527-1874
Remove deps from Streaming/Persisting behaviors Speeds up recompilation by limiting compile-time depsAlex Gleason2+3-7
Add "chat" back as a feature for backwards compat.Mark Felder1+4-0
Wire up join requests to the old "chat:public" channel into the new "shout:public" channelMark Felder1+3-0
Forgot to move migration test when rebasingMark Felder1+0-0
We want clear_config/2 in all tests nowMark Felder1+1-1
Update test for RenameInstanceChat migrationRoman Chvanikov1+37-6
Add RenameInstanceChat migrationRoman Chvanikov1+77-0
Add a test for the migrationMark Felder1+21-0
Update description file for new shout config setting locationMark Felder1+10-9
Move shout configuration from :instance, update docs and changelogMark Felder6+11-10
More confusingly named legacy chat code renamed to shoutMark Felder1+4-4
Ensure we actually start ShoutChannelMark Felder1+1-1
Update PleromaFE settings for the old chat boxMark Felder1+4-4
Just call it shoutMark Felder1+1-1
Rename the non-federating Chat feature to ShoutMark Felder13+124-123
Merge branch 'cycles-constants' into 'develop'feld7+10-9
Merge remote-tracking branch 'pleroma/develop' into cycles-constantsAlex Gleason265+6518-1866
Merge branch 'cycles-frontend-static' into 'develop'feld1+5-4
Merge branch 'cycles-base-url' into 'develop'feld43+94-96
Merge branch 'features/validators-note' into 'develop'Haelwenn31+386-315
Merge remote-tracking branch 'pleroma/develop' into cycles-base-urlAlex Gleason186+5805-1306
Deprecate Pleroma.Web.base_url/0 Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.Alex Gleason43+93-96
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0 Move as_local_public/0 to stop making modules depend on Web at compile-timeAlex Gleason7+10-9
Merge branch 'docs/goto-libera' into 'develop'Haelwenn11+15-17
Add Raspberry Pi install instructionsGuy Sheffer1+3-0
Changing references of freenode to libera.chatHaelwenn (lanodan) Monnier11+15-17
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+580-0
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1Alex Gleason32+215-133
Translated using Weblate (Chinese (Traditional))Snow1+6-6
Translated using Weblate (Chinese (Traditional))Snow1+7-5
Added translation using Weblate (Chinese (Traditional))Snow1+578-0
Merge branch 'ffmpeg' into 'develop'Haelwenn1+1-1
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-staticAlex Gleason226+5433-1429
FrontendStatic: make Router a runtime dep Speeds up recompilation by removing compile-time cyclesAlex Gleason1+5-4
Add ffmpegshibao1+1-1
Merge branch 'cycles-views' into 'develop'feld15+70-10
Merge branch 'cycles-html' into 'develop'feld4+49-38
Merge branch 'cycles-gun' into 'develop'feld4+11-13
Merge branch 'cycles-config' into 'develop'feld2+37-33
Merge branch 'cycles-pipeline' into 'develop'feld1+13-13
Merge remote-tracking branch 'pleroma/develop' into cycles-pipelineAlex Gleason205+5275-1341
ActivityPub.Pipeline: switch to runtime deps Speed up recompilation by breaking compile-time cyclesAlex Gleason1+14-17
Merge remote-tracking branch 'pleroma/develop' into cycles-htmlAlex Gleason205+5271-1340
Break out activity-specific HTML functions into Pleroma.Activity.HTML Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.exAlex Gleason4+49-38
Merge remote-tracking branch 'pleroma/develop' into cycles-viewsAlex Gleason205+5271-1340
Create real Views for all Controllers This makes views depend on each other at runtime instead of compile-timeAlex Gleason15+70-10
Merge remote-tracking branch 'pleroma/develop' into cycles-plugsAlex Gleason205+5271-1340
Config: use runtime deps instead of module attributes Speeds up recompilation time by breaking compile-time cyclesAlex Gleason2+37-33
Merge remote-tracking branch 'pleroma/develop' into cycles-gunAlex Gleason205+5271-1340
Gun: use runtime deps in ConnectionPool Speed up recompilation time by breaking compile-time cyclesAlex Gleason3+10-10
Gun: make Gun.API a runtime dep Speed up recompilation by breaking a compile-time cycleAlex Gleason1+1-3
Adding descriptionSnow1+1-1
Merge branch 'cycles-router-api-routes' into 'develop'feld4+14-14
Merge branch 'simplepolicy-announce-leak' into 'develop'feld3+48-1
Merge branch 'gitignore-runtime-exs' into 'develop'feld1+2-2
Merge branch 'alias-router-helpers' into 'develop'feld21+33-31
Merge branch 'plug-runtime-dev' into 'develop'feld2+8-0
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routesAlex Gleason181+5166-1292
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0 Reduce recompilation time by breaking compile-time cyclesAlex Gleason4+14-14
Merge branch 'cycles-router' into 'develop'feld1+7-3
Merge branch 'cycles-router-mediaproxy' into 'develop'feld1+5-5
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxyAlex Gleason174+5114-1268
Don't make MediaProxy be a compile-dep of Router Speeds up recompilation by removing MediaProxy as a compile-time dep of RouterAlex Gleason1+5-5
Merge remote-tracking branch 'pleroma/develop' into cycles-routerAlex Gleason174+5114-1268
Router: move StaticFEPlug to a pipeline Speed up recompilation by breaking a cycle. Removes StaticFEPlug as a compile-time dep of Router.Alex Gleason1+7-3
Merge branch 'featured-totalItems' into 'develop'Haelwenn3+4-2
Missing entry for pinned posts federation from MR !3312Mark Felder1+1-0
Provide totalItems field for featured collectionsMark Felder2+3-2
Merge branch 'feat/expose_email_to_self' into 'develop'Haelwenn3+29-0
Merge branch 'mix_config_deprecation' into 'develop'Haelwenn10+10-17
Switch from the deprecated "use Mix.config" to "import Config"Mark Felder10+10-17
Expose user email address to user/owner; not publicly.Mark Felder3+29-0
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-devAlex Gleason174+5114-1268
Put Plugs in runtime mode in :dev, :test to speed up recompilationAlex Gleason2+8-0
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpersAlex Gleason174+5114-1268
Switch to aliasing `Router.Helpers` instead of importingAlex Gleason21+33-31
Merge branch 'chore/changelog' into 'develop'feld1+2-2
Clarify AttachmentMetadata changesMark Felder1+2-2
Merge branch 'blurhash' into 'develop'feld14+164-12
Fixed checking for Upload Filter required commandsMark Felder2+6-5
Check AnalyzeMetadata filter's required commandsMark Felder1+3-1
Rename upload filter to AnalyzeMetadataMark Felder5+65-65
Merge branch 'optional-config' into 'develop'lain9+22-17
Merge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exsAlex Gleason159+4928-1239
gitignore `config/runtime.exs`Alex Gleason1+2-2
Merge remote-tracking branch 'pleroma/develop' into optional-configAlex Gleason159+4928-1239
Docs: use `MIX_ENV=prod mix pleroma.instance gen`Alex Gleason8+16-16
Make prod.secret.exs optional (with warning)Alex Gleason1+6-1
Merge remote-tracking branch 'upstream/attachment-meta' into blurhashAlex Gleason159+4930-1239
Support blurhashAlex Gleason5+19-2
Changelog: attachment metaAlex Gleason1+2-0
Merge remote-tracking branch 'upstream/develop' into attachment-metaAlex Gleason159+4928-1239
Federate attachments as Links instead of DocumentsAlex Gleason1+5-3
Don't render media `meta` if nilAlex Gleason1+4-2
Ingest remote attachment width/heightAlex Gleason5+50-5
Add SetMeta filter to store uploaded image sizesAlex Gleason5+83-2
a better query to delete from hashtagsfaried nawaz1+4-6
mix prune_objects: remove unused hashtags after pruning remote objectsfaried nawaz1+11-0
migration: add on_delete: :delete_all to hashtags object_id fkfaried nawaz1+19-0
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leakAlex Gleason14+181-369
Merge branch 'dont-crash-email-settings' into 'develop'feld4+50-27
Merge branch 'earmark' into 'develop'feld11+131-342
CHANGELOG: don't crash so hard when email settings are invalidAlex Gleason1+3-0
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settingsAlex Gleason152+4747-870
Don't crash when email settings are invalid Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606 Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4Alex Gleason3+47-27
CHANGELOG: markdownAlex Gleason1+1-0
CHANGELOG: SimplePolicy embedded objects are now checkedAlex Gleason1+1-0
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leakAlex Gleason152+4747-870
SimplePolicy: filter string ObjectsAlex Gleason2+26-1
SimplePolicy: filter nested objectsAlex Gleason2+22-1
Merge remote-tracking branch 'upstream/develop' into earmarkAlex Gleason1249+19492-9559
Fix failing remote mentions test, valid TLDsAlex Gleason1+3-3
Delete obsolete EarmarkRendereTests (moved to UtilsTest)Alex Gleason1+0-79
Remove Pleroma.Formatter.minify/2Alex Gleason4+0-20
Upgrade Earmark 1.4.15Alex Gleason2+3-3
Merge branch 'oauth-token-id' into 'develop'feld4+28-4
Merge remote-tracking branch 'upstream/develop' into oauth-token-idAlex Gleason1+4-0
Merge branch 'maybe-fix-ci' into 'develop'feld1+4-0
CI: Purge pleroma build directory between runsAlex Gleason1+4-0
CHANGELOG: Return OAuth token `id`Alex Gleason1+1-0
Merge remote-tracking branch 'upstream/develop' into oauth-token-idAlex Gleason81+2057-323
Merge branch 'gitlab-ci-mix-lock' into 'develop'Haelwenn1+6-4
Cache gitlab-ci based on mix.lockAlex Gleason1+6-4
Merge branch 'fix/delete_activities_timeout' into 'develop'Haelwenn3+22-1
Fixed pleroma.user delete_activities mix task.Mark Felder1+1-0
Cleanup and ensure we obey custom Repo timeoutMark Felder1+10-1
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_evalMark Felder1+1-0
Try to set query timeout intelligentlyMark Felder1+2-1
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix TaskMark Felder1+9-0
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.Mark Felder1+1-1
Apply lanodan's suggestion(s) to 1 file(s)Haelwenn1+1-1
Apply lanodan's suggestion(s) to 1 file(s)Haelwenn1+1-1
Apply lanodan's suggestion(s) to 1 file(s)Haelwenn1+1-1
Apply lanodan's suggestion(s) to 1 file(s)Haelwenn1+1-1
Merge branch 'fix/docs' into 'develop'feld1+1-1
Fix incorrect shell commandMark Felder1+1-1
Merge branch 'feature/opt-out-of-google-floc' into 'develop'feld2+3-1
Add CHANGELOG entrySean King1+1-0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-flocSean King1+1-1
Merge branch 'fix/tests' into 'develop'feld1+1-1
Fix error response which was breaking tests related to pinned postsMark Felder1+1-1
Add opting out of Google FLoC to HTTPSecurityPlug headersSean King1+2-1
Apply rinpatch's suggestion(s) to 1 file(s)rinpatch1+1-1
Merge branch 'features/ingestion-ecto-tag' into 'develop'rinpatch24+166-69
Merge branch 'feature/521-pinned-post-federation' into 'develop'rinpatch41+1466-128
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'rinpatch4+61-9
Merge branch 'fix/notifsettings-breaking-login' into 'develop'Haelwenn2+18-0
Merge branch 'develop' into 'fix/notifsettings-breaking-login'feld5+88-4
Merge branch 'fix/mastodon-interface-docs-link' into 'develop'Haelwenn1+1-1
Fix Mastodon interface linkSean King1+1-1
Merge branch 'fix/adminapi-concurrent-limiter' into 'develop'feld3+36-1
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in testMark Felder2+8-13
Improve string_to_elixir_types/1 with guardsMark Felder1+5-3
Document fixed ability to save ConcurrentLimiter settings in ConfigDBMark Felder1+1-0
Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1Mark Felder1+4-2
Initial test validating the AdminAPI issueMark Felder1+35-0
Merge branch 'fix/instance-thumbnail-url' into 'develop'Haelwenn3+45-1
Fix assignment / assertionMark Felder1+2-2
Validate custom instance thumbnail set via AdminAPI produces correct URLMark Felder2+43-0
Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFEMark Felder1+2-1
release runtime provider fix for pathsAlexander Strizhakov3+10-17
test/pleroma/web/common_api_test.exs: Strip : around emoji key-nameHaelwenn (lanodan) Monnier1+2-2
fetcher_test: Remove assert on fake Create having an ap_idHaelwenn (lanodan) Monnier1+1-2
utils: Fix maybe_splice_recipient when "object" isn’t a mapHaelwenn (lanodan) Monnier3+9-4
fetcher_test: Fix missing mock functionHaelwenn (lanodan) Monnier1+8-0
transmogrifier: Fixing votes from Note to AnswerHaelwenn (lanodan) Monnier2+21-8
Object.Fetcher: Fix getting transmogrifier reject reasonHaelwenn (lanodan) Monnier1+3-0
NoteHandlingTest: remove fix_explicit_addressing-related testHaelwenn (lanodan) Monnier1+6-36
ActivityPubControllerTest: Apply same addr changes to objectHaelwenn (lanodan) Monnier2+26-9
Fix addressingHaelwenn (lanodan) Monnier3+23-18
recipients fixes/hardening for CreateGenericValidatorHaelwenn (lanodan) Monnier4+83-50
Pipeline Ingestion: NoteHaelwenn (lanodan) Monnier19+203-180
ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaultsHaelwenn (lanodan) Monnier10+51-37
Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressingHaelwenn (lanodan) Monnier2+19-38
Move tag fixup to object_validatorHaelwenn (lanodan) Monnier2+26-20
Merge branch 'chore/CHANGELOG' into 'develop'feld1+6-1
Fix CHANGELOG entry meant for next releaseMark Felder1+6-1
Document user login failure fix for NULL notification_settingsMark Felder1+1-0
Enforce user.notification_settings is NOT NULLMark Felder1+17-0
object_validators: Mark validate_data as privateHaelwenn (lanodan) Monnier18+18-18
Insert string-hashtags in PipelineHaelwenn (lanodan) Monnier3+24-24
pipeline_test: Fix usage of %Activity{}Haelwenn (lanodan) Monnier3+19-8
TagValidator: NewHaelwenn (lanodan) Monnier6+93-13
Merge branch 'revert-c368bf6d' into 'develop'Haelwenn1+1-1
Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"Haelwenn1+1-1
Merge branch 'refactor/object_validator_validate' into 'develop'rinpatch1+22-113
object_validator: Refactor most of validate/2 to a generic blockHaelwenn (lanodan) Monnier1+22-113
Merge branch 'patch-fix-open-api-spec' into 'develop'rinpatch1+1-1
date-times are always stringsMiss Pasture1+1-1
Merge branch 'upstream/mrf-followbot' into 'develop'feld6+211-0
Fix function calls due to module name changeMark Felder1+4-4
Temp file leaked, oopsMark Felder1+0-126
Add more details to the cheatsheat for FollowBot MRFMark Felder1+1-1
Prefer FollowBot naming convention vs FollowbotMark Felder4+185-59
Document new FollowBot MRFMark Felder1+1-0
More tests to validate Followbot is behavingMark Felder1+84-0
Remove Task.async as it is broken here and probably a premature optimization anywayMark Felder1+18-25
Only need to validate a follow request is generated for nowMark Felder1+42-0
RevertMark Felder1+0-14
Do not try to follow local users. Their posts are already available locally on the instance.Mark Felder1+2-1
Change module name to FollowbotPolicyMark Felder2+65-80
Add follow_requests_outstanding_since?/3 to Pleroma.ActivityMark Felder1+14-0
LintMark Felder1+4-1
Better checking of previous follow request attemptsMark Felder1+1-1
Prevent duplicates from being processedMark Felder1+1-0
Make the followbot only dispatch follow requests once per 30 day periodMark Felder1+23-4
Apply 1 suggestion(s) to 1 file(s)feld1+1-1
Support for configuration via AdminFEMark Felder1+17-0
Enforce that the followbot must be marked as a bot.Mark Felder1+4-3
Document :mrf_follow_botMark Felder1+6-0
Try to handle misconfiguration scenarios gracefullyMark Felder1+37-22
Upstream original followbot implementationMark Felder2+43-0
tests for release config providerAlexander Strizhakov4+70-11
reading the file, instead of config keywordAlexander Strizhakov1+1-1
expanding validatorAlexander Strizhakov2+20-26
expanding AddRemoveValidatorAlexander Strizhakov4+27-26
removeing corresponding add activityAlexander Strizhakov4+78-0
separate test file for featured collectionAlexander Strizhakov2+172-163
moving fixture into mastodon folderAlexander Strizhakov2+1-1
not neededAlexander Strizhakov1+0-41
refetch user on incoming add/remove activityAlexander Strizhakov4+90-2
featured_address valition in AddRemoveValidatorAlexander Strizhakov7+55-13
validator renaming & add validation for targetAlexander Strizhakov7+69-49
mastodon pinsAlexander Strizhakov4+146-4
Let pins federateAlexander Strizhakov38+1128-123
Return token's primary key with POST /oauth/tokenAlex Gleason3+27-4
Merge branch 'fix/2585-config-migration-dir' into 'develop'feld4+85-18
changelog entryAlexander Strizhakov1+5-1
suggestionAlexander Strizhakov1+1-1
migrating config to tmp folderAlexander Strizhakov3+80-17
Merge branch 'fix/copy-emoji-summary' into 'develop'Haelwenn4+111-0
Copy emoji in the subject from parent postrinpatch4+111-0
Merge branch 'fix/2579-finger-content-type' into 'develop'rinpatch5+145-73
Merge branch 'richmedia-workaround' into 'develop'rinpatch1+25-3
Merge branch 'fix/timex-retired-version' into 'develop'feld1+3-3
updating timexAlexander Strizhakov1+3-3
respect content-type header in finger requestAlexander Strizhakov5+145-73
Merge branch 'mediaproxy-decode' into 'develop'rinpatch2+6-2
Merge branch 'fix/remove_auto_nsfw' into 'develop'rinpatch15+187-62
Merge branch 'bugfix/bridgy-user-icon' into 'develop'rinpatch3+118-15
Merge branch 'update_open_api_spex' into 'develop'Haelwenn10+30-35
Merge branch 'feature/object-hashtags-rework' into 'develop'rinpatch46+1344-160
OpenAPI: TwitterAPI Util ControllerHaelwenn (lanodan) Monnier3+368-95
TwitterAPI: Remove unused read notification functionHaelwenn (lanodan) Monnier1+0-13
Remove deprecated /api/qvitter/statuses/notifications/readHaelwenn (lanodan) Monnier4+3-88
OpenAPI: PleromaAPI UserImport ControllerHaelwenn (lanodan) Monnier2+2-1
OpenAPI: MastodonAPI Status ControllerHaelwenn (lanodan) Monnier1+3-2
OpenAPI: MastodonAPI Account Controller, excluding OAuthHaelwenn (lanodan) Monnier1+6-6
Verify MastoFE Controller put_settings responseHaelwenn (lanodan) Monnier1+1-1
OpenAPI: MastodonAPI Conversation ControllerHaelwenn (lanodan) Monnier1+2-1
OpenAPI: MastodonAPI Media ControllerHaelwenn (lanodan) Monnier2+2-1
OpenAPI: MastodonAPI Timeline ControllerHaelwenn (lanodan) Monnier2+10-9
Add support for actor icon being a list (Bridgy)Haelwenn (lanodan) Monnier3+118-15
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+21-23
Prefer naming this function build_image_url/2Mark Felder1+5-5
Translated using Weblate (Italian)Ben Is1+21-23
[#3213] Code formatting fix.Ivan Tashkinov1+2-1
[#3213] Background migration infrastructure refactoring. Extracted BaseMigrator and BaseMigratorState.Ivan Tashkinov5+385-321
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov1+2-7
Merge branch 'improve-gitlab-ci' into 'develop'rinpatch1+1-6
Execute mix deps.get earlier and avoid duplicate invocations if possibleMark Felder1+1-6
Leverage function pattern matching insteadMark Felder1+26-10
Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771Mark Felder1+9-3
Merge branch 'fix/spec-build' into 'develop'feld1+2-2
Revert "See if switching to same image as releases fixes the build"Mark Felder1+1-1
See if switching to same image as releases fixes the buildMark Felder1+1-1
Ensure we fetch deps during spec-build stageMark Felder1+2-2
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov8+542-127
Merge branch 'openapi/admin/user' into 'develop'Haelwenn8+542-127
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov8+69-54
[#3213] Performance optimization of filtering by hashtags ("any" condition).Ivan Tashkinov3+55-38
Make tests use itMark Felder1+1-2
Add simple way to decode fully qualified mediaproxy URLsMark Felder1+5-0
Update OpenApiSpex dependencyEgor Kislitsyn10+30-35
Add UserOperation to RedocEgor Kislitsyn2+13-12
[#3213] ActivityPub hashtags filtering refactoring. Test fix.Ivan Tashkinov5+14-21
Merge branch 'mergeback/2.3.0' into 'develop'lain5+39-45
Changelog: Re-add application supportlain1+2-0
Revert "StatusController: Deactivate application support for now."lain2+9-12
Changelog, mix: merge in stablelain2+5-1
Merge branch 'fix-migration' into 'develop'Haelwenn1+1-1
Fix migration in cases where database name has a hyphenMark Felder1+1-1
Merge branch 'fix/inconsistent-reference' into 'develop'Haelwenn1+7-7
Merge branch 'fix/useless-header' into 'develop'Haelwenn1+0-2
Make the object reference in both render("show.json", _) functions consistently namedMark Felder1+7-7
Remove useless header on the get requestMark Felder1+0-2
Merge branch 'release/2.3.0' into 'stable'lain1282+28394-14452
Merge branch 'application-to-generator' into 'develop'feld2+24-1
Actually test viewing status after ingestionMark Felder1+10-0
Test both ingestion of post in the status controller and the correct response during the viewMark Felder1+11-0
Fix build_application/1 matchMark Felder1+3-1
Add OpenAPI spec for AdminAPI.UserControllerEgor Kislitsyn7+539-125
Mix: Update linkify.lain2+2-2
Linting.lain1+8-7
Changelog: Remove application support line.lain1+0-1
StatusController: Deactivate application support for now.lain2+11-9
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov175+1495-412
Mix: Update version numberlain1+1-1
Update changeloglain1+1-4
Document user agent leak fixMark Felder1+4-0
user_agent_mock --> request_mockAlex Gleason1+4-4
Never forward the client's user-agent through the media proxyAlex Gleason2+26-38
Merge branch 'update-frontend-2021-03-01' into 'develop'lain135+253-253
Update frontendlain135+253-253
Merge branch 'application-to-generator' into 'develop'Haelwenn5+10-10
Store application details in the object under the generator key, not application keyMark Felder5+10-10
Merge branch 'feld-develop-patch-26755' into 'develop'feld1+0-1
Update CHANGELOG.mdfeld1+0-1
Merge branch 'fix/warning-in-test' into 'develop'lain1+4-4
Merge branch 'features/reports-enhancements' into 'develop'lain6+286-2
warning fixAlexander Strizhakov1+4-4
Merge branch 'admin-api-versioning' into 'develop'lain7+145-113
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'lain5+597-10
Merge branch 'feat/client_app_details' into 'develop'lain11+103-19
Simplify migrationMark Felder1+1-7
Remove sensitive-property setting #nsfw, create HashtagPolicyHaelwenn (lanodan) Monnier15+187-62
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'lain3+53-2
Merge branch 'fix/repo-terminate' into 'develop'lain1+5-1
don't use continue in Stats init for test envAlexander Strizhakov1+5-1
Store the client application data in ActivityStreams formatMark Felder3+13-6
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'feld6+40-4
Merge branch 'ecto-rollback-in-test-env' into 'develop'feld2+4-3
Merge branch 'PestToast-develop-patch-66930' into 'develop'rinpatch1+1-1
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.PestToast1+1-1
Note our upgrade path for this functionalityMark Felder1+1-0
Leave a note for future explorersMark Felder1+2-0
No need to filter out Mix.env() from the API routes.Mark Felder2+2-7
Improved recursion through the api route listMark Felder1+3-5
Filter out MIX_ENV from route list and add a testMark Felder2+35-1
Enum instead of StreamMark Felder1+1-1
Attempt to filter out API calls from FrontendStatic plugMark Felder2+23-2
Merge branch 'gitignore' into 'develop'Haelwenn1+5-0
Vi and emacs temp filesMark Felder1+5-0
Merge branch 'docfix/chat-token' into 'develop'Haelwenn1+1-1
Update terminology in differences_in_mastoapi_responses.mdzonk1+1-1
[#3213] `mix pleroma.database rollback` tweaks.Ivan Tashkinov1+4-5
Merge branch 'fix/whalebird-url' into 'develop'feld1+1-1
Merge branch 'chore/no-activitypub-sleeps' into 'develop'lain1+1-1
Fix URL of Whalebird in docsAkiraFukushima1+1-1
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov61+548-525
[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.Ivan Tashkinov8+31-32
Merge branch '2534-pleroma-endpoint-earlier-init' into 'develop'rinpatch1+2-2
Apply i1t's suggestion(s) to 1 file(s)Ivan Tashkinov1+1-1
[#3213] `hashtags`: altered `name` type to `text`. `hashtags_objects`: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.Ivan Tashkinov6+76-53
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).Ivan Tashkinov1+2-2
Update the documentation to use make it use /api/v1/pleroma instead of /api/pleromaeugenijm4+113-109
Video: Handle peertube videos only stashing attachments in x-mpegURLHaelwenn (lanodan) Monnier5+597-10
Reroute /api/pleroma to /api/v1/pleromaeugenijm3+32-4
Merge branch 'revert/changelog' into 'develop'feld1+0-1
Revert changelog entry that leaked from another branch.Mark Felder1+0-1
Merge branch 'fix/filters' into 'develop'Haelwenn4+9-7
Document HeifToJpeg and its requirement of libheif's heic-convert toolMark Felder1+1-0
Exiftool also cannot strip from heic files.Mark Felder1+2-1
Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startupMark Felder3+6-6
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remoteMark Felder1+1-1
Permit :disclose_client in changesetsMark Felder1+2-1
Tests to validate client disclosure obeys user settingMark Felder2+27-5
Add field to user schema for controlling disclosure of client detailsMark Felder2+16-0
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by defaultMark Felder4+7-9
[#3213] Experimental / debug feature: `database: [improved_hashtag_timeline: :preselect_hashtag_ids]`.Ivan Tashkinov1+35-12
[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.Ivan Tashkinov5+84-31
expires_in in scheduled status paramsAlexander Strizhakov6+40-4
Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'rinpatch1+4-2
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'Haelwenn37+158-342
OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitionsrinpatch16+30-45
OpenAPI: Add `admin:` scope prefix to admin operationsrinpatch13+54-54
Remove `:auth, :enforce_oauth_admin_scope_usage`rinpatch9+75-244
Enhance reports in Pleroma API: index, showHaelwenn (lanodan) Monnier6+286-2
Merge branch 'test-docker-images' into 'develop'rinpatch1+24-0
Do not want these interfering with develop buildsMark Felder1+24-1
Make it possible to generate custom docker images by prefixing the branch name with "build-docker"Mark Felder1+1-0
Merge branch 'chore/documentation-relicensing' into 'develop'Haelwenn1+7-0
Merge branch 'feat/chat-list-pagination' into 'develop'Haelwenn5+196-127
Merge branch 'remove-conversation-api' into 'develop'rinpatch8+76-9
Merge branch '2510-oauth-app-tokens-further-support' into 'develop'rinpatch7+70-34
Chats: Introduce /api/v2/pleroma/chats which implements paginationrinpatch5+196-127
Merge branch 'update-default-avatar' into 'develop'rinpatch2+1-0
[#3213] Fixed `HashtagsTableMigrator.count/1`.Ivan Tashkinov1+9-6
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov8+31-112
[#3213] HashtagsTableMigrator state management refactoring & improvements (proper stats serialization etc.).Ivan Tashkinov3+122-67
ChatMessage schema: Add `unread` propertyrinpatch1+4-2
Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'rinpatch1+5-9
Relicense documentation under CC-BY-4.0rinpatch1+7-0
[#3213] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.Ivan Tashkinov3+31-17
Add API endpoint to remove a conversationEgor Kislitsyn8+76-9
update changelog to mention change of avatarShpuld Shpuldson1+1-0
replace avi.pngShpuld Shpuldson1+0-0
Merge branch 'chore/mailmap' into 'develop'rinpatch1+1-0
Add myself to .mailmaprinpatch1+1-0
[#2053] Changed `Notification/for_user_query/2` to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from `users`.Ivan Tashkinov1+5-9
[#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).Ivan Tashkinov6+51-22
Additional validation so we don't get caught off guard with a nil response if CommonAPI ever prevents us from injecting this dataMark Felder1+6-0
Inject fake application metadata and validate it is stripped by transmogrifierMark Felder2+8-2
App is already preloaded into the token, so avoid an extra queryMark Felder2+4-12
Merge branch 'not-used-mock' into 'develop'rinpatch5+0-103
Merge branch 'bugfix/answer-outbox' into 'develop'rinpatch1+25-0
Use a custom oauth token so we can predict and validate the client_name and websiteMark Felder1+12-3
Document the application metadata is now retained as part of the post.Mark Felder1+1-0
Validate client application metadata is retained in the objectMark Felder1+17-0
ConsistencyMark Felder1+1-1
Revert to original formatting for these function defsMark Felder1+1-4
Prefer naming this put_application because we're putting it into the params mapMark Felder1+4-4
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.Mark Felder1+7-6
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov93+2025-779
[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.Ivan Tashkinov6+114-102
[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.Ivan Tashkinov7+70-34
not used mockAlexander Strizhakov5+0-103
Merge branch 'fix/no-version-api-pleroma-social' into 'develop'Haelwenn2+4-1
Rendering fallback for when we don't have valid data availableMark Felder1+2-2
Enable rendering of the client application data detailsMark Felder1+2-8
Ensure we capture the application details into the objectMark Felder2+17-4
Add a function to lookup client app details by the app_idMark Felder1+10-0
Merge branch 'features/ap_id-c2s-authentication' into 'develop'rinpatch4+168-23
OpenAPI spec: Do not show build enviroment in the spec versionrinpatch1+2-1
OpenAPI spec task: Load pleroma application to get version inforinpatch1+2-0
Merge branch 'new-user-emails' into 'develop'feld6+70-15
LintMark Felder1+0-1
Revert "Add plaintext support for all emails except the digest"Mark Felder1+0-7
Merge branch 'develop' into 'new-user-emails'feld15+451-125
Merge branch 'feat/mrf-noemptypolicy' into 'develop'Haelwenn3+216-0
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.Mark Felder3+216-0
Merge branch 'fix/rss-link' into 'develop'rinpatch1+2-1
RSS: Make sure post URL is the first `<link>` elementrinpatch1+2-1
Merge branch 'chore/descriptions-improvements' into 'develop'rinpatch1+9-6
activity_pub_controller: Add authentication to object & activity endpointsHaelwenn (lanodan) Monnier4+168-23
Improve various descriptions and labelsMark Felder1+8-5
Make the suggestion match the default valueMark Felder1+1-1
Merge branch 'docs/improve-mailer-settings-desc' into 'develop'feld2+75-111
Merge branch 'develop' into 'docs/improve-mailer-settings-desc'feld11+149-8
Improved Mailer descriptionsMark Felder2+4-3
Merge branch 'fix/reports-from-admins' into 'develop'rinpatch4+18-2
[#3213] Partially addressed code review points. migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).Ivan Tashkinov9+63-42
Alpha-sort adapters Add various labels, descriptions and suggestions for all adapter settings and try to use the same terminology by the service provider.Mark Felder1+47-54
Move Enabled to top as it's the master control of all email. Description not really needed.Mark Felder1+4-5
More description improvementsMark Felder1+9-8
Update SMTP error description and default valueMark Felder1+2-2
Update Swoosh docs URL, lintMark Felder1+2-2
There is no reason to expose these Local adapter settings either.Mark Felder1+0-20
Remove No MX lookups settingMark Felder1+0-7
Improve SMTP adapter setting descriptionsMark Felder1+19-20
No reason to suggest users try the useless "Local" mail adapterMark Felder1+2-4
Merge branch 'feat/allow_alt_text_search_config' into 'develop'rinpatch6+123-5
Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs fileshyperion6+123-5
Merge branch 'varnish-large-files' into 'develop'feld1+7-0
Add a default rule to not attempt to cache any files larger than 50MBMark Felder1+7-0
Slightly better formattingMark Felder1+1-1
Add plaintext support for all emails except the digestMark Felder1+7-0
LintMark Felder1+1-0
Add basic test to validate the registration email is dispatched when the others are disabledMark Felder1+20-0
Actually send the mailMark Felder1+1-0
Added: New user registration mailMark Felder1+1-0
Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabledMark Felder2+32-0
Improve confirmation email languageMark Felder1+2-2
Also make this maybe_ for consistencyMark Felder3+6-6
These welcome emails are not guaranteed and can be private functionsMark Felder1+7-7
Merge branch 'develop' into fix/reports-from-adminsMark Felder11+39-23
Merge branch 'chore/fix-mix-env' into 'develop'feld3+11-7
Standardize the way we capture and use Mix.env()Mark Felder3+11-7
Merge branch 'fix/configdb-error' into 'develop'feld3+4-4
Merge branch 'bugfix/notice-external-redirect' into 'develop'Haelwenn3+14-11
Redirect non-local activities when /notice/:id is usedHaelwenn (lanodan) Monnier3+14-11
Merge branch 'chore/external-emoji-example' into 'develop'Haelwenn3+11-2
Load an emoji.txt specific to the test envMark Felder3+11-2
Document admin actors not getting report notificationsMark Felder1+1-0
Validate admin making report doesn't get their own report notification, but other admins doMark Felder1+14-0
Exclude reporter from receiving notifications from their own reports. Currently only works if the reporting actor is an admin, but if we include moderators with those who receive notification reports it will work for them.Mark Felder2+3-2
Merge branch 'fix/openapi-relationship-nullable' into 'develop'rinpatch3+3-3
Account schema: specify that pleroma.relationship is nullablerinpatch3+3-3
Merge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'rinpatch1+1-1
CI: Forgot $ in spec-deployrinpatch1+1-1
Merge branch 'fix/2412-filters' into 'develop'feld11+710-235
Merge branch 'develop' into 'fix/2412-filters'feld283+2055-1043
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'feld7+121-63
Merge branch 'feature/2438-users-posts-total-count' into 'develop'feld6+124-63
Merge branch 'fix/deploy-api-docs' into 'develop'rinpatch1+4-1
CI: Add job ref when calling api docs builderrinpatch1+4-1
Merge branch 'feat/openapi-spec-export' into 'develop'rinpatch39+334-229
Improve OpenAPI spec and deploy it to api.pleroma.socialrinpatch39+334-229
Add test for Answer presence into an authenticated /outboxHaelwenn (lanodan) Monnier1+25-0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov168+1062-314
Merge branch 'a1batross-develop-patch-62810' into 'develop'feld2+8-4
Merge branch 'email-stub-in-verify-credentials' into 'develop'feld10+67-15
Merge branch 'develop' into a1batross-develop-patch-62810Mark Felder8+159-14
Merge branch 'develop' into a1batross-develop-patch-62810Mark Felder158+846-281
Mix pleroma.instance creates parent directories nowMark Felder1+1-0
Merge branch 'fix/majic-nits' into 'develop'feld4+5-4
Document OAuth 2.0 provider fqn field additionMark Felder1+1-0
Merge branch 'fix/2411-mutes-api' into 'develop'feld5+154-10
Document we are disabling the extension fixup in MajicMark Felder1+1-0
Merge branch 'develop' into fix/majic-nitsMark Felder158+846-281
Merge branch 'develop' into 'fix/2411-mutes-api'feld225+1170-648
Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'feld3+31-1
Merge branch 'feature/2164-unify-api-arguments' into 'develop'feld8+376-20
Improve changelog descriptionMark Felder1+1-1
Merge branch 'develop' into 'feature/2164-unify-api-arguments'feld12+168-7
Merge branch 'fix/attachment-cleanup' into 'develop'feld1+8-6
Merge branch 'active-user-count' into 'develop'feld11+160-1
fix for test warningsAlexander Strizhakov1+2-2
fix for scheduled post with pollAlexander Strizhakov6+119-61
only_remote -> remote renamingAlexander Strizhakov5+29-31
`/api/v1/accounts/:id/statuses` docs updateAlexander Strizhakov2+13-3
more tests and update for docs and changelogAlexander Strizhakov4+192-74
list timeline filtration by paramsAlexander Strizhakov4+145-76
only_media & only_remote docs and changelogAlexander Strizhakov2+6-1
added only_media flag to home timelineAlexander Strizhakov2+61-0
expanding filtration for home timelineAlexander Strizhakov4+95-0
Merge branch 'update-frontend-2021-02-01' into 'develop'rinpatch135+254-254
Update frontendLain Soykaf135+254-254
[#3213] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.Ivan Tashkinov2+67-59
[#3213] ActivityPub: temporarily reverted to previous hashtags filtering implementation due to blank results issue.Ivan Tashkinov1+54-52
[#3213] Explicitly defined PKs in hashtags_objects and data_migration_failed_ids. Added "pleroma.database rollback" task to revert a single migration.Ivan Tashkinov4+31-5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov85+672-435
[#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.Ivan Tashkinov3+81-154
[#3213] Added HashtagsCleanupWorker periodic job.Ivan Tashkinov5+62-0
Merge branch 'emoji-cache' into 'develop'feld1+12-0
Merge branch 'fix/configdb-missing-s3-region' into 'develop'feld1+6-0
Add missing :ex_aws, :s3, :region settingMark Felder1+6-0
[#3286] Documentation on configuring Pleroma as OAuth 2.0 provider.Ivan Tashkinov2+17-8
like thisAlexander Strizhakov1+12-12
support for with_relationships parameterAlexander Strizhakov5+155-11
[#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.Ivan Tashkinov3+28-8
Improve error message for ConfigDBMark Felder3+4-4
Make attachment cleanup jobs a noop if the setting is disabled.Mark Felder1+8-6
Switch to a build of Majic that does not try to fix extensions by defaultMark Felder3+4-4
Make sure active_user_count/1 counts only local usersEgor Kislitsyn2+3-1
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.Ivan Tashkinov7+49-7
changelog entryAlexander Strizhakov1+1-0
fix and delete purge activities duplicatesAlexander Strizhakov2+30-1
fix for unique oban worker optionAlexander Strizhakov1+1-1
fix formatAlibek Omarov1+1-1
mix: instance: ensure all needed folders are created before generating configAlibek Omarov1+7-4
cache headers for emoji and imagesAlexander Strizhakov1+12-0
Update CHANGELOGEgor Kislitsyn1+1-0
Add testsEgor Kislitsyn3+97-0
Add active user countEgor Kislitsyn7+60-1
Merge branch 'chore/tests-use-clear_config' into 'develop'lain69+325-368
added totalAlexander Strizhakov5+44-24
added totalAlexander Strizhakov6+80-39
Merge branch 'service-worker-allowed-header' into 'develop'feld5+51-3
Convert tests to all use clear_config instead of Pleroma.Config.putMark Felder69+325-368
Merge branch '2435-list-multiple-users' into 'develop'Haelwenn3+19-5
Merge branch 'develop' into '2435-list-multiple-users'lain325+3623-2026
support for expires_in/expires_at in filtersAlexander Strizhakov11+710-235
Merge branch 'fix/missing-own_votes' into 'develop'Haelwenn4+110-13
Merge branch 'docs/apache-config' into 'develop'feld8+149-46
CredoMark Felder1+1-1
Clarify the state of mediaproxy cache invalidation for ApacheMark Felder1+1-1
Note the requirement for the url_format parameterMark Felder1+7-0
Add sudo rule, remove quoting that breaks the for loopMark Felder1+7-3
Merge branch 'develop' into docs/apache-configMark Felder219+1969-1460
[#3213] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.Ivan Tashkinov1+0-1
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov217+1963-1455
[#3213] Switched to using embedded hashtags in Object.hashtags/1 (to avoid extra joins / preload in timeline queries).Ivan Tashkinov2+5-14
Merge branch 'refactor/deactivated_user_field' into 'develop'feld213+1959-1451
Ensure consistent behavior between pleroma.user activate/deactivate mix tasksMark Felder2+22-9
little refactor and testsAlexander Strizhakov3+101-24
Document pleroma.user activate mix taskMark Felder1+13-0
Provide pleroma.user mix task for both activate and deactivateMark Felder3+50-1
Document removal of toggle_activatedMark Felder1+2-1
Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eaeMark Felder135+1696-1220
Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71fMark Felder35+44-44
Merge branch 'develop' into refactor/deactivated_user_fieldMark Felder48+1066-214
[#3213] Speedup of HashtagsTableMigrator (query optimization). State handling fix.Ivan Tashkinov2+19-3
Merge branch 'fix/minor-doc-fix' into 'develop'rinpatch4+4-4
add missing sudo prefix in install doc𝑓4+4-4
Include own_votes in the poll dataMark Felder3+27-7
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov3+6-5
Merge branch 'fix/tag-urls' into 'develop'Haelwenn3+6-5
Make tag urls absoluteMark Felder3+6-5
Document improved Apache supportMark Felder1+1-0
Add Invalidation Script url_format settingMark Felder1+9-2
Test URL formattingMark Felder1+26-0
Improve descriptionMark Felder1+1-1
rename functionMark Felder1+3-3
Add ability to invalidate cache entries for ApacheMark Felder4+50-3
Allow to define custom HTTP headers per each frontendeugenijm5+39-15
Ability to set the Service-Worker-Allowed headereugenijm4+25-1
Update Apache configuration. This has been tested.Mark Felder1+51-40
[#3213] Ignoring of blank elements from objects.data->tag.Ivan Tashkinov2+19-0
[#3213] HashtagsTableMigrator: failures handling fix, retry function. Changed default hashtags filtering strategy to non-aggregate approach.Ivan Tashkinov4+47-22
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov172+1576-587
Merge branch 'limiter-setup-fix' into 'develop'feld6+79-3
Merge branch 'test-cases-mox-setup' into 'develop'lain4+19-39
changed naming in changelogAlexander Strizhakov2+2-2
use proper namingAlexander Strizhakov4+4-4
Update docsMark Felder1+3-3
Document ConcurrentLimiter for RichMedia and MediaProxyMark Felder1+2-0
configurable limits for ConcurrentLimiterAlexander Strizhakov4+75-1
Merge branch 'copyright-fun' into 'develop'feld1+29-1
Merge branch 'deprecate-public_endpoint' into 'develop'feld18+226-89
Consistent comment style for :ex_awsMark Felder1+1-1
Add bucket_namespace to be extra certain truncated_namespace worksMark Felder1+1-0
Merge branch 'update/oban' into 'develop'feld9+32-9
Merge branch 'fix/active-user-query' into 'develop'Haelwenn4+9-47
Special handling for unconfirmed users based on instance config no longer needed.Mark Felder1+0-8
Only need to test if unconfirmed users are successfully deletedMark Felder1+7-23
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.Mark Felder1+0-7
Special handling for unconfirmed users based on instance config no longer needed.Mark Felder1+1-9
use correct versions for oban migrationsAlexander Strizhakov3+6-3
Active users must be confirmedMark Felder1+1-0
[#3213] Performance-related stat in HashtagsTableMigrator. Reworked `count/_` to indicate approximate total count for current iteration.Ivan Tashkinov1+13-1
[#3213] `timeout` option for `HashtagsTableMigrator.count/_`.Ivan Tashkinov1+2-2
[#3213] Added `HashtagsTableMigrator.count/1`.Ivan Tashkinov1+29-13
Merge branch 'update-changelog-reblog-fix' into 'develop'lain1+1-0
Add Reblog fix to CHANGELOGEgor Kislitsyn1+1-0
Merge branch 'feat/improved-postgres-tuning-docs' into 'develop'lain2+24-16
Improve PostgreSQL optimization articlerinpatch2+24-16
Merge branch 'mergeback/2.2.2' into 'develop'rinpatch1+9-0
Merge branch 'stable' into mergeback/2.2.2rinpatch1+9-0
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+594-0
Mox mode setup tweak; refactoring.Ivan Tashkinov4+19-39
Translated using Weblate (Portuguese (Portugal))João Rodrigues1+120-110
Added translation using Weblate (Portuguese (Portugal))João Rodrigues1+584-0
Merge branch 'fix/reblog-api' into 'develop'feld3+34-1
Merge branch 'develop' into refactor/deactivated_user_fieldMark Felder118+392-356
Merge branch 'refactor/approval_pending_user_field' into 'develop'feld38+108-88
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202fMark Felder27+34-34
Document new is_approved attributeMark Felder1+1-0
Merge branch 'develop' into refactor/approval_pending_user_fieldMark Felder117+321-305
Merge branch 'refactor/confirmation_pending_user_field' into 'develop'feld116+318-301
Document new is_confirmed attributeMark Felder1+1-0
Keep *Breaking* at the topMark Felder1+1-1
Update AdminFE: pleroma/admin-fe@d4c7989f05f38fd4f30c234a13a6e51cac83be57Mark Felder83+163-163
Test that only author can reblog a private statusEgor Kislitsyn1+8-3
Fix Reblog APIEgor Kislitsyn3+29-1
Changelog: Add list fix.Lain Soykaf1+1-0
ListController: Fix being unable to add / remove users.Lain Soykaf2+18-5
Merge branch 'release/2.2.2' into 'stable'rinpatch138+382-326
pleroma-fe bundle: update to 320418d524a33c20d7d769c8d67a25be81f251ecrinpatch133+254-249
mix.exs: bump version to 2.2.2rinpatch1+1-1
CHANGELOG.md: Finalize 2.2.2 changelogrinpatch1+6-1
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'lain3+121-75
[#3213] Missing copyright header for HashtagsTableMigrator.State.Ivan Tashkinov1+4-0
Merge branch 'fix/changelog-entries' into 'develop'lain1+2-3
CHANGELOG.md: Remove wrong entries from Unreleased(patch)rinpatch1+2-3
update for retired elixir_make package versionAlexander Strizhakov1+1-1
[#3213] Feature lock adjustment for HashtagsTableMigrator.Ivan Tashkinov1+10-4
start oban app in migrations and mix tasksAlexander Strizhakov3+6-1
use explicitly oban migration versionAlexander Strizhakov1+7-2
[#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to `clear_config/_` to minimize such issues in future.Ivan Tashkinov6+35-33
[#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).Ivan Tashkinov6+84-51
mix.exs: Make copyright regexes more preciseHaelwenn (lanodan) Monnier1+6-5
mix.exs: Put template into one variable with ~s[]Haelwenn (lanodan) Monnier1+5-5
mix.exs: GNU sed doesn't into proper getopt()Haelwenn (lanodan) Monnier1+2-2
Add a mix alias to bump copyrightMark Felder1+11-1
Split out yearMark Felder1+2-2
Add mix alias to easily add copyright headers to filesMark Felder1+18-1
Update Oban to 2.3.4Mark Felder3+15-5
Merge branch 'fix/attachment-cleanup-queues' into 'develop'feld1+1-1
Only run one attachment cleanup job per nodeMark Felder1+1-1
Revert accidental blank line removalMark Felder1+1-0
Document removal of toggle_confirmedMark Felder1+0-1
Remove toggle_confirmation; require explicit state changeMark Felder11+36-40
Change user.confirmation_pending field to user.is_confirmedMark Felder29+121-101
ReadabilityMark Felder1+1-1
Make setting user activation status explicitMark Felder8+24-24
Remove toggle_activationMark Felder4+1-63
Add copyright headerMark Felder1+4-0
Remove User.restrict_deactivated/1Mark Felder2+4-8
Change user.deactivated field to user.is_activeMark Felder40+125-107
Further simplify changeset logicMark Felder1+1-2
Change user.approval_pending field to user.is_approvedMark Felder10+74-54
Merge branch 'optimize-command_available' into 'develop'Haelwenn1+4-1
Hack to fix tests not passing. Unclear why the filters are being set to nil. Both of these changes are needed or it doesn't work.Mark Felder2+3-1
Just validate command is in PATH; forking a shell is wastefulMark Felder1+4-1
LintMark Felder1+0-0
Bump Copyright yearMark Felder2+2-2
Add ConfigDB migrationMark Felder2+117-0
[#3213] Refactoring of HashtagsTableMigrator.Ivan Tashkinov3+79-47
BackupTest: Fix s3 test.Lain Soykaf1+3-6
Merge branch 'pleroma-password' into 'develop'rinpatch21+130-31
Linting.Lain Soykaf1+7-1
Pbkdf2: Use it everywhere.Lain Soykaf21+37-127
Password -> Password.Pbkdf2Lain Soykaf2+90-0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov916+3913-3478
[#3213] Prototype of data migrations functionality / HashtagsTableMigrator.Ivan Tashkinov11+316-64
Unnecessary duplication hereMark Felder1+0-2
Consistent styleMark Felder2+5-13
Not needed in test.exsMark Felder1+0-4
truncated_namespace should default to nilMark Felder3+6-4
LintingLain Soykaf1+5-1
Password: Replace Pbkdf2 with Password.lain18+29-30
Password: Add password modulelain3+91-1
Merge branch 'chores/bump-copyright' into 'develop'Haelwenn884+884-884
COPYING: Bump copyright to 2021Haelwenn (lanodan) Monnier1+1-1
Bump Copyright to 2021Haelwenn (lanodan) Monnier883+883-883
Switch another test to Upload.base_url/0Mark Felder1+1-1
Document deprecationMark Felder1+1-0
Fix tests relying on old behavior. Use the Upload.base_url, Luke.Mark Felder3+13-8
Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploaderMark Felder1+1-1
Fix another ad-hoc construction of the upload base_urlMark Felder1+2-14
Deprecate Pleroma.Uploaders.S3, :public_endpointMark Felder7+55-19
Merge branch 'fix/backup-url-on-s3' into 'develop'feld7+54-42
Merge branch 'chat-message-pagination' into 'develop'rinpatch2+5-5
Pagination: Don't be dos'd by random parameters.lain1+1-1
Simplify. We will always have a result from Upload.base_url/0, so just add it to the listMark Felder1+2-10
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domainsMark Felder1+9-9
ChatMessages: Fix pagination headers.lain2+5-5
FormattingMark Felder1+8-8
[#3213] transfer_hashtags mix task refactoring.Ivan Tashkinov1+59-68
Merge branch 'feat/format-optional-migrations' into 'develop'rinpatch1+1-1
.formatter.exs: Format optional migrationsrinpatch1+1-1
Merge branch 'add_some_information_about_setting_up_a_development_environment' into 'develop'rinpatch21+147-61
Add development sectionIlja21+147-61
Apply 4 suggestion(s) to 2 file(s)feld2+12-27
Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0Mark Felder2+23-16
More places we should be using Upload.base_urlMark Felder3+11-15
Avoid duplicate Config callsMark Felder1+3-2
Apply Upload.base_url for S3Mark Felder2+11-6
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebaseMark Felder2+27-1
Merge branch 'guppe-example' into 'develop'lain2+44-0
Merge branch 'confirm-users' into 'develop'lain2+62-0
Merge remote-tracking branch 'upstream/develop' into confirm-usersAlex Gleason94+497-458
Remove ConfirmUserPlugAlex Gleason3+0-61
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'lain3+115-75
Merge branch 'backup-ids' into 'develop'lain2+19-0
Backups: render ID in APIAlex Gleason2+19-0
Merge branch 'cleanup/unused-proxy-opts' into 'develop'lain2+8-9
ActivtityPub Test: Add example for guppe actorlain2+44-0
Merge branch 'object-normalize-refactor' into 'develop'lain77+269-246
Merge branch 'adminapi-user-email' into 'develop'lain3+18-0
Merge branch 'upstream/remote-emoji-support' into 'develop'lain3+16-1
[#3213] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids).Ivan Tashkinov3+20-15
Call ConfirmUserPlug from Router, not EndpointAlex Gleason2+1-2
Add AdminAPI.AccountViewTestAlex Gleason1+16-0
AdminAPI: return user emailAlex Gleason2+2-0
allow external emojiRoger Braun3+16-1
Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'feld1+17-120
Remove configurability of upload proxy opts, simplifyMark Felder2+8-9
Merge branch 'fix/emoji-encoding' into 'develop'lain4+17-1
Add test to validate URLs to custom emojis are properly encodedMark Felder1+15-0
Add dinosaur gif from https://gifs.ccMark Felder2+1-0
URI.encode custom emojisMark Felder1+1-1
Merge branch 'fix/pagination-regression' into 'develop'lain3+18-6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-userslain28+303-128
Merge branch '1526-account-aliases' into 'develop'lain13+79-12
User: Use ObjectID type to validate also-known-as fieldlain2+10-13
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliaseslain18+246-121
Merge branch 'pleroma-moderation-log-stuff' into 'develop'lain3+7-0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stufflain10+190-114
AccountControllerTest: Fix test logiclain1+9-7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactorlain10+190-114
Merge branch '2391-async-bugs' into 'develop'Haelwenn10+190-114
SideEffects.DeleteTest: asyncify.lain10+190-114
Add test to validate profile pagination works with keysetMark Felder1+13-0
Do not try to guess which pagination we need by the existence of an :offset param. Require explicit request to get offset pagination.Mark Felder2+3-6
Object: Rework how Object.normalize workslain77+269-246
AdminAPI: return id for moderation log entriesAlex Gleason3+7-0
Migration to confirm previously-logged-in usersAlex Gleason2+62-0
Merge branch 'fix/reports-ordering' into 'develop'feld3+27-2
Document reports ordering changeMark Felder1+1-0
Aliases: refactor validate_also_known_as/1Alex Gleason1+4-3
Apply 2 suggestion(s) to 1 file(s)Alex Gleason1+4-3
Ensure newest report is returned first in the listMark Felder1+25-0
Automatically confirm logged-in usersAlex Gleason3+62-0
Merge branch 'fix/adminapi-user-status-pagination' into 'develop'feld3+22-5
Apply 1 suggestion(s) to 1 file(s)feld1+1-1
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov2+3-3
Alternative implementation of hashtag-filtering queries in ActivityPub. Fixed GROUP BY clause for aggregation on hashtags.Ivan Tashkinov2+100-22
[#3213] Added query options support for Repo.chunk_stream/4. Used infinite timeout in transfer_hashtags select query.Ivan Tashkinov2+8-9
Render AKAs in Actor endpointsAlex Gleason2+8-1
Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason758+19095-9528
Make pagination type conditionalMark Felder1+7-1
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offsetMark Felder2+2-2
Support pagination in AdminAPI for user statusesMark Felder2+16-5
Do not reverse order of reports. We want newest ones sorted to the top.Mark Felder1+1-2
Merge branch 'deps/crypt-local-fork' into 'develop'lain2+3-3
[#3213] Made Object.object_data_hashtags/1 handle both AS2 and plain text hashtags.Ivan Tashkinov1+3-1
[#3213] Fixed Object.object_data_hashtags/1 to process only AS2 elements of `data.tag` (basing on #2984).Ivan Tashkinov1+10-2
[#3213] Improved `database.transfer_hashtags` mix task: proper rollback, speedup.Ivan Tashkinov1+25-21
Switch to local fork of crypt until upstream fixes ability to build on aarch64Mark Felder2+3-3
Merge branch 'revert-b122b6ff' into 'develop'Haelwenn24+72-165
Revert "Merge branch 'features/hashtag-column' into 'develop'"Haelwenn24+72-165
Merge branch 'features/hashtag-column' into 'develop'Haelwenn24+165-72
pleroma.database fill_old_hashtags: Add month_limit argumentHaelwenn (lanodan) Monnier2+45-35
Pleroma.Object/1: take %Object{} as argument insteadHaelwenn (lanodan) Monnier9+12-17
[#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.Ivan Tashkinov4+29-14
non condition dir creationAlexander Strizhakov1+1-11
changelog entryAlexander Strizhakov1+1-0
not neededAlexander Strizhakov1+1-2
insreasing test coverage for StealEmojiPolicyAlexander Strizhakov2+103-64
check dir existence in policyAlexander Strizhakov2+22-31
Add MRFs to the list of things that may need a soft rebootMark Felder1+2-1
Mark privateMark Felder1+1-1
Create dir for EmojiStealPolicy automaticallyMark Felder1+19-0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-reworkIvan Tashkinov206+690-451
[#3213] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to `hashtags` table.Ivan Tashkinov3+216-63
Merge branch 'cachex-test' into 'develop'lain204+667-438
Revert, this is useful in an edge caseMark Felder1+1-0
FormattingMark Felder1+4-5
Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFEMark Felder1+17-119
Remove Proxy settings that were not meant to exist under Pleroma.UploadMark Felder1+0-1
Add test/instance to .gitignoreMark Felder1+1-0
Merge branch 'update/linkify' into 'develop'lain3+3-2
Update Linkify to 0.4.1Mark Felder3+3-2
Merge branch 'mergeback/2.2.1' into 'develop'lain1+18-8
Align changeloglain1+18-8
Merge branch 'stable' into mergeback/2.2.1lain0+0-0
Merge branch 'release/2.2.1' into 'stable'lain79+2084-1225
Fixtures: Add application actor fixture.lain1+67-0
Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1lain1+3-3
Update changeloglain1+5-6
Apply 1 suggestion(s) to 1 file(s)lain1+4-4
Lintinglain1+2-1
Update frontendlain53+1590-1119
Mix: Update version.lain2+1-2
Update changeloglain1+3-0
Report fixes.lain9+271-39
Mix: Update linkify to 0.4.1lain4+6-6
[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.Ivan Tashkinov2+8-5
fix for elixir 1.11Alexander Strizhakov4+65-38
SideEffects: fix testlain1+1-1
User: Remove left-over (wrong) fix.lain1+0-1
User: Don't allow local users in remote changesetslain2+20-0
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfixMark Felder2+12-9
Update changeloglain1+1-0
Search: Only skip ordering the rum index.lain1+1-1
Activity search: Fix order of resultslain1+4-1
Document fixing the pleroma.user delete_activities mix taskMark Felder1+8-0
Need to start web_resp cache or mix task failsMark Felder1+1-1
Document S3 and Elixir 1.11 compat fixMark Felder1+1-0
Fix S3 uploads with Elixir 1.11Mark Felder2+2-2
pleroma.instance: Fix Exiftool module nameHaelwenn (lanodan) Monnier3+5-2
remove PurgeExpiredActivity from Oban db configAlexander Strizhakov1+19-0
Added Hashtag entity and objects-hashtags association with auto-sync with `data.tag` on Object update.Ivan Tashkinov6+144-10
possibility to run rollback in test envAlexander Strizhakov2+4-3
Merge branch 'update-elixir-make' into 'develop'feld1+1-1
update for retired elixir_make package versionAlexander Strizhakov1+1-1
Merge branch 'update/instance-gen-template' into 'develop'rinpatch1+1-2
Create Object.hashtags/1 wrapperHaelwenn (lanodan) Monnier7+20-20
Insert text representation of hashtags into object["hashtags"]Haelwenn (lanodan) Monnier22+141-53
Do not include pool_size in the template. It encourages unwanted fiddling :)Mark Felder1+1-2
Encapsulation of tags / hashtags fetching from objects.Ivan Tashkinov12+78-39
Merge branch 'develop' into 'develop'lain2+5-1
Lintinglain13+45-27
Tests: Stub the pipeline in all tests.lain2+18-0
Pipeline test: Switch from Mock to Mox.lain10+156-147
Tests: Add a helper method to reduce sleeping times in test.lain5+18-11
Lintinglain1+1-1
Test: More async/sync tweaks.lain11+53-19
Tests: More test fixes.lain3+7-2
XMLBuidlder test: Make async.lain1+1-1
Test config: Raise pool size for postgres.lain1+4-1
Tests: Make as many tests as possible async.lain134+141-137
Cachex: Unify arity of callback functionlain2+2-2
Caching: Add caching behavior, add null implementation.lain2+24-3
Fix trailing whitespaces in lib/pleroma/web/web_finger.exKaizhe Huang1+1-1
Merge branch 'fix/remove-sharelock-warning-oban-configdb' into 'develop'lain1+2-8
Merge branch 'bugfix/mastofe-install-script' into 'develop'rinpatch1+12-9
Add test for subscribe_address in JSON WebFinger responseKaizhe Huang1+2-1
config/description.exs: Remove outdated information about Obanrinpatch1+2-8
Tests: Use NullCache for async tests.lain13+119-11
Cachex: Make caching provider switchable at runtime.lain20+92-59
Jason: Remove by now superfluous jason_types filelain2+0-10
WebFinger: add subscribe_address in return data of JSON responsesFiveYellowMice1+3-0
Tests: Remove unneeded explicit cachex use.lain17+10-47
Tests: Reset all cachex caches between synchronous testslain2+19-4
Merge branch 'long-life-oauth-tokens' into 'develop'rinpatch2+14-1
[#2353] Virtually never-expiring OAuth tokens (new and already issued ones).Ivan Tashkinov2+14-1
Merge branch 'registration-workflow' into 'develop'feld12+221-73
Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason162+8936-2663
Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'lain15+47-28
download-mastofe-build.sh: Proper exit when artifact is missingHaelwenn (lanodan) Monnier1+12-9
Merge branch 'support/2255_posix_errors' into 'develop'lain10+504-58
Merge branch 'fix/config-gen-detect-exiftool' into 'develop'lain1+12-3
Merge branch 'weblate-pleroma-pleroma' into 'develop'lain1+64-64
Translated using Weblate (Chinese (Simplified))shironeko1+64-64
Merge branch 'chore/refactor-hide-counts' into 'develop'lain1+6-10
Minor refactoring of the logic for hiding followers/following counts.Mark Felder1+6-10
changelogAlexander Strizhakov1+5-4
Fix for dropping posts/notifs in WS when mix task is executedAlexander Strizhakov15+43-25
Merge branch 'fix/hackney-follow-redirects' into 'develop'rinpatch3+14-10
Fixed Rich Media PreviewsMark Felder1+2-1
Merge branch 'fix/tracking-majic' into 'develop'feld2+3-2
Majic: specify commit so source users do not get surprise updatesMark Felder2+3-2
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfixMark Felder2+12-9
instance.gen: Warn that stripping exif requires exiftoolrinpatch1+11-2
instance.gen task: Only show files which will be actually overwrittenrinpatch1+1-1
Use Pleroma.Formatter.markdown_to_html/1 in the testsMark Felder1+14-14
Update Earmark to 1.4.13, use the new compact_output modeMark Felder3+4-4
Fix AudioVideoValidator markdownAlex Gleason1+1-0
Upgrade linkify, test URL issues, fixes #2026 #1942Alex Gleason1+52-0
Refactor Earmark code, fix testsAlex Gleason6+14-8
Sanitizer: allow <hr> tagsAlex Gleason1+1-0
Remove some N/A testsAlex Gleason1+1-11
Improve Formatter.minify/2Alex Gleason1+4-1
Upgrade Earmark to v1.4.10Alex Gleason8+95-261
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+127-118
Translated using Weblate (Ukrainian)ZEN1+127-118
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+590-0
Added translation using Weblate (Ukrainian)ZEN1+590-0
Merge branch 'oauth-entities-expiration-tweaks' into 'develop'feld8+14-17
Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).Ivan Tashkinov8+14-17
Merge branch 'oauth-token-30-days-expiration' into 'develop'feld1+1-1
Changed default OAuth token expiration time to 30 days.Ivan Tashkinov1+1-1
Merge branch 'auth-improvements' into 'develop'lain45+959-776
Merge branch 'stream-follow-updates' into 'develop'lain32+271-156
[#3112] .gitattributes fix.Ivan Tashkinov1+4-3
Update CHANGELOGEgor Kislitsyn1+1-1
Merge branch 'feat/warn-large-pool-size' into 'develop'lain2+44-0
ApplicationRequirements: Add test, more text for pool size.lain2+27-2
Apply 1 suggestion(s) to 1 file(s)lain1+1-1
Merge branch 'features/favicon-unreachable-instance' into 'develop'feld3+24-6
Add a startup error for modified Repo pool_sizeMark Felder1+19-0
instance.reachable?: Limit to binary inputHaelwenn (lanodan) Monnier2+4-4
instance: Do not fetch unreachable instancesHaelwenn (lanodan) Monnier2+20-2
[#3112] Changelog entry.Ivan Tashkinov1+1-0
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov8+603-126
Merge branch 'feature/configdb-mix-tasks' into 'develop'lain8+603-126
Print out settings that will be removed when specifying the group and key for consistencyMark Felder1+33-4
FormattingMark Felder1+2-2
Slip in a test to ensure we can use the atom syntax in mix task argumentsMark Felder1+6-0
Apply 1 suggestion(s) to 1 file(s)feld1+2-0
Merge branch 'feature/configdb-mix-tasks-refactoring' into 'feature/configdb-mix-tasks'feld5+92-177
[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests. Minor fixes.Ivan Tashkinov5+92-177
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov24+5281-1094
[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.Ivan Tashkinov14+164-117
Fix typoEgor Kislitsyn1+2-2
Add entry announcing new ConfigDB mix tasksMark Felder1+1-0
Merge branch 'fix/mix-task-yn-prompt' into 'develop'feld3+5-11
Answer new prompt interactivelyMark Felder1+4-4
shell_yes?/1 was not showing the correct message and always defaults to yes which is dangerousMark Felder2+1-7
Merge branch 'issue/2256' into 'develop'feld7+336-288
More compact representationMark Felder1+1-3
Ensure deleting entire group prints out settings that will be removed before actually removing themMark Felder1+22-16
Fix deleting an entire group. Also utilize Pleroma.ConfigDB.delete/1Mark Felder1+4-2
Use Pleroma.ConfigDB.delete/1 instead of rolling our ownMark Felder1+1-3
Use Enum.any? to ensure we return true if there are resultsMark Felder1+1-1
Merge branch 'supported-emojos' into 'develop'rinpatch6+4914-784
config_db search methodsAlexander Strizhakov2+24-18
dump_key/2 no longer usedMark Felder1+0-10
Apply 6 suggestion(s) to 1 file(s)feld1+20-41
CredoMark Felder1+1-1
Docs, Changelog: Add info about regional indicatorslain2+3-3
Emoji: Also accept regional indicatorslain2+12-0
Merge branch '2339-local-remote-mixup' into 'develop'Haelwenn3+20-1
Merge branch 'update-linkify' into 'develop'feld3+4-6
Make the --force flag for reset command consistent with the others and deduplicate db truncationMark Felder1+17-10
Add --force flag for delete and reset commandsMark Felder3+170-47
Add comment for this mysterious behaviorMark Felder1+2-0
No need for a separate functions hereMark Felder1+6-12
Use a callback strategy to short circuit the functions and print a nice errorMark Felder2+205-171
Centralize check that configdb is enabled which now raises an exceptionMark Felder1+106-129
Left public during debuggingMark Felder1+2-2
Add tests for config dumpingMark Felder1+86-0
Use inspect instead of faking the outputMark Felder1+2-2
Remove unnecessary keys commandMark Felder1+0-28
Sync docs with mix commandsMark Felder1+40-8
The debug output is no longer there by defaultMark Felder1+1-14
Ensure scary warning starts on a new lineMark Felder1+1-1
Update ConfigDB docs for new mix commandsMark Felder1+47-42
Print whole config when resetting and include a scary looking message.Mark Felder1+9-0
Both are really atomsMark Felder1+1-1
Transform strings to atoms for all cases, including when the atom is a module like Pleroma.Emails.MailerMark Felder1+19-10
Support atoms and strings as args to the mix taskMark Felder1+67-28
Fix deletion regression due to strings instead of atoms Improve message after successful deletionMark Felder1+26-3
Improve dumping groups and specific keys; add prompts for delete and resetMark Felder1+27-21
Support listing groups, listing keys in a group, and dumping the config based on group or specific key in that groupMark Felder1+63-12
Sort output by groupMark Felder1+1-0
Add the delete and reset instructionsMark Felder1+32-0
Rename keys to groupsMark Felder2+47-3
SpellingMark Felder1+1-1
Document how to delete individual configuration groups and completely reset the config without SQLMark Felder2+31-8
Better deletion messageMark Felder1+1-1
Add mix tasks to give additional recovery and debugging optionsMark Felder1+89-0
We no longer expect mentions to link if they are prefixed with too many @'sMark Felder1+2-4
Changelog: Update changeloglain1+1-0
Docs: Add info about RGI emojilain1+2-2
Emoji: Only accept RGI emoji.lain2+9-2
Emoji: Add test for ZWJ sequence emojilain1+1-0
Document follow relationship updates and cleanupEgor Kislitsyn5+44-36
Emoji: Remove unused emoji-data.txtlain1+0-769
Emoji: Update to Unicode 13.1, switch base file, allow multichar.lain3+4889-11
SideEffects: fix testlain1+1-1
User: Remove left-over (wrong) fix.lain1+0-1
User: Don't allow local users in remote changesetslain2+20-0
Update Linkify to 0.4.0Mark Felder2+2-2
Stream follow updatesEgor Kislitsyn30+257-150
Merge branch 'fix/search-test-on-exit' into 'develop'rinpatch2+2-4
Search tests: Use on_exit for restoring `persistent_term` staterinpatch2+2-4
[#3112] Allowed revoking same-user token from any apps. Added tests.Ivan Tashkinov3+39-4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov6+68-21
OAuth form user remembering feature. Local MastoFE login / logout fixes.Ivan Tashkinov14+488-297
Merge branch '2727-gitlab-issues' into 'develop'Haelwenn1+2-2
Gitlab-CI: Explicitly tag specified arm32 images.lain1+2-2
Merge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop'lain2+64-2
digest algorithm is taken from headerAlexander Strizhakov2+64-2
Merge branch 'removing-fed-sockets-settings' into 'develop'rinpatch2+0-15
removing fed sockets settingsAlexander Strizhakov2+0-15
Merge branch 'fix/mix-debug' into 'develop'feld1+2-2
fix specMaksim Pechnikov2+110-234
Prevent mix tasks from spewing any internal logging unless DEBUG is in the envMark Felder1+2-2
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov37+433-302
Session token setting on token exchange. Auth-related refactoring.Ivan Tashkinov11+56-31
Merge branch 'fix/2323-release-configuration-provider' into 'develop'rinpatch4+65-38
fix for elixir 1.11Alexander Strizhakov4+65-38
Merge branch 'features/ruby-elements' into 'develop'rinpatch1+5-0
scrubbers/default: Add ruby element and it's childsHaelwenn (lanodan) Monnier1+5-0
Merge branch 'chore/jason-in-tests' into 'develop'Haelwenn23+121-128
Fix badly formatted JSON fixtures which causes Jason to erroneously detect control charactersMark Felder2+39-46
Use Jason instead of Poison in testsMark Felder21+82-82
Merge branch 'chore/bump-linkify' into 'develop'rinpatch2+2-2
Update Linkify to 0.3.0Mark Felder2+2-2
Merge branch 'websearch' into 'develop'rinpatch6+108-5
Search: Save detected pg version in a persistent term.lain4+8-8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearchlain35+548-275
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+131-128
Merge branch 'cherry-pick-a65fc78c' into 'stable'feld1+2-2
Install file-dev in Dockerfile build stageMichael Walker1+1-1
Merge branch 'libmagic' into 'develop'feld1+1-1
Translated using Weblate (Hebrew)Guy Sheffer1+131-128
Merge branch 'libmagic' into 'develop'feld1+1-1
Add missing libmagic for image uploadGuy Sheffer1+1-1
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov411+5728-4701
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.Ivan Tashkinov11+165-197
Update CHANGELOG.md: registration workflowAlex Gleason1+1-0
Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason343+4154-3998
Merge branch 'cherry-pick-8a7ee9fe' into 'stable'feld1+1-1
Merge branch 'revert-da4660d2' into 'develop'feld1+1-1
Merge branch 'fix/2302-report-duplicates' into 'develop'feld10+338-41
Linting.lain1+1-1
Config, Docs: Remove search_functionlain2+1-3
SearchController Test: Fix test.lain1+4-1
Changelog: Add info about search changeslain1+1-2
Search: Change search method based on detected pg versionlain2+11-5
Application: Save postgres version in the environmentlain1+22-1
Merge branch 'fix/mix-tasks' into 'develop'lain2+2-0
start limiters in mix tasksAlexander Strizhakov2+2-0
Merge branch '2301-users-search-discoverability-fix' into 'develop'feld13+18-65
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'feld11+58-40
added subject actor to moderation logMaksim Pechnikov7+240-68
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fixIvan Tashkinov7+63-6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearchlain7+63-6
[#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.Ivan Tashkinov13+16-66
Merge branch '2317-old-reset-tokens' into 'develop'Haelwenn6+55-1
Merge branch 'fix-rum-search' into 'develop'rinpatch2+9-6
Gitlab CI: Update postgreslain1+1-1
CHANGELOG.md: Move rum fix entry to patch sectionrinpatch1+5-7
SearchController Test: Fix testlain1+2-0
Search Test: lintinglain1+4-4
Search: Only skip ordering the rum index.lain1+1-1
Changelog: Document breaking change.lain1+1-0
Config: Set search_function to `websearch` by defaultlain1+2-1
Cheatsheet: Add info about search_functionlain1+1-0
Changelog: Add info about the websearch optionlain1+1-0
Search: Add option to search with the websearch functionlain2+73-3
[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.Ivan Tashkinov2+8-5
little fixAlexander Strizhakov3+20-3
Changelog: Add info about search fixes.lain1+2-0
Activity search: Fix order of resultslain1+4-1
Changelog: Add info about reset tokenslain1+1-0
Cheatsheet: Add docs about reset token expirationlain1+1-0
Password Resets: Don't accept tokens above a certain age.lain4+53-1
Merge branch 'hide-muted-reactions' into 'develop'lain17+462-31
log captureAlexander Strizhakov1+2-0
test fixesAlexander Strizhakov1+7-7
changelog entries for fixesAlexander Strizhakov1+8-2
fix for mastodon forwarded reportsAlexander Strizhakov4+160-16
formattingAlexander Strizhakov1+0-1
fix for forwarded reportsAlexander Strizhakov5+150-21
Merge branch 'revert-da4660d2' into 'develop'feld1+1-1
Update AdminFE build to pleroma/admin-fe@c18f167a124c31ab2e1dfbf432ac482b17c01cbdMark Felder98+110-134
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"feld1+1-1
Merge branch 'develop' into 'hide-muted-reactions'minibikini135+842-1685
Fixed emoji reactions not being filtered from blocked and muted accountsMark Felder1+1-0
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'feld2+2-1
Merge branch 'fix/webpush-and-emojireact' into 'develop'lain7+158-35
Apply 1 suggestion(s) to 1 file(s)lain1+0-1
Merge branch 'frontend-admin-api' into 'develop'lain10+537-106
Changelog: Move api info to api heading.lain1+1-1
fix testsMaksim Pechnikov2+2-2
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
Merge branch 'update/admin-fe-20201117' into 'develop'feld94+109-95
Update AdminFE build to pleroma/admin-fe@5b38aea2790686647a39f505864331bb9838e20dMark Felder94+109-95
Add test for POST when push is disabledMark Felder1+32-27
Revert adding extra alert types hereMark Felder1+1-10
Fix incorrect test descriptionMark Felder1+1-1
CredoMark Felder1+1-0
Test that we ignore invalid subscription alert types separately.Mark Felder1+21-2
Ensure all supported push notification subscription alert types are testedMark Felder1+46-6
Synchronize reaction notification text with PleromaFE's styleMark Felder2+2-2
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscriptionMark Felder2+16-0
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptionsMark Felder2+16-2
SpellingMark Felder1+1-1
Document the API extensions for push subscriptionsMark Felder1+10-0
Allow subscribing for pleroma:emoji_reaction push notificationsMark Felder1+1-1
Add capability for emoji reaction push notificationsMark Felder2+29-1
Docs: Add info about frontend install error responselain1+6-0
FrontendController: Return error on installation error.lain4+26-4
Document fixing the pleroma.user delete_activities mix taskMark Felder1+1-0
Need to start web_resp cache or mix task failsMark Felder1+1-1
Merge branch 'remove/fedsockets' into 'develop'feld23+32-1443
Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'rinpatch1+4-5
Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn201+2929-2229
Merge remote-tracking branch 'origin/develop' into hide-muted-reactionsEgor Kislitsyn2+749-723
Merge branch 'develop' into hide-muted-reactionsEgor Kislitsyn167+1627-1412
Remove FedSocketsrinpatch23+32-1443
Merge branch 'chores/note-handling-move' into 'develop'lain2+749-723
Merge branch 'feature/local-only-scope' into 'develop'lain17+373-166
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scopelain247+2888-1974
Merge branch 'fix/debian-install-libmagic-typo' into 'develop'rinpatch1+1-1
Debian installation guide: fix libmagic header package namerinpatch1+1-1
Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'rinpatch1+6-0
Merge branch 'chores/tesla_1.4.0' into 'develop'rinpatch2+2-5
Merge branch 'sync-stable/2.2.0' into 'develop'rinpatch145+638-1235
.gitattributes: Treat js/css/source maps as binary filesrinpatch1+6-0
CHANGELOG.md: Use a period after every bullet point for unreleased sectionsrinpatch1+7-7
CHANGELOG.md: Add back an entry for S3 fixrinpatch1+1-1
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+596-0
mix.exs: bump development version to 2.2.50 after 2.2.0 releaserinpatch1+1-1
Import stable commits into develop after releasing 2.2.0rinpatch144+634-1231
ActivityPubController: Don't return local only objectslain2+41-2
mix.exs: Update tesla to 1.4.0Haelwenn (lanodan) Monnier2+2-5
Gitlab CI: Specify image architecture for arm64 imageslain1+2-3
Added translation using Weblate (Hebrew)Guy Sheffer1+596-0
Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'lain3+3-2
Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'lain2+9-4
Use absolute URLs to thumbnail and background in /api/v1/instanceMark Felder2+9-4
Document S3 and Elixir 1.11 compat fixMark Felder1+1-0
Fix S3 uploads with Elixir 1.11Mark Felder2+2-2
added testMaksim Pechnikov2+28-1
Hide reactions from muted and blocked usersEgor Kislitsyn16+461-31
fix testsMaksim Pechnikov2+28-29
Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason236+5446-2800
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'Haelwenn3+5-2
pleroma.instance: Fix Exiftool module nameHaelwenn (lanodan) Monnier3+5-2
added testMaksim Pechnikov2+61-4
Gitlab CI: Change tags bag to arm32lain1+2-2
Gitlab CI: Alpine is alpinelain1+1-1
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'lain9+155-3
Make notifs view work for reportsIlja9+155-3
Merge branch 'docs/otp-tuning' into 'develop'lain1+66-0
Gitlab CI: Specify arm32v7 image for arm32 buildslain1+4-4
added error messages for posix error codeMaksim Pechnikov6+412-49
Merge branch 'fix/oban-in-database-config' into 'develop'rinpatch1+19-0
remove PurgeExpiredActivity from Oban db configAlexander Strizhakov1+19-0
Merge branch 'majic-dep' into 'develop'feld1+1-1
Install file-dev in Dockerfile build stageMichael Walker1+1-1
Merge branch 'build-release/fix-release-builds' into 'stable'rinpatch1+3-2
.gitlab-ci.yml: Add libmagic to installed packages for OTP releasesrinpatch1+3-2
Merge branch 'release/2.2.0' into 'stable'rinpatch1432+74947-73700
Fix object spoofing vulnerability in attachmentsrinpatch10+253-79
Merge branch 'title-injection-change' into 'develop'Haelwenn4+19-7
Merge branch 'feature/ingest-blurhash' into 'develop'feld7+14-4
Fix tests for other attachment typesMark Felder2+3-0
pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983adrinpatch142+568-1199
Polish the changelog a bit and specify release daterinpatch1+7-7
Ingest blurhash field during transmogrificationMark Felder1+1-0
Render blurhashes in Mastodon APIMark Felder2+5-2
Ingest blurhash for attachments if they were federatedMark Felder2+5-2
Fix markdownEgor Kislitsyn1+1-1
Change endpoint pathEgor Kislitsyn3+6-7
Changelog: Add info about title injectionlain1+1-0
Bundled FE: Remove title taglain1+1-2
Merge branch 'mrf-config-descriptions' into 'develop'feld2+24-1
Remove FrontendInstallerWorkerEgor Kislitsyn4+1-47
RedirectController: Don't replace title, but inject into the metalain2+17-5
Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn72+1091-643
little changes for MRF config descriptionsAlexander Strizhakov2+24-1
Fix formattingEgor Kislitsyn2+0-2
Add `local` visibilityEgor Kislitsyn14+49-52
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'feld16+454-339
Moving some background jobs into simple tasksAlexander Strizhakov11+58-40
changes after rebaseAlexander Strizhakov1+0-106
making credo happy and test fixAlexander Strizhakov2+2-2
fix for adminFEAlexander Strizhakov3+58-50
Apply 1 suggestion(s) to 1 file(s)feld1+1-1
Apply 1 suggestion(s) to 1 file(s)feld1+2-0
Apply 1 suggestion(s) to 1 file(s)feld1+1-1
Apply 1 suggestion(s) to 1 file(s)feld1+1-1
config descriptions for custom MRF policiesAlexander Strizhakov16+412-305
Merge branch '2260-wrong-report-link' into 'develop'lain3+7-10
Merge branch 'fix/html-title-load' into 'develop'lain1+4-0
Merge branch 'fix/2291-atom-feed-escape' into 'develop'lain4+29-54
escaping summary and other fields in xml templatesAlexander Strizhakov4+29-54
Merge branch 'remove/release-env' into 'develop'Haelwenn9+2-153
Fix title on load of Pleroma HTMLSean King1+4-0
Update optimizing_beam.mdlain1+1-1
Remove release_envrinpatch9+2-153
Markdown, you're drunkMark Felder1+2-0
Make it clearer the settings go into the vm.args fileMark Felder1+2-0
More grammar fixesMark Felder1+1-1
Less confusing I hopeMark Felder1+1-1
GrammarMark Felder1+1-1
First draft of tips for optimizing BEAMMark Felder1+60-0
NoteHandlingTest: Poison → JasonHaelwenn (lanodan) Monnier1+21-22
Move TransmogrifierTest for Note to NoteHandlingTestHaelwenn (lanodan) Monnier2+750-723
CHANGELOG.md: Add an entry for the spoofing fixrinpatch1+4-1
Merge branch 'fix/object-attachment-spoof' into 'develop'rinpatch10+253-79
Merge branch '2236-no-name' into 'develop'Haelwenn5+62-2
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+Mark Felder1+0-1
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'feld13+258-243
Merge branch '1668-prometheus-access-restrictions' into 'develop'feld7+203-21
Merge branch '2242-nsfw-case' into 'develop'rinpatch3+89-8
Merge branch 'issue/2261' into 'develop'feld2+36-11
Merge branch 'feature/expire-mutes' into 'develop'lain15+191-35
Docs: Add info about expiring mutes.lain1+4-0
Merge branch 'stats-genserver-fix' into 'develop'lain1+5-14
Changelog: Add info about admin email user link changes.lain1+1-0
AdminEmail: Use AP id as user url.lain2+6-10
Merge branch 'default-mrf' into 'develop'lain1+1-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fixlain1332+75936-73051
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-muteslain1174+69333-65464
Merge branch 'ejabberd-pleroma-auth' into 'develop'lain1+137-0
Merge branch 'features/federation-status' into 'develop'lain7+113-0
Merge branch 'restrict-domain' into 'develop'lain12+88-13
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov45+1177-44
Merge branch '2284-voters-count' into 'develop'Haelwenn4+9-5
Changelog: Add info about federation status endpointlain1+1-0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-statuslain131+3673-1966
TopicsTest: Small addition.lain1+7-0
Merge branch '2257-self-chat' into 'develop'rinpatch3+16-0
Merge branch 'chore/elixir-1.11' into 'develop'feld33+89-83
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domainlain177+4025-2254
Merge branch 'instance-docs' into 'develop'feld1+106-0
Merge branch 'tesla-get-to-pleroma' into 'develop'feld2+3-3
Merge branch 'hide-muted-chats' into 'develop'lain5+50-19
Add `with_muted` param to ChatController.index/2Egor Kislitsyn5+20-6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-apilain12+66-10
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scopelain50+1118-32
Poll Schema: Update and fix.lain1+6-3
Changelog: Add info about poll view changeslain1+1-0
Poll View: Always return `voters_count`.lain2+2-2
Merge branch 'chores/pleroma-favicon-logo' into 'develop'lain1+0-0
Merge branch 'patch-4' into 'develop'lain4+36-3
Conversations: A few refactorslain3+9-12
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4lain46+1082-29
favicon: Update to pleroma logo, provided by @shpuldHaelwenn (lanodan) Monnier1+0-0
Merge branch 'fix/get_report_with_notes' into 'develop'Haelwenn3+23-1
Merge branch 'chore/deps-from-git' into 'develop'feld2+4-4
Ensure URLs for git repos end in .git for older git clients like on CentOS 7Mark Felder2+4-4
Test the note is returned when fetching a single reportMark Felder1+9-0
Permit fetching individual reports with notes preloadedMark Felder2+14-1
Hide chats from muted usersEgor Kislitsyn2+33-16
Merge branch 'bugfix/poll_replies_count' into 'develop'lain2+3-2
Merge branch 'develop' into 'frontend-admin-api'minibikini80+3218-1755
side_effects: Don’t increase_replies_count when it’s an AnswerHaelwenn (lanodan) Monnier2+3-2
Merge branch 'tesla-get-to-pleroma' into 'develop'feld2+3-3
Use Pleroma.HTTP instead of TeslaEkaterina Vaartis2+3-3
Merge branch 'feature/account-export' into 'develop'feld19+999-1
Merge branch 'idempotency-key-optimistic-posting' into 'develop'feld10+50-6
Auth subsystem refactoring and tweaks. Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.Ivan Tashkinov15+97-182
Add idempotency_key to the chat_message entity.eugenijm10+50-6
Fix credo warningEgor Kislitsyn1+1-1
Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn12+0-12
Merge branch 'remove-unused-aliases' into 'develop'feld12+0-12
Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn37+1883-1731
Remove unused aliasesEgor Kislitsyn12+0-12
ConversationViewTest: fix testAlibek Omarov1+2-2
ConversationView: fix formattingAlibek Omarov1+6-5
ConversationControllerTest: fix test, fix formattingAlibek Omarov1+4-1
Add entry in changelogAlibek Omarov1+2-0
ConversationView: fix last_status.account being empty, fix current user being included in group conversationsAlibek Omarov2+33-4
ConversationViewTest: fix test #2Alibek Omarov1+1-1
ConversationViewTest: fix testAlibek Omarov1+4-2
ConversationControllerTest: fix testAlibek Omarov1+2-1
ConversationView: add current user to conversations, according to Mastodon behaviourAlibek Omarov1+1-3
Merge branch 'develop' into 'feature/local-only-scope'minibikini23+1585-1471
Merge branch 'issue/2069' into 'develop'Haelwenn9+92-94
Merge branch 'fix/frontend-cli-docs' into 'develop'feld1+60-33
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'feld9+1310-1320
Merge branch 'mutes-blocks-pagination' into 'develop'feld4+106-16
Merge branch 'fix/mrf-keyword-description' into 'develop'feld1+17-8
Improve Keyword descriptions for AdminFEMark Felder1+17-8
Add documentation and update CHANGELOGEgor Kislitsyn2+59-0
Add support for install via `file` and `build_url` paramsEgor Kislitsyn4+74-25
Merge remote-tracking branch 'origin/develop' into mutes-blocks-paginationEgor Kislitsyn66+861-421
Merge remote-tracking branch 'origin/develop' into feature/local-only-scopeEgor Kislitsyn25+396-259
Merge branch 'bugfix/admin-api-account-view-is-discoverable-fix' into 'develop'feld1+1-1
Fixed User.is_discoverable attribute rendering in Admin API User view.Ivan Tashkinov1+1-1
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'feld13+258-243
@doc fix.Ivan Tashkinov1+1-2
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instancesIvan Tashkinov54+629-183
Merge branch 'issue/2261' into 'develop'feld2+36-11
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261Mark Felder10+101-4
Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn9+101-3
Fix warningEgor Kislitsyn1+1-1
Merge branch 'feature/autofollowing' into 'develop'feld6+38-0
Merge branch '2236-no-name' into 'develop'Haelwenn5+63-3
Merge branch 'develop' into 'feature/autofollowing'feld7+190-10
Merge branch 'develop' into feature/account-exportMark Felder1+0-1
Merge branch 'fix/prometheus-test' into 'develop'feld1+0-1
FrontStatic plug: excluded invalid urlMaksim Pechnikov2+36-11
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+Mark Felder1+0-1
Merge branch 'develop' into 'feature/local-only-scope'minibikini47+468-164
Merge branch 'develop' into feature/account-exportMark Felder7+191-9
Merge branch 'develop' into feature/account-exportMark Felder43+274-147
Merge branch '1668-prometheus-access-restrictions' into 'develop'feld7+191-9
Merge branch 'develop' into 'feature/autofollowing'feld45+305-162
Add an API endpoint to install a new frontendEgor Kislitsyn10+448-107
Merge branch 'docs/clients-apc2s' into 'develop'lain1+22-13
ActivityPub: Add back debug call + explanation.lain1+5-0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-namelain7+122-26
Merge branch 'patch-1' into 'develop'rinpatch1+1-1
clients.md: Add AndStatus, note supported protocolsHaelwenn (lanodan) Monnier1+22-13
Merge branch 'docs/ap_c2s' into 'develop'Haelwenn2+32-15
Fix link referenceKana1+1-1
Merge branch 'fix/sendmail' into 'develop'Haelwenn1+0-2
NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binariesMark Felder1+0-2
Merge branch '2242-nsfw-case' into 'develop'rinpatch3+89-8
Changelog: Add info about whitespace name remote users.lain1+2-1
User: Correctly handle whitespace names.lain4+60-6
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+24-24
Translated using Weblate (Chinese (Simplified))shironeko1+24-24
Merge branch 'chore/elixir-1.11' into 'develop'feld33+89-83
[#3059] Used forked prometheus-phx to remove log spam.Ivan Tashkinov2+4-2
[#3059] Formatting fix.Ivan Tashkinov1+1-1
Merge branch '2257-self-chat' into 'develop'rinpatch3+16-0
[#3059] Fixed Phoenix 1.5 telemetry processing.Ivan Tashkinov4+9-1
Changelog: Add information about self-chatslain1+1-0
SideEffects: Correctly handle chat messages sent to yourselflain2+15-0
fix module nameMaksim Pechnikov2+1-1
update changelogMaksim Pechnikov2+25-19
update docsMaksim Pechnikov1+2-0
admin api: added user filters by `actor_types`Maksim Pechnikov2+76-91
admin user search: added filter by `actor_type`Maksim Pechnikov2+20-1
need_confirmed -> unconfirmedMaksim Pechnikov4+5-5
added AdminApi.UserControllerMaksim Pechnikov5+1275-1089
added 'unconfirmed' filter to admin/usersMaksim Pechnikov4+131-339
Apply 1 suggestion(s) to 1 file(s)Haelwenn1+1-1
Rip out fedsockets from the release branchrinpatch4+3-25
Fix formatting and typos in "Managing frontends" guideEgor Kislitsyn1+60-33
Merge branch 'bugfix/ci-majic-release' into 'develop'Haelwenn1+1-1
CI: Install libmagic-dev in debian release targetsHaelwenn (lanodan) Monnier1+1-1
Fix credo warningsEgor Kislitsyn2+2-2
Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn30+226-41
[#1668] Formatting fix.Ivan Tashkinov1+2-1
Rename `Pleroma.Backup` to `Pleroma.User.Backup`Egor Kislitsyn13+517-516
[#1668] Added :prometheus group config to config/description.exs.Ivan Tashkinov1+36-0
Merge branch 'bugfix/ci-majic-release' into 'develop'Haelwenn1+1-1
CI: Install file-dev in alpine release targetsHaelwenn (lanodan) Monnier1+1-1
Merge branch 'fix/autofollower-suggestions' into 'develop'Haelwenn1+1-7
Fix credo warningsEgor Kislitsyn2+0-0
Transmogrifier: Refactor and unify incoming tag handlinglain1+4-6
Transmogrifier: Downcase incoming Hashtagslain3+85-2
Fix testsEgor Kislitsyn2+2-2
Merge branch 'develop' into mutes-blocks-paginationEgor Kislitsyn85+420-320
Merge branch 'develop' into feature/local-only-scopeEgor Kislitsyn27+223-32
Merge branch '2239-mute-fixes' into 'develop'Haelwenn2+24-1
[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint. Added tests and documentation.Ivan Tashkinov6+154-9
Merge branch 'chore/changelogfix' into 'develop'feld1+3-5
Document autofollowing_nicknamesMark Felder1+1-0
Fix duplicate Added sections in the changelogMark Felder1+3-5
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11Ivan Tashkinov85+393-314
[#3053] Post-merge fix.Ivan Tashkinov1+1-0
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instancesIvan Tashkinov1068+64052-63197
Remove suggestionsMark Felder1+1-6
The suggestions are problematic as they need to be real local account namesMark Felder1+1-7
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accountsMark Felder5+42-0
federation_status: Add ApiSpecHaelwenn (lanodan) Monnier3+44-4
federation_status: New endpoint showing unreachable instancesHaelwenn (lanodan) Monnier5+72-0
Merge branch 'refactor/discoverable_user_field' into 'develop'feld14+37-22
Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder77+356-292
Apply 1 suggestion(s) to 1 file(s)Haelwenn1+1-1
Merge branch 'issue/2009' into 'develop'feld11+159-4
fix testMaksim Pechnikov3+22-3
added generate the release env to `pleroma.instance gen`Maksim Pechnikov3+13-4
fixed install docsMaksim Pechnikov1+5-0
fix docsMaksim Pechnikov1+1-1
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
update task messagesMaksim Pechnikov2+23-10
added generated `pleroma.env`Maksim Pechnikov6+111-2
SECURITY.md: update supported versions to only 2.2rinpatch1+1-1
CHANGELOG.md: prepare 2.2.0 changelogrinpatch1+9-4
mix.exs: bump version to 2.2.0rinpatch1+1-1
Add Pleroma.Constants.as_local_public/0Egor Kislitsyn7+8-6
Update CHANGELOGEgor Kislitsyn1+1-0
Add local-only statusesEgor Kislitsyn16+332-163
Update dependenciesEgor Kislitsyn1+8-7
Fix warningsEgor Kislitsyn17+33-33
ActivityPub: Show own replies to muted users.lain2+24-1
Merge branch 'docs-indigenous' into 'develop'feld1+1-1
Merge branch 'develop' into feature/account-exportMark Felder1057+63708-62977
Apply 3 suggestion(s) to 3 file(s)feld3+3-3
Change handle and url of contact person for Indigenous clientswentel1+1-1
Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason65+195-286
Merge branch 'feature/gen-magic' into 'develop'feld44+118-229
Merge branch 'refactor/locked_user_field' into 'develop'Haelwenn24+77-57
Undo API breaking changesMark Felder8+21-21
Finish undoing API breakageMark Felder5+6-6
Undo API breaking changesMark Felder4+9-9
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235Alex Gleason7+13-42
Merge remote-tracking branch 'upstream/develop' into restrict-domainAlex Gleason1032+63454-62672
Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason1032+63439-62657
Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason1030+63518-62740
Missed testsMark Felder2+2-2
Include python script and descriptionAli Riza Keles1+129-1
Merge branch 'bugfix/file-consistency-prod' into 'develop'Haelwenn2+1-1
Update CHANGELOGEgor Kislitsyn1+1-0
Add pagination for MutesEgor Kislitsyn3+54-8
Move Consistency.FileLocation to ./testHaelwenn (lanodan) Monnier2+1-1
CredoMark Felder1+6-1
Add pagination for BlocksEgor Kislitsyn3+51-8
JPEG content_type must be image/jpegMark Felder24+37-37
Merge branch 'develop' into feature/gen-magicMark Felder1032+63370-62592
Merge branch 'develop' into chore/elixir-1.11Mark Felder1032+63431-62609
Merge branch 'develop' into refactor/locked_user_fieldMark Felder818+57981-57773
Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder818+57981-57773
Merge branch 'feature/1822-files-consistency' into 'develop'feld818+57981-57773
Change user.discoverable field to user.is_discoverableMark Felder23+52-37
Change user.locked field to user.is_lockedMark Felder28+89-74
changes after rebaseAlexander Strizhakov12+5-12
migration and warning for RemoteIp plug renameAlexander Strizhakov2+37-1
changes after rebaseAlexander Strizhakov11+3-3
credo fix after rebaseAlexander Strizhakov2+0-0
changes after rebaseAlexander Strizhakov2+0-0
fixes after rebaseAlexander Strizhakov6+59-59
rebaseAlexander Strizhakov1+0-0
changes after rebaseAlexander Strizhakov18+56-57
fixes after rebaseAlexander Strizhakov3+3-4
exclude file_location check from coverallsAlexander Strizhakov1+2-1
fix after rebaseAlexander Strizhakov1+0-0
files consistency after rebaseAlexander Strizhakov11+106-106
files consistency for new filesAlexander Strizhakov1+0-0
fix after rebaseAlexander Strizhakov1+1-1
update files consistency after rebaseAlexander Strizhakov8+0-0
copyrightAlexander Strizhakov1+3-0
updates after rebaseAlexander Strizhakov4+149-146
special namespaces for phoenix and api_specAlexander Strizhakov1+35-4
alias alphabetically orderAlexander Strizhakov47+60-59
AdminSecretAuthenticationPlug module nameAlexander Strizhakov3+6-6
AuthenticationPlug module nameAlexander Strizhakov9+9-9
BasicAuthDecoderPlug module nameAlexander Strizhakov3+3-3
DigestPlug renameAlexander Strizhakov1+0-0
Cache plug module nameAlexander Strizhakov3+5-5
EnsureAuthenticatedPlug module nameAlexander Strizhakov9+10-10
EnsurePublicOrAuthenticatedPlug module nameAlexander Strizhakov16+20-16
EnsureUserKeyPlug module nameAlexander Strizhakov3+4-4
ExpectAuthenticatedCheckPlug module nameAlexander Strizhakov4+4-4
ExpectPublicOrAuthenticatedCheckPlug module nameAlexander Strizhakov4+4-4
FederatingPlug module nameAlexander Strizhakov8+9-9
HTTPSecurityPlug module name and filenameAlexander Strizhakov4+3-3
IdempotencyPlug module nameAlexander Strizhakov3+5-5
InstanceStatic module nameAlexander Strizhakov3+3-3
LegacyAuthenticationPlug module nameAlexander Strizhakov4+4-4
OAuthPlug module nameAlexander Strizhakov3+4-4
OAuthScopesPlug module nameAlexander Strizhakov53+67-62
PlugHelper module nameAlexander Strizhakov5+5-5
RateLimiter module nameAlexander Strizhakov11+17-17
RemoteIp module nameAlexander Strizhakov8+11-11
SessionAuthenticationPlug module nameAlexander Strizhakov3+3-3
SetFormatPlug module nameAlexander Strizhakov5+5-5
SetLocalePlug module nameAlexander Strizhakov3+3-3
SetUserSessionIdPlug module nameAlexander Strizhakov3+3-3
StaticFEPlug module nameAlexander Strizhakov2+2-2
TrailingFormatPlug module nameAlexander Strizhakov2+2-2
UploadedMedia module nameAlexander Strizhakov3+3-3
UserEnabledPlug module nameAlexander Strizhakov3+4-4
UserFetcherPlug module nameAlexander Strizhakov3+3-3
UserIsAdminPlug module nameAlexander Strizhakov3+3-3
fix for fallback controllerAlexander Strizhakov1+1-1
renaming LimiterSupervisorAlexander Strizhakov3+3-3
renaming ratelimiter supervisorAlexander Strizhakov2+2-2
moving plugs into web dirAlexander Strizhakov34+0-0
other files consistencyAlexander Strizhakov19+112-113
more files renamingsAlexander Strizhakov13+242-239
metadata providers consistencyAlexander Strizhakov6+0-0
oauth consistencyAlexander Strizhakov18+0-0
more testsAlexander Strizhakov2+1-1
rich media parser ttl files consistencyAlexander Strizhakov6+139-139
tests consistencyAlexander Strizhakov346+12589-12588
mix tasks consistencyAlexander Strizhakov21+99-99
file locations consistencyAlexander Strizhakov2+134-4
Update AdminFE build to latest developMark Felder135+500-236
Merge branch 'preload-frontend-config' into 'develop'lain4+24-5
Preload `/api/pleroma/frontend_configurations`, fixes #1932Alex Gleason4+24-5
Refactor User.post_register_action/1 emailsAlex Gleason1+22-13
Add ejabberd auth documentAli Riza Keles1+9-0
Make User.confirm/1 and User.approve/1 idempotentAlex Gleason2+26-2
Refactor User.confirm/1, add more testsAlex Gleason3+89-5
TwitterAPI: test pending approval user emailAlex Gleason1+13-8
Merge branch 'docs/improve-backup-restore' into 'develop'feld1+3-2
Switch Majic to a copy hosted in our GitLabMark Felder2+4-3
Merge branch 'improve/instance-gen' into 'develop'feld4+77-3
Further improvementsMark Felder1+3-2
Merge branch 'chore/copyright-headers' into 'develop'feld53+212-0
Add missing Copyright headersMark Felder53+212-0
Support enabling upload filters during instance genMark Felder4+77-3
Move admin approval email logic into User.post_register_action/1Alex Gleason2+10-14
Registration testsAlex Gleason3+23-5
Send approval pending email during registrationAlex Gleason3+29-1
Registration: user state is separate from instance stateAlex Gleason1+3-18
Handle User.post_register_action/1 in stepsAlex Gleason2+30-3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instancesIvan Tashkinov13+190-90
[#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.Ivan Tashkinov4+48-27
[#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).Ivan Tashkinov1+25-31
Merge branch 'feat/deep-link-account-approval' into 'develop'feld2+2-2
Deep link to the user account in AdminFE in account confirmation emailsMark Felder2+2-2
Merge branch 'docs/improve-backup-restore' into 'develop'feld1+1-1
Merge branch 'develop' into feature/gen-magicMark Felder246+9058-2737
SpellingMark Felder1+1-1
Merge branch 'docs/improve-backup-restore' into 'develop'feld1+11-7
Ask user to use matching values for database setupMark Felder1+2-2
Remote Timeline: add Streaming supportAlex Gleason7+51-1
Merge remote-tracking branch 'upstream/develop' into restrict-originAlex Gleason730+17134-12928
Aliases: fix URL regexAlex Gleason1+1-2
Syntax errorMark Felder1+1-1
Don't always need to dropMark Felder1+1-1
Improve backup/restore documentationMark Felder1+10-6
Aliases: move changelog entryAlex Gleason1+1-1
Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason715+16034-12721
Merge branch 'fix/2209-remoteip' into 'develop'Haelwenn5+81-41
LintMark Felder1+0-1
LintMark Felder1+0-1
Fix incorrect use of connect/1Mark Felder1+1-1
Apply 1 suggestion(s) to 1 file(s)Maksim1+0-1
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-0
Apply 2 suggestion(s) to 2 file(s)feld2+14-1
Compatibility with phoenix_pubsub 2.0.0Mark Felder3+6-3
@env is not usedMark Felder1+3-3
Fix rendering of reportsMark Felder1+1-1
instrumenters has no effect in Endpoint anymoreMark Felder1+0-1
Transport.connect/7 is deprecatedMark Felder1+6-1
Merge branch 'chore/elixir-1.11' of git.pleroma.social:pleroma/pleroma into chore/elixir-1.11Mark Felder1+1-1
Apply 1 suggestion(s) to 1 file(s)feld1+1-1
:pubsub is deprecated and replaced wit :pubsub_serverMark Felder1+1-1
use Phoenix.ConnTest is deprecatedMark Felder1+2-1
Temporarily soft-fork prometheus_exMark Felder2+5-2
Fix incompatible types warning (Elixir 1.11)Mark Felder1+2-2
Fix incompatible type (Elixir 1.11)Mark Felder1+1-1
Fix duplicate @doc entriesMark Felder4+6-21
Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warningsMark Felder2+5-5
Use ModerationLog instead of LoggerEgor Kislitsyn3+33-3
Use to_string/1 instead of :binary.list_to_bin/1Egor Kislitsyn1+1-1
Use Path.join/2Egor Kislitsyn1+4-4
Use Gettext for error messagesEgor Kislitsyn1+14-3
Use `Jason.encode/1` for likes and bookmarksEgor Kislitsyn1+5-4
Fix API documentationEgor Kislitsyn1+1-1
Fix testEgor Kislitsyn2+10-2
Fix emailsEgor Kislitsyn1+2-2
Do not limit adminsEgor Kislitsyn2+30-4
Move API endpoints to `/api/v1/pleroma/backups`Egor Kislitsyn3+12-12
Use `Pleroma.Repo.chunk_stream/2` instead of `Pleroma.RepoStreamer.chunk_stream/2`Egor Kislitsyn1+11-12
Fix exportEgor Kislitsyn1+6-9
Update changelogEgor Kislitsyn1+1-0
Allow admins request user backupsEgor Kislitsyn6+57-12
Add "Your backup is ready" emailEgor Kislitsyn3+25-2
Add configurable temporary directoryEgor Kislitsyn3+14-2
Require emailEgor Kislitsyn3+33-5
Document `/api/pleroma/backups` API endpointEgor Kislitsyn1+38-0
Fix queryEgor Kislitsyn1+9-6
Improve backup urlsEgor Kislitsyn3+14-9
Add API endpoints for BackupsEgor Kislitsyn6+224-0
Fix Credo warningEgor Kislitsyn1+1-1
Add backups deletionEgor Kislitsyn4+91-10
Add config for Pleroma.BackupEgor Kislitsyn5+31-2
Add BackupWorkerEgor Kislitsyn5+48-7
Add `backups` tableEgor Kislitsyn5+397-290
Fix testsEgor Kislitsyn2+38-12
Add backup uploadEgor Kislitsyn2+35-2
Fix credo warningEgor Kislitsyn1+1-1
Add testsEgor Kislitsyn2+115-4
Zip exported filesEgor Kislitsyn1+12-10
Add account exportEgor Kislitsyn1+118-0
Improve description yet againMark Felder2+2-2
Don't leak internal variables in the docs. They're useless to users.Mark Felder2+2-2
CredoMark Felder1+1-1
Improve descriptions for reserved and proxiesMark Felder2+6-5
Add test for an entry without CIDR formatMark Felder1+11-0
Move hardcoded default configuration into config.exsMark Felder3+36-32
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.Mark Felder2+4-3
Merge branch 'revert/rich-media-censorship' into 'develop'feld3+1-36
Document the NSFW link preview changeMark Felder1+1-0
Merge branch 'develop' into revert/rich-media-censorshipMark Felder53+798-264
Merge branch 'filtering-following' into 'develop'rinpatch2+91-1
Merge branch 'feature/update-description-for-frontends-setting' into 'develop'rinpatch1+4-3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instancesIvan Tashkinov13+253-136
[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.Ivan Tashkinov9+160-177
activity_pub_controller.ex: Remove unused @doc blockHaelwenn (lanodan) Monnier1+0-13
Merge branch 'feature/1893-remote-emoji-packs-pagination' into 'develop'feld11+242-136
Merge branch 'develop' into feature/1893-remote-emoji-packs-paginationMark Felder54+908-187
Add helper function to convert single IPs into CIDR format if they were not provided that wayMark Felder1+12-1
docs/ap_extensions.md: Add JSON-LD full namesHaelwenn (lanodan) Monnier1+6-4
docs/ap_extensions.md: document oauthRegistrationEndpointHaelwenn (lanodan) Monnier1+6-0
docs/ap_extensions.md: document uploadMediaHaelwenn (lanodan) Monnier1+23-1
Merge branch '2211-smol-documentation-fix' into 'develop'Haelwenn1+2-0
Docs: Modify docs so the postgres config is harder to get wrong.lain1+2-0
Merge branch 'fix/empty-params-openapi' into 'develop'rinpatch2+9-0
[#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.Ivan Tashkinov9+136-108
No auth check in UserController.feed_redirect/2, even on non-federating instances.Ivan Tashkinov1+1-6
No auth check in OStatusController, even on non-federating instances.Ivan Tashkinov1+0-4
Merge branch 'web-push-fix' into 'develop'lain7+21-54
web push http_client fixAlexander Strizhakov7+21-54
Merge branch 'chore/pleroma-vcl' into 'develop'feld1+5-1
Syntax errorMark Felder1+1-1
Make it possible for Varnish logs to contain the true scheme used by clients instead of always reporting http://Mark Felder1+4-0
Merge branch 'update/oban' into 'develop'rinpatch2+7-7
Merge branch '2201-i-hate-this' into 'develop'rinpatch4+18-3
Update Oban to 2.1.0Mark Felder2+7-7
Migrations: Nullify old unique index on users.urilain1+1-1
User search: Once again, change uri handling.lain3+17-2
Fix typoAngelina Filippova1+1-1
Fix comma typoAngelina Filippova1+1-1
Apply 1 suggestion(s) to 1 file(s)Angelina Filippova1+1-1
Apply 1 suggestion(s) to 1 file(s)Angelina Filippova1+1-1
OpenAPI CastAndValidate: filter out empty paramsrinpatch2+9-0
Merge branch 'fix/2189-unpin-activity' into 'develop'Haelwenn1+3-1
More robust expires_at timestamp processingMark Felder1+3-1
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'lain17+235-33
Merge branch 'issue/2170' into 'develop'lain9+161-25
[#3031] Adjusted changelog entry.Ivan Tashkinov1+1-1
Apply 1 suggestion(s) to 1 file(s)lain1+1-1
Changelog: Add info about relay unfollowinglain2+2-1
[#3031] Refactoring: moved system commands checks to ApplicationRequirements.Ivan Tashkinov2+67-39
Revert Rich Media censorship for sensitive statusesMark Felder2+0-36
Merge branch 'fix/revert-citext-uri' into 'develop'rinpatch3+16-15
Revert citext user URI migrationrinpatch3+16-15
Remove extra nesting and add labels in `:frontends` settingAngelina Filippova1+4-3
CI: Add ffmpeglain1+2-2
added `force` option to the unfollow operationMaksim Pechnikov8+160-25
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update. Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).Ivan Tashkinov14+180-27
Merge branch 'fix/deprecation-warning-welcome-message' into 'develop'feld2+30-32
Merge branch 'develop' into fix/deprecation-warning-welcome-messageMark Felder1+2-0
Merge branch 'fix/noop-policy-describe' into 'develop'feld1+2-0
Fix test failures for NoOpPolicy describe/0Mark Felder1+2-0
Config settings leak and break configdb migration tests when asyncMark Felder1+1-1
Merge branch 'develop' into fix/deprecation-warning-welcome-messageMark Felder9+276-23
Merge branch 'feature/bulk-confirmation' into 'develop'feld9+276-23
Merge branch 'develop' into fix/deprecation-warning-welcome-messageMark Felder35+1168-634
Simplify the value comparisonMark Felder1+1-5
Merge branch 'search-even-more' into 'develop'rinpatch3+63-7
Merge branch 'features/incoming-create-exists' into 'develop'rinpatch2+7-3
Linter fixeslain1+2-1
User search: Make uri matches case insensitive.lain2+20-1
User Search: Also find user by urilain2+43-7
Add some user feedbackMark Felder1+2-0
Validate emails are sent to the appropriate unconfirmed actorsMark Felder1+69-0
Cannot use batches with User.try_send_confirmation_email/1Mark Felder1+1-1
Use the importMark Felder1+1-1
Merge branch '2182-profile-search-improvements' into 'develop'rinpatch3+59-6
Added documentation on installation of `ffmpeg` and `ImageMagick` dependencies.Ivan Tashkinov11+33-12
Changelog: Add info about user search.lain1+1-0
User Search: Boost resolved results and exact ap_id matches.lain2+58-6
Merge branch 'fix/test-fix' into 'develop'rinpatch2+2-2
Merge branch 'smol-test' into 'develop'lain1+17-0
CommonAPI test: Add test for pollslain1+17-0
don't run in async modeAlexander Strizhakov1+1-1
fix for test on macAlexander Strizhakov1+1-1
changelog entryAlexander Strizhakov1+10-2
fixAlexander Strizhakov1+1-1
fixes after rebaseAlexander Strizhakov4+25-29
docs updateAlexander Strizhakov1+2-0
pack routes changeAlexander Strizhakov4+97-83
changelog entryAlexander Strizhakov1+1-0
pagination for remote emoji packsAlexander Strizhakov4+25-10
support for special chars in pack nameAlexander Strizhakov7+129-59
Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_streamMark Felder2+4-7
Merge branch 'develop' into feature/bulk-confirmationMark Felder281+9078-9998
Merge branch 'issue/2115' into 'develop'lain6+91-69
Merge branch 'user-query/filter-out-internal' into 'develop'lain2+47-5
Merge branch 'develop' into 'issue/2115'lain20+886-547
transmogrifier: Drop incoming create early if it already existsHaelwenn (lanodan) Monnier2+7-3
Merge developRoman Chvanikov44+1837-1059
Merge branch 'issue/1975' into 'develop'lain15+858-534
Merge branch 'develop' into 'issue/1975'lain6+29-14
Merge branch 'email-fix-develop' into 'develop'lain6+29-14
Changelog: Add info about emoji zip import featurelain1+2-4
Changelog: Info about email fix.lain1+3-0
finland-emojis.zip -> emojis.zipMaksim Pechnikov4+6-6
Merge branch 'develop' into issue/1975Maksim Pechnikov598+11355-10682
Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason269+8638-9321
Add test for check_activity_expiration_config/0Mark Felder1+8-0
Add deprecation warning test for check_hellthread_threshold/0Mark Felder1+8-0
Add test for welcome message formatMark Felder1+8-0
Fix gun_pool_options deprecation warning messageMark Felder2+2-2
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.Mark Felder1+0-26
Changelog: Add info about chat pagination fix.lain1+2-0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115lain261+7481-9391
Filter out internal users by defaultEgor Kislitsyn2+47-5
Merge branch 'chore/missing-link' into 'develop'feld1+4-3
Add FreeBSD and alpha sortMark Felder1+4-3
ActivityPub: Return Announces when filtering by `following`.lain2+91-1
Fix deprecation warning for welcome messageMark Felder1+3-3
Merge branch 'docs/nginx-config-fedsockets' into 'develop'feld1+20-13
Use an upstream for reverse proxy so future modifications are simplifiedMark Felder1+9-5
Merge branch 'chore/autolinker-rename' into 'develop'feld1+1-1
Most proxy settings can be globalMark Felder1+6-15
Remove duplicate settingMark Felder1+0-2
Add FedSockets configMark Felder1+14-0
Merge branch 'fix/fedsocket-useragent' into 'develop'feld1+8-3
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()Alex Gleason1+6-9
Chase the Autolinker rename from !2677Mark Felder1+1-1
Pass hackney tls config into email tests, #2101Alex Gleason2+12-2
Fix #2172 HTTP error on password resetAlex Gleason1+3-3
Allow emails to be sent again, #2101 #2172 https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707Alex Gleason1+5-0
Merge branch 'bugfix/federator-actor-error' into 'develop'lain1+11-5
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'lain7+325-176
Merge branch 'issue/2099' into 'develop'lain13+563-307
Merge branch '2161-block-changes' into 'develop'Haelwenn2+18-3
Force HTTP for fedsocketsMark Felder1+1-1
ActivityPub: Don't block-filter your own postslain2+18-3
Update CHANGELOGRoman Chvanikov1+1-0
Refactor mutes removing in CommonAPI and UserRoman Chvanikov5+50-7
Merge branch 'develop' into feature/expire-mutesRoman Chvanikov118+4818-653
Merge branch 'weblate-pleroma-pleroma' into 'develop'lain1+580-0
Translated using Weblate (Chinese (Simplified))Kana1+32-30
Added translation using Weblate (Chinese (Simplified))Kana1+578-0
Merge branch 'fix/openapi-errors' into 'develop'rinpatch8+26-14
[#2074] OAuth scope checking in Streaming API.Ivan Tashkinov7+325-176
OpenAPI: make it possible to generate a spec without starting the apprinpatch1+9-4
OpenAPI: fix various errors pointed out by editor.swagger.iorinpatch7+17-10
Add user agent to fedsocket requestsMark Felder1+7-2
Merge branch 'develop' into issue/2099Maksim Pechnikov46+2487-181
Merge branch 'media-preview-proxy-nostream' into 'develop'feld25+988-133
Merge branch 'fix/fedsocket-log-spam' into 'develop'lain1+3-0
FedSockets: fix log spam on cached rejectsrinpatch1+3-0
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'lain2+20-0
Merge branch 'websocket-data-fed' into 'develop'lain25+1476-46
Federate data through persistent websocket connectionsSteven Fuchs25+1476-46
update changelogMaksim Pechnikov2+4-1
Merge branch 'develop' into issue/2099Maksim Pechnikov67+1726-461
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapterSergey Suprunenko2+20-0
Merge branch 'stable-sync/2.1.2' into 'develop'rinpatch24+335-316
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostreamIvan Tashkinov32+638-92
Merge branch 'stable' into stable-sync/2.1.2rinpatch24+335-316
Merge branch 'release/2.1.2' into 'stable'rinpatch50+635-388
Fix MRF reject for ChatMessageHaelwenn (lanodan) Monnier6+30-5
Create MRF.filter_pipeline to inject :object_data when presentHaelwenn (lanodan) Monnier6+59-15
KeywordPolicy: Still match when fields are absentHaelwenn (lanodan) Monnier1+32-35
pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7drinpatch23+320-310
CHANGELOG.md: Add 2.1.2 entryrinpatch1+15-4
Merge branch 'omit-nondiscoverable-from-search' into 'develop'Haelwenn9+58-24
Merge branch 'instance-docs' into 'develop'feld8+378-0
mix.exs: bump version to 2.1.2rinpatch1+1-1
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'rinpatch3+6-3
Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch2+22-16
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn3+42-2
Merge branch 'reply-visibility-user-guard' into 'develop'lain2+10-2
Merge branch 'bugfix/mrf-ingestion' into 'develop'rinpatch12+124-53
adapt to new user factory behaviorstwf1+2-2
add test and changelog entrystwf2+9-1
User search respect discoverable flagstwf6+47-21
Merge branch 'hotfix/rich-media-compile-error' into 'develop'rinpatch1+1-1
Merge branch 'feat/rich-media-head' into 'develop'rinpatch4+99-1
Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'feld3+56-10
Deny ConfigDB migration when deprecated settings foundMark Felder3+56-10
Merge branch 'nondiscoverable-user-metadata' into 'develop'lain4+28-7
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostreamIvan Tashkinov54+1439-588
[#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.Ivan Tashkinov8+329-63
Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop'rinpatch1+49-24
Merge branch 'develop' into 'nondiscoverable-user-metadata'lain60+1478-578
RichMedia: Fix log spam on failures and resetting TTL on cached errorsrinpatch1+49-24
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`eugenijm5+26-21
add description to changelogstwf1+1-0
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin APIeugenijm8+373-0
Merge branch 'chat-moderation' into 'develop'lain16+707-31
Merge branch 'develop' into feature/expire-mutesRoman Chvanikov50+874-548
AdminAPI Chat tests: Remove factory.lain2+8-59
Admin chat api tests: Small additions.lain2+4-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderationlain51+888-562
small refactoringMaksim Pechnikov2+5-34
Merge branch 'develop' into issue/2099Maksim Pechnikov274+3725-8743
[#2497] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.Ivan Tashkinov7+33-16
Merge branch 'chore/unused-import' into 'develop'feld1+0-1
Remove unused importMark Felder1+0-1
Merge branch '2144-empty-users' into 'develop'rinpatch2+14-5
User: Remote users don't need to be confirmed or approvedlain2+14-5
Merge branch 'feat/connection-worker-monitor-flush' into 'develop'rinpatch1+8-15
ConnectionPool Worker: use monitor flush instead of checking refrinpatch1+8-15
Merge branch 'chores/mrf-loglevel' into 'develop'rinpatch3+23-10
Merge branch 'features/validators-video' into 'develop'rinpatch20+514-447
Merge branch 'issue/2089' into 'develop'lain13+125-56
RepoStreamer.chunk_stream -> Repo.chunk_streamMaksim Pechnikov6+47-40
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostreamIvan Tashkinov17+205-29
fixed testsMaksim Pechnikov5+11-6
Merge branch 'reply-visibility-user-guard' into 'develop'lain3+11-2
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated usereugenijm3+11-2
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn4+48-4
Move changelog entry to next patchMark Felder1+2-0
Ensure SimplePolicy's tags in string representation don't trip up the object validatorMark Felder1+1-1
fix credo warningstwf1+1-1
search indexing metadata respects discoverable flagstwf3+27-7
Fixed Welcome chats with MRF Simple applied locallyMark Felder1+4-0
Merge duplicate Changed sectionsMark Felder1+1-3
Validate Welcome Chat message works with Simple policy applied to local instanceMark Felder1+39-0
Merge branch 'remove/managed-config-option' into 'develop'rinpatch5+29-8
Remove `:managed_config` option.rinpatch5+29-8
Merge branch 'hotfix/rich-media-compile-error' into 'develop'rinpatch1+1-1
RichMedia: fix a compilation error due to nonexistent variablerinpatch1+1-1
Merge branch 'feat/rich-media-head' into 'develop'rinpatch4+99-1
Apply 1 suggestion(s) to 1 file(s)rinpatch1+1-1
RichMedia: Do a HEAD request to check content type/lengthrinpatch3+91-1
RichMedia parser: do not set a cache TTL for unchanging errorsrinpatch1+8-0
added notification constraintsMaksim Pechnikov4+67-10
Merge branch 'fix/2139-oban-migration' into 'develop'rinpatch2+4-0
Apply 1 suggestion(s) to 1 file(s)Maksim1+1-1
Merge developRoman Chvanikov218+2027-8055
Remove unused requireRoman Chvanikov1+0-2
remove old workers in oban migrationsAlexander Strizhakov2+4-0
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+13-13
[#2497] Media preview proxy: preview bypass for small images (basing on Content-Length and Content-Type).Ivan Tashkinov1+19-6
[#2497] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.Ivan Tashkinov1+9-5
Ensure we only apply NSFW Simple policy on parsable objectsMark Felder1+2-1
Translated using Weblate (Spanish)tarteka1+13-13
Merge branch 'chore/docs-spelling' into 'develop'feld1+1-1
SpellingMark Felder1+1-1
Merge branch 'chat-moderation-stable' into chat-moderationAlex Gleason1+10-3
Chat moderation: fix formattingAlex Gleason1+10-3
Merge remote-tracking branch 'upstream/develop' into chat-moderationAlex Gleason168+2662-8028
Chat moderation: add tests for unauthorized accessAlex Gleason3+109-2
Chat Moderation: use explicit `sender` and `recipient` fieldsAlex Gleason5+48-8
Credo fixAlex Gleason1+1-1
Docs: AdminAPI chat moderationAlex Gleason1+111-0
AdminAPI: fix delete chat messageAlex Gleason3+56-43
AdminAPI: show chatAlex Gleason4+59-2
AdminAPI: list messages in a chatAlex Gleason4+107-2
Refactor with Chat.for_user_query/1Alex Gleason3+15-14
AdminAPI: list chats for a userAlex Gleason3+48-0
AdminAPI: delete a chat messageAlex Gleason6+214-0
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1Alex Gleason5+45-24
Fetcher: Correctly return MRF reject reasonHaelwenn (lanodan) Monnier3+23-10
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxyIvan Tashkinov106+845-7684
Merge branch 'feat/log-possible-hol' into 'develop'rinpatch3+38-14
ConnectionPool: Log possible HTTP1 blocksrinpatch3+38-14
Apply 1 suggestion(s) to 1 file(s)Haelwenn1+1-1
Merge branch 'bugfix/favicon-none-found' into 'develop'rinpatch2+53-36
More commits remaining [...]