Alex Gleason [Sat, 29 May 2021 17:29:58 +0000 (12:29 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-html
Alex Gleason [Sat, 22 May 2021 21:44:51 +0000 (16:44 -0500)]
Break out activity-specific HTML functions into Pleroma.Activity.HTML
Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex
feld [Fri, 28 May 2021 19:06:49 +0000 (19:06 +0000)]
Merge branch 'cycles-router-api-routes' into 'develop'
Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
See merge request pleroma/pleroma!3419
feld [Fri, 28 May 2021 19:05:13 +0000 (19:05 +0000)]
Merge branch 'simplepolicy-announce-leak' into 'develop'
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
feld [Fri, 28 May 2021 19:02:15 +0000 (19:02 +0000)]
Merge branch 'gitignore-runtime-exs' into 'develop'
gitignore runtime.exs
See merge request pleroma/pleroma!3407
feld [Fri, 28 May 2021 19:01:47 +0000 (19:01 +0000)]
Merge branch 'alias-router-helpers' into 'develop'
Switch to aliasing `Router.Helpers` instead of importing
See merge request pleroma/pleroma!3409
feld [Fri, 28 May 2021 18:57:45 +0000 (18:57 +0000)]
Merge branch 'plug-runtime-dev' into 'develop'
Put Plugs in runtime mode in :dev, :test to speed up recompilation
See merge request pleroma/pleroma!3411
Alex Gleason [Fri, 28 May 2021 18:51:21 +0000 (13:51 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
Alex Gleason [Fri, 21 May 2021 19:47:11 +0000 (14:47 -0500)]
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
Reduce recompilation time by breaking compile-time cycles
feld [Fri, 28 May 2021 18:24:33 +0000 (18:24 +0000)]
Merge branch 'cycles-router' into 'develop'
Recompilation speedup: move StaticFEPlug to a pipeline
See merge request pleroma/pleroma!3417
feld [Fri, 28 May 2021 18:22:27 +0000 (18:22 +0000)]
Merge branch 'cycles-router-mediaproxy' into 'develop'
Recompilation speedup: don't make MediaProxy be a compile-dep of Router
See merge request pleroma/pleroma!3418
Alex Gleason [Fri, 28 May 2021 18:08:23 +0000 (13:08 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
Alex Gleason [Sat, 22 May 2021 20:04:05 +0000 (15:04 -0500)]
Don't make MediaProxy be a compile-dep of Router
Speeds up recompilation by removing MediaProxy as a compile-time dep of Router
Alex Gleason [Fri, 28 May 2021 17:44:16 +0000 (12:44 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router
Alex Gleason [Sun, 23 May 2021 22:25:18 +0000 (17:25 -0500)]
Router: move StaticFEPlug to a pipeline
Speed up recompilation by breaking a cycle. Removes StaticFEPlug as a compile-time dep of Router.
Haelwenn [Thu, 27 May 2021 21:01:54 +0000 (21:01 +0000)]
Merge branch 'featured-totalItems' into 'develop'
Add missing totalItems field for featured collections
See merge request pleroma/pleroma!3416
Mark Felder [Thu, 27 May 2021 17:20:21 +0000 (12:20 -0500)]
Missing entry for pinned posts federation from MR !3312
Mark Felder [Thu, 27 May 2021 17:04:42 +0000 (12:04 -0500)]
Provide totalItems field for featured collections
Haelwenn [Wed, 26 May 2021 18:04:23 +0000 (18:04 +0000)]
Merge branch 'feat/expose_email_to_self' into 'develop'
Expose user email address to user/owner; not publicly.
See merge request pleroma/pleroma!3412
Haelwenn [Sat, 22 May 2021 15:46:02 +0000 (15:46 +0000)]
Merge branch 'mix_config_deprecation' into 'develop'
Switch from the deprecated "use Mix.config" to "import Config"
See merge request pleroma/pleroma!3413
Mark Felder [Thu, 20 May 2021 18:55:37 +0000 (13:55 -0500)]
Switch from the deprecated "use Mix.config" to "import Config"
Mark Felder [Thu, 20 May 2021 17:50:43 +0000 (12:50 -0500)]
Expose user email address to user/owner; not publicly.
Alex Gleason [Wed, 19 May 2021 19:27:59 +0000 (14:27 -0500)]
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
Alex Gleason [Wed, 19 May 2021 19:27:02 +0000 (14:27 -0500)]
Put Plugs in runtime mode in :dev, :test to speed up recompilation
Alex Gleason [Wed, 19 May 2021 17:49:00 +0000 (12:49 -0500)]
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
Alex Gleason [Tue, 18 May 2021 22:11:25 +0000 (17:11 -0500)]
Switch to aliasing `Router.Helpers` instead of importing
feld [Tue, 18 May 2021 21:54:54 +0000 (21:54 +0000)]
Merge branch 'chore/changelog' into 'develop'
Clarify AttachmentMetadata changes
See merge request pleroma/pleroma!3408
Mark Felder [Tue, 18 May 2021 21:46:51 +0000 (16:46 -0500)]
Clarify AttachmentMetadata changes
feld [Tue, 18 May 2021 21:41:34 +0000 (21:41 +0000)]
Merge branch 'blurhash' into 'develop'
Upload filter for media metadata (Support blurhash, get WxH)
See merge request pleroma/pleroma!3404
Mark Felder [Tue, 18 May 2021 21:28:21 +0000 (16:28 -0500)]
Fixed checking for Upload Filter required commands
Mark Felder [Tue, 18 May 2021 20:51:11 +0000 (15:51 -0500)]
Check AnalyzeMetadata filter's required commands
eblurhash:magick uses "convert"
Fetching image metadata uses "mogrify"
Mark Felder [Tue, 18 May 2021 20:33:33 +0000 (15:33 -0500)]
Rename upload filter to AnalyzeMetadata
lain [Mon, 17 May 2021 18:41:12 +0000 (18:41 +0000)]
Merge branch 'optional-config' into 'develop'
Save ~10 minutes on source installation
See merge request pleroma/pleroma!3406
Alex Gleason [Sun, 16 May 2021 18:22:26 +0000 (13:22 -0500)]
Merge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exs
Alex Gleason [Sun, 16 May 2021 18:22:07 +0000 (13:22 -0500)]
gitignore `config/runtime.exs`
Alex Gleason [Sun, 16 May 2021 17:27:29 +0000 (12:27 -0500)]
Merge remote-tracking branch 'pleroma/develop' into optional-config
Alex Gleason [Sun, 16 May 2021 17:20:20 +0000 (12:20 -0500)]
Docs: use `MIX_ENV=prod mix pleroma.instance gen`
Alex Gleason [Sun, 16 May 2021 17:26:32 +0000 (12:26 -0500)]
Make prod.secret.exs optional (with warning)
Alex Gleason [Fri, 14 May 2021 14:09:32 +0000 (09:09 -0500)]
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
Alex Gleason [Fri, 14 May 2021 13:38:23 +0000 (08:38 -0500)]
Support blurhash
Alex Gleason [Thu, 13 May 2021 01:15:33 +0000 (20:15 -0500)]
Changelog: attachment meta
Alex Gleason [Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)]
Merge remote-tracking branch 'upstream/develop' into attachment-meta
Alex Gleason [Thu, 13 May 2021 00:03:10 +0000 (19:03 -0500)]
Federate attachments as Links instead of Documents
Alex Gleason [Wed, 12 May 2021 21:16:10 +0000 (16:16 -0500)]
Don't render media `meta` if nil
Alex Gleason [Wed, 12 May 2021 20:38:49 +0000 (15:38 -0500)]
Ingest remote attachment width/height
Alex Gleason [Wed, 12 May 2021 18:38:11 +0000 (13:38 -0500)]
Add SetMeta filter to store uploaded image sizes
Alex Gleason [Fri, 7 May 2021 17:40:45 +0000 (12:40 -0500)]
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
feld [Tue, 4 May 2021 13:30:00 +0000 (13:30 +0000)]
Merge branch 'dont-crash-email-settings' into 'develop'
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
feld [Tue, 4 May 2021 13:29:14 +0000 (13:29 +0000)]
Merge branch 'earmark' into 'develop'
Upgrade Earmark to v1.4.15
Closes #1942 and #2026
See merge request pleroma/pleroma!3076
Alex Gleason [Mon, 3 May 2021 19:30:21 +0000 (14:30 -0500)]
CHANGELOG: don't crash so hard when email settings are invalid
Alex Gleason [Mon, 3 May 2021 19:43:28 +0000 (14:43 -0500)]
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
Alex Gleason [Mon, 3 May 2021 19:27:03 +0000 (14:27 -0500)]
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/4
Alex Gleason [Sat, 1 May 2021 16:28:06 +0000 (11:28 -0500)]
CHANGELOG: markdown
Alex Gleason [Fri, 2 Apr 2021 17:18:35 +0000 (12:18 -0500)]
CHANGELOG: SimplePolicy embedded objects are now checked
Alex Gleason [Fri, 30 Apr 2021 19:21:17 +0000 (14:21 -0500)]
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
Alex Gleason [Thu, 29 Apr 2021 16:51:49 +0000 (11:51 -0500)]
SimplePolicy: filter string Objects
Alex Gleason [Thu, 18 Mar 2021 20:31:50 +0000 (15:31 -0500)]
SimplePolicy: filter nested objects
Alex Gleason [Fri, 30 Apr 2021 18:17:03 +0000 (13:17 -0500)]
Merge remote-tracking branch 'upstream/develop' into earmark
Alex Gleason [Fri, 30 Apr 2021 17:55:43 +0000 (12:55 -0500)]
Fix failing remote mentions test, valid TLDs
Alex Gleason [Fri, 30 Apr 2021 17:51:18 +0000 (12:51 -0500)]
Delete obsolete EarmarkRendereTests (moved to UtilsTest)
Alex Gleason [Fri, 30 Apr 2021 17:27:06 +0000 (12:27 -0500)]
Remove Pleroma.Formatter.minify/2
Alex Gleason [Fri, 30 Apr 2021 17:23:11 +0000 (12:23 -0500)]
Upgrade Earmark 1.4.15
feld [Thu, 29 Apr 2021 19:13:50 +0000 (19:13 +0000)]
Merge branch 'oauth-token-id' into 'develop'
Return token's primary key with POST /oauth/token
See merge request pleroma/pleroma!3380
Alex Gleason [Thu, 29 Apr 2021 19:06:12 +0000 (14:06 -0500)]
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
feld [Thu, 29 Apr 2021 18:56:28 +0000 (18:56 +0000)]
Merge branch 'maybe-fix-ci' into 'develop'
CI: Purge pleroma build directory between runs
See merge request pleroma/pleroma!3399
Alex Gleason [Thu, 29 Apr 2021 18:03:41 +0000 (13:03 -0500)]
CI: Purge pleroma build directory between runs
Alex Gleason [Thu, 29 Apr 2021 17:20:46 +0000 (12:20 -0500)]
CHANGELOG: Return OAuth token `id`
Alex Gleason [Thu, 29 Apr 2021 17:19:10 +0000 (12:19 -0500)]
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
Haelwenn [Wed, 28 Apr 2021 04:53:25 +0000 (04:53 +0000)]
Merge branch 'gitlab-ci-mix-lock' into 'develop'
Cache GitLab CI based on mix.lock
See merge request pleroma/pleroma!3398
Alex Gleason [Tue, 27 Apr 2021 16:54:28 +0000 (11:54 -0500)]
Cache gitlab-ci based on mix.lock
Haelwenn [Fri, 23 Apr 2021 02:14:11 +0000 (02:14 +0000)]
Merge branch 'fix/delete_activities_timeout' into 'develop'
Fix pleroma.user delete_activities mix task
See merge request pleroma/pleroma!3394
Mark Felder [Thu, 22 Apr 2021 15:15:05 +0000 (10:15 -0500)]
Fixed pleroma.user delete_activities mix task.
Mark Felder [Thu, 22 Apr 2021 15:11:08 +0000 (10:11 -0500)]
Cleanup and ensure we obey custom Repo timeout
Mark Felder [Tue, 20 Apr 2021 17:00:02 +0000 (12:00 -0500)]
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval
Mark Felder [Tue, 20 Apr 2021 16:16:24 +0000 (11:16 -0500)]
Try to set query timeout intelligently
Mark Felder [Tue, 20 Apr 2021 16:10:39 +0000 (11:10 -0500)]
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task
Mark Felder [Mon, 19 Apr 2021 20:43:17 +0000 (15:43 -0500)]
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.
feld [Tue, 20 Apr 2021 18:02:48 +0000 (18:02 +0000)]
Merge branch 'fix/docs' into 'develop'
Docs: Fix incorrect shell command
See merge request pleroma/pleroma!3396
Mark Felder [Tue, 20 Apr 2021 17:31:14 +0000 (12:31 -0500)]
Fix incorrect shell command
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
feld [Mon, 19 Apr 2021 22:39:52 +0000 (22:39 +0000)]
Merge branch 'feature/opt-out-of-google-floc' into 'develop'
Add opting out of Google FLoC to HTTPSecurityPlug headers
Closes #2630
See merge request pleroma/pleroma!3393
Sean King [Mon, 19 Apr 2021 22:06:19 +0000 (16:06 -0600)]
Add CHANGELOG entry
Sean King [Mon, 19 Apr 2021 21:42:38 +0000 (15:42 -0600)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
feld [Mon, 19 Apr 2021 21:34:38 +0000 (21:34 +0000)]
Merge branch 'fix/tests' into 'develop'
Fix tests broken since !3312
See merge request pleroma/pleroma!3395
Mark Felder [Mon, 19 Apr 2021 21:23:57 +0000 (16:23 -0500)]
Fix error response which was breaking tests related to pinned posts
Sean King [Sun, 18 Apr 2021 20:00:18 +0000 (14:00 -0600)]
Add opting out of Google FLoC to HTTPSecurityPlug headers
rinpatch [Fri, 16 Apr 2021 09:55:55 +0000 (09:55 +0000)]
Merge branch 'features/ingestion-ecto-tag' into 'develop'
TagValidator: New
See merge request pleroma/pleroma!3244
rinpatch [Fri, 16 Apr 2021 09:53:47 +0000 (09:53 +0000)]
Merge branch 'feature/521-pinned-post-federation' into 'develop'
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
rinpatch [Fri, 16 Apr 2021 09:50:26 +0000 (09:50 +0000)]
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381
Haelwenn [Thu, 15 Apr 2021 21:34:55 +0000 (21:34 +0000)]
Merge branch 'fix/notifsettings-breaking-login' into 'develop'
Enforce user.notification_settings is NOT NULL
Closes #2571
See merge request pleroma/pleroma!3386
feld [Thu, 15 Apr 2021 14:59:26 +0000 (14:59 +0000)]
Merge branch 'develop' into 'fix/notifsettings-breaking-login'
# Conflicts:
# CHANGELOG.md
Haelwenn [Thu, 15 Apr 2021 05:44:01 +0000 (05:44 +0000)]
Merge branch 'fix/mastodon-interface-docs-link' into 'develop'
Fix Mastodon interface link in documentation, fixes #2622
Closes #2622
See merge request pleroma/pleroma!3391
Sean King [Wed, 14 Apr 2021 20:01:33 +0000 (14:01 -0600)]
Fix Mastodon interface link
feld [Wed, 14 Apr 2021 16:52:02 +0000 (16:52 +0000)]
Merge branch 'fix/adminapi-concurrent-limiter' into 'develop'
Fix ConcurrentLimiter settings via AdminAPI
See merge request pleroma/pleroma!3390
Mark Felder [Wed, 14 Apr 2021 14:39:57 +0000 (09:39 -0500)]
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test
Mark Felder [Tue, 13 Apr 2021 19:25:15 +0000 (14:25 -0500)]
Improve string_to_elixir_types/1 with guards
Mark Felder [Tue, 13 Apr 2021 19:39:44 +0000 (14:39 -0500)]
Document fixed ability to save ConcurrentLimiter settings in ConfigDB
Mark Felder [Tue, 13 Apr 2021 17:09:18 +0000 (12:09 -0500)]
Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1
Mark Felder [Tue, 13 Apr 2021 16:15:52 +0000 (11:15 -0500)]
Initial test validating the AdminAPI issue
Haelwenn [Tue, 13 Apr 2021 19:05:07 +0000 (19:05 +0000)]
Merge branch 'fix/instance-thumbnail-url' into 'develop'
Fix URL to custom instance thumbnail
Closes #2611
See merge request pleroma/pleroma!3388
Mark Felder [Tue, 13 Apr 2021 15:55:54 +0000 (10:55 -0500)]
Fix assignment / assertion
projects / akkoma / log