akkoma
3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-constants
Alex Gleason [Tue, 1 Jun 2021 16:32:30 +0000 (11:32 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-constants

3 years agoMerge branch 'cycles-frontend-static' into 'develop'
feld [Tue, 1 Jun 2021 16:19:41 +0000 (16:19 +0000)]
Merge branch 'cycles-frontend-static' into 'develop'

Recompilation speedup: make Router a runtime dep of FrontendStatic

See merge request pleroma/pleroma!3429

3 years agoMerge branch 'cycles-base-url' into 'develop'
feld [Tue, 1 Jun 2021 16:15:27 +0000 (16:15 +0000)]
Merge branch 'cycles-base-url' into 'develop'

Deprecate Pleroma.Web.base_url/0

See merge request pleroma/pleroma!3432

3 years agoMerge branch 'features/validators-note' into 'develop'
Haelwenn [Tue, 1 Jun 2021 01:51:38 +0000 (01:51 +0000)]
Merge branch 'features/validators-note' into 'develop'

Pipeline Ingestion: Note

Closes #290

See merge request pleroma/pleroma!2984

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-base-url
Alex Gleason [Mon, 31 May 2021 21:49:46 +0000 (16:49 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url

3 years agoDeprecate Pleroma.Web.base_url/0
Alex Gleason [Mon, 31 May 2021 20:09:11 +0000 (15:09 -0500)]
Deprecate Pleroma.Web.base_url/0
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.

3 years agoPleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
Alex Gleason [Mon, 31 May 2021 18:39:15 +0000 (13:39 -0500)]
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-time

3 years agoMerge branch 'docs/goto-libera' into 'develop'
Haelwenn [Mon, 31 May 2021 17:42:36 +0000 (17:42 +0000)]
Merge branch 'docs/goto-libera' into 'develop'

Changing references of freenode to libera.chat

See merge request pleroma/pleroma!3415

3 years agoChanging references of freenode to libera.chat
Haelwenn (lanodan) Monnier [Wed, 26 May 2021 04:14:45 +0000 (06:14 +0200)]
Changing references of freenode to libera.chat

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Mon, 31 May 2021 14:40:46 +0000 (14:40 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!3373

3 years agoMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6e...
Alex Gleason [Sun, 30 May 2021 17:58:24 +0000 (12:58 -0500)]
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1

3 years agoTranslated using Weblate (Chinese (Traditional))
Snow [Tue, 11 May 2021 01:39:31 +0000 (01:39 +0000)]
Translated using Weblate (Chinese (Traditional))

Currently translated at 5.6% (6 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/

3 years agoTranslated using Weblate (Chinese (Traditional))
Snow [Thu, 25 Mar 2021 06:35:52 +0000 (06:35 +0000)]
Translated using Weblate (Chinese (Traditional))

Currently translated at 0.9% (1 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/

3 years agoAdded translation using Weblate (Chinese (Traditional))
Snow [Mon, 15 Mar 2021 15:10:17 +0000 (15:10 +0000)]
Added translation using Weblate (Chinese (Traditional))

3 years agoMerge branch 'ffmpeg' into 'develop'
Haelwenn [Sun, 30 May 2021 17:42:48 +0000 (17:42 +0000)]
Merge branch 'ffmpeg' into 'develop'

Add ffmpeg to docker image

See merge request pleroma/pleroma!3428

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
Alex Gleason [Sun, 30 May 2021 17:12:58 +0000 (12:12 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static

3 years agoFrontendStatic: make Router a runtime dep
Alex Gleason [Fri, 21 May 2021 22:37:34 +0000 (17:37 -0500)]
FrontendStatic: make Router a runtime dep
Speeds up recompilation by removing compile-time cycles

3 years agoAdd ffmpeg
shibao [Sun, 30 May 2021 14:27:58 +0000 (10:27 -0400)]
Add ffmpeg

3 years agoMerge branch 'cycles-views' into 'develop'
feld [Sat, 29 May 2021 21:50:07 +0000 (21:50 +0000)]
Merge branch 'cycles-views' into 'develop'

Recompilation speedup: Create real Views for all Controllers

See merge request pleroma/pleroma!3425

3 years agoMerge branch 'cycles-html' into 'develop'
feld [Sat, 29 May 2021 21:19:25 +0000 (21:19 +0000)]
Merge branch 'cycles-html' into 'develop'

Recompilation speedup: Break out activity-specific HTML functions into Pleroma.Activity.HTML

See merge request pleroma/pleroma!3426

3 years agoMerge branch 'cycles-gun' into 'develop'
feld [Sat, 29 May 2021 21:16:57 +0000 (21:16 +0000)]
Merge branch 'cycles-gun' into 'develop'

Recompilation speedup: use runtime deps in Pleroma.Gun

See merge request pleroma/pleroma!3422

3 years agoMerge branch 'cycles-config' into 'develop'
feld [Sat, 29 May 2021 19:20:47 +0000 (19:20 +0000)]
Merge branch 'cycles-config' into 'develop'

Recompilation speedup: use runtime deps in Pleroma.Config

See merge request pleroma/pleroma!3424

3 years agoMerge branch 'cycles-pipeline' into 'develop'
feld [Sat, 29 May 2021 19:16:06 +0000 (19:16 +0000)]
Merge branch 'cycles-pipeline' into 'develop'

Recompilation speedup: switch to runtime deps in ActivityPub.Pipeline

See merge request pleroma/pleroma!3427

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-pipeline
Alex Gleason [Sat, 29 May 2021 18:32:57 +0000 (13:32 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline

3 years agoActivityPub.Pipeline: switch to runtime deps
Alex Gleason [Fri, 21 May 2021 21:58:20 +0000 (16:58 -0500)]
ActivityPub.Pipeline: switch to runtime deps
Speed up recompilation by breaking compile-time cycles

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-html
Alex Gleason [Sat, 29 May 2021 17:29:58 +0000 (12:29 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-html

3 years agoBreak out activity-specific HTML functions into Pleroma.Activity.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

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-views
Alex Gleason [Sat, 29 May 2021 17:17:24 +0000 (12:17 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-views

3 years agoCreate real Views for all Controllers
Alex Gleason [Sat, 22 May 2021 19:59:12 +0000 (14:59 -0500)]
Create real Views for all Controllers
This makes views depend on each other at runtime instead of compile-time

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-plugs
Alex Gleason [Sat, 29 May 2021 17:01:37 +0000 (12:01 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-plugs

3 years agoConfig: use runtime deps instead of module attributes
Alex Gleason [Fri, 21 May 2021 18:04:57 +0000 (13:04 -0500)]
Config: use runtime deps instead of module attributes
Speeds up recompilation time by breaking compile-time cycles

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-gun
Alex Gleason [Sat, 29 May 2021 16:35:57 +0000 (11:35 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-gun

3 years agoGun: use runtime deps in ConnectionPool
Alex Gleason [Fri, 21 May 2021 17:31:28 +0000 (12:31 -0500)]
Gun: use runtime deps in ConnectionPool
Speed up recompilation time by breaking compile-time cycles

3 years agoGun: make Gun.API a runtime dep
Alex Gleason [Thu, 20 May 2021 22:23:02 +0000 (17:23 -0500)]
Gun: make Gun.API a runtime dep
Speed up recompilation by breaking a compile-time cycle

3 years agoMerge branch 'cycles-router-api-routes' into 'develop'
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

3 years agoMerge branch 'simplepolicy-announce-leak' into 'develop'
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

3 years agoMerge branch 'gitignore-runtime-exs' into 'develop'
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

3 years agoMerge branch 'alias-router-helpers' into 'develop'
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

3 years agoMerge branch 'plug-runtime-dev' into 'develop'
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

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
Alex Gleason [Fri, 28 May 2021 18:51:21 +0000 (13:51 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes

3 years agoPleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
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

3 years agoMerge branch 'cycles-router' into 'develop'
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

3 years agoMerge branch 'cycles-router-mediaproxy' into 'develop'
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

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
Alex Gleason [Fri, 28 May 2021 18:08:23 +0000 (13:08 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy

3 years agoDon't make MediaProxy be a compile-dep of Router
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

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-router
Alex Gleason [Fri, 28 May 2021 17:44:16 +0000 (12:44 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-router

3 years agoRouter: move StaticFEPlug to a pipeline
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.

3 years agoMerge branch 'featured-totalItems' into 'develop'
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

3 years agoMissing entry for pinned posts federation from MR !3312
Mark Felder [Thu, 27 May 2021 17:20:21 +0000 (12:20 -0500)]
Missing entry for pinned posts federation from MR !3312

3 years agoProvide totalItems field for featured collections
Mark Felder [Thu, 27 May 2021 17:04:42 +0000 (12:04 -0500)]
Provide totalItems field for featured collections

3 years agoMerge branch 'feat/expose_email_to_self' into 'develop'
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

3 years agoMerge branch 'mix_config_deprecation' into 'develop'
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

3 years agoSwitch from the deprecated "use Mix.config" to "import Config"
Mark Felder [Thu, 20 May 2021 18:55:37 +0000 (13:55 -0500)]
Switch from the deprecated "use Mix.config" to "import Config"

3 years agoExpose user email address to user/owner; not publicly.
Mark Felder [Thu, 20 May 2021 17:50:43 +0000 (12:50 -0500)]
Expose user email address to user/owner; not publicly.

3 years agoMerge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
Alex Gleason [Wed, 19 May 2021 19:27:59 +0000 (14:27 -0500)]
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev

3 years agoPut Plugs in runtime mode in :dev, :test to speed up recompilation
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

3 years agoMerge remote-tracking branch 'pleroma/develop' into alias-router-helpers
Alex Gleason [Wed, 19 May 2021 17:49:00 +0000 (12:49 -0500)]
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers

3 years agoSwitch to aliasing `Router.Helpers` instead of importing
Alex Gleason [Tue, 18 May 2021 22:11:25 +0000 (17:11 -0500)]
Switch to aliasing `Router.Helpers` instead of importing

3 years agoMerge branch 'chore/changelog' into 'develop'
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

3 years agoClarify AttachmentMetadata changes
Mark Felder [Tue, 18 May 2021 21:46:51 +0000 (16:46 -0500)]
Clarify AttachmentMetadata changes

3 years agoMerge branch 'blurhash' into 'develop'
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

3 years agoFixed checking for Upload Filter required commands
Mark Felder [Tue, 18 May 2021 21:28:21 +0000 (16:28 -0500)]
Fixed checking for Upload Filter required commands

3 years agoCheck AnalyzeMetadata filter's 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"

3 years agoRename upload filter to AnalyzeMetadata
Mark Felder [Tue, 18 May 2021 20:33:33 +0000 (15:33 -0500)]
Rename upload filter to AnalyzeMetadata

3 years agoMerge branch 'optional-config' into 'develop'
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

3 years agoMerge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exs
Alex Gleason [Sun, 16 May 2021 18:22:26 +0000 (13:22 -0500)]
Merge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exs

3 years agogitignore `config/runtime.exs`
Alex Gleason [Sun, 16 May 2021 18:22:07 +0000 (13:22 -0500)]
gitignore `config/runtime.exs`

3 years agoMerge remote-tracking branch 'pleroma/develop' into optional-config
Alex Gleason [Sun, 16 May 2021 17:27:29 +0000 (12:27 -0500)]
Merge remote-tracking branch 'pleroma/develop' into optional-config

3 years agoDocs: use `MIX_ENV=prod mix pleroma.instance gen`
Alex Gleason [Sun, 16 May 2021 17:20:20 +0000 (12:20 -0500)]
Docs: use `MIX_ENV=prod mix pleroma.instance gen`

3 years agoMake prod.secret.exs optional (with warning)
Alex Gleason [Sun, 16 May 2021 17:26:32 +0000 (12:26 -0500)]
Make prod.secret.exs optional (with warning)

3 years agoMerge remote-tracking branch 'upstream/attachment-meta' into blurhash
Alex Gleason [Fri, 14 May 2021 14:09:32 +0000 (09:09 -0500)]
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash

3 years agoSupport blurhash
Alex Gleason [Fri, 14 May 2021 13:38:23 +0000 (08:38 -0500)]
Support blurhash

3 years agoChangelog: attachment meta
Alex Gleason [Thu, 13 May 2021 01:15:33 +0000 (20:15 -0500)]
Changelog: attachment meta

3 years agoMerge remote-tracking branch 'upstream/develop' into attachment-meta
Alex Gleason [Thu, 13 May 2021 01:10:52 +0000 (20:10 -0500)]
Merge remote-tracking branch 'upstream/develop' into attachment-meta

3 years agoFederate attachments as Links instead of Documents
Alex Gleason [Thu, 13 May 2021 00:03:10 +0000 (19:03 -0500)]
Federate attachments as Links instead of Documents

3 years agoDon't render media `meta` if nil
Alex Gleason [Wed, 12 May 2021 21:16:10 +0000 (16:16 -0500)]
Don't render media `meta` if nil

3 years agoIngest remote attachment width/height
Alex Gleason [Wed, 12 May 2021 20:38:49 +0000 (15:38 -0500)]
Ingest remote attachment width/height

3 years agoAdd SetMeta filter to store uploaded image sizes
Alex Gleason [Wed, 12 May 2021 18:38:11 +0000 (13:38 -0500)]
Add SetMeta filter to store uploaded image sizes

3 years agoMerge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
Alex Gleason [Fri, 7 May 2021 17:40:45 +0000 (12:40 -0500)]
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak

3 years agoMerge branch 'dont-crash-email-settings' into 'develop'
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

3 years agoMerge branch 'earmark' into 'develop'
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

3 years agoCHANGELOG: don't crash so hard when email settings are invalid
Alex Gleason [Mon, 3 May 2021 19:30:21 +0000 (14:30 -0500)]
CHANGELOG: don't crash so hard when email settings are invalid

3 years agoMerge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
Alex Gleason [Mon, 3 May 2021 19:43:28 +0000 (14:43 -0500)]
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings

3 years agoDon't crash when email settings are invalid
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
3 years agoCHANGELOG: markdown
Alex Gleason [Sat, 1 May 2021 16:28:06 +0000 (11:28 -0500)]
CHANGELOG: markdown

3 years agoCHANGELOG: SimplePolicy embedded objects are now checked
Alex Gleason [Fri, 2 Apr 2021 17:18:35 +0000 (12:18 -0500)]
CHANGELOG: SimplePolicy embedded objects are now checked

3 years agoMerge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
Alex Gleason [Fri, 30 Apr 2021 19:21:17 +0000 (14:21 -0500)]
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak

3 years agoSimplePolicy: filter string Objects
Alex Gleason [Thu, 29 Apr 2021 16:51:49 +0000 (11:51 -0500)]
SimplePolicy: filter string Objects

3 years agoSimplePolicy: filter nested objects
Alex Gleason [Thu, 18 Mar 2021 20:31:50 +0000 (15:31 -0500)]
SimplePolicy: filter nested objects

3 years agoMerge remote-tracking branch 'upstream/develop' into earmark
Alex Gleason [Fri, 30 Apr 2021 18:17:03 +0000 (13:17 -0500)]
Merge remote-tracking branch 'upstream/develop' into earmark

3 years agoFix failing remote mentions test, valid TLDs
Alex Gleason [Fri, 30 Apr 2021 17:55:43 +0000 (12:55 -0500)]
Fix failing remote mentions test, valid TLDs

3 years agoDelete obsolete EarmarkRendereTests (moved to UtilsTest)
Alex Gleason [Fri, 30 Apr 2021 17:51:18 +0000 (12:51 -0500)]
Delete obsolete EarmarkRendereTests (moved to UtilsTest)

3 years agoRemove Pleroma.Formatter.minify/2
Alex Gleason [Fri, 30 Apr 2021 17:27:06 +0000 (12:27 -0500)]
Remove Pleroma.Formatter.minify/2

3 years agoUpgrade Earmark 1.4.15
Alex Gleason [Fri, 30 Apr 2021 17:23:11 +0000 (12:23 -0500)]
Upgrade Earmark 1.4.15

3 years agoMerge branch 'oauth-token-id' into 'develop'
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

3 years agoMerge remote-tracking branch 'upstream/develop' into oauth-token-id
Alex Gleason [Thu, 29 Apr 2021 19:06:12 +0000 (14:06 -0500)]
Merge remote-tracking branch 'upstream/develop' into oauth-token-id

3 years agoMerge branch 'maybe-fix-ci' into 'develop'
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

3 years agoCI: Purge pleroma build directory between runs
Alex Gleason [Thu, 29 Apr 2021 18:03:41 +0000 (13:03 -0500)]
CI: Purge pleroma build directory between runs

3 years agoCHANGELOG: Return OAuth token `id`
Alex Gleason [Thu, 29 Apr 2021 17:20:46 +0000 (12:20 -0500)]
CHANGELOG: Return OAuth token `id`

3 years agoMerge remote-tracking branch 'upstream/develop' into 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