akkoma
5 years agoCredo fixes
rinpatch [Sat, 15 Jun 2019 22:35:45 +0000 (01:35 +0300)]
Credo fixes

5 years agoSanitize HTML in ReportView
rinpatch [Sat, 15 Jun 2019 22:30:32 +0000 (01:30 +0300)]
Sanitize HTML in ReportView

Closes #990

5 years agoAdd tests for report view
rinpatch [Sat, 15 Jun 2019 22:30:14 +0000 (01:30 +0300)]
Add tests for report view

5 years agoMerge branch 'bugfix/980-polls-double-vote' into 'develop'
lain [Sat, 15 Jun 2019 15:13:48 +0000 (15:13 +0000)]
Merge branch 'bugfix/980-polls-double-vote' into 'develop'

MastodonAPI Controller: Band-Aid double vote problem.

See merge request pleroma/pleroma!1275

5 years agoMerge branch 'update/phoenix-and-plug' into 'develop'
lain [Sat, 15 Jun 2019 15:09:14 +0000 (15:09 +0000)]
Merge branch 'update/phoenix-and-plug' into 'develop'

Update Phoenix

See merge request pleroma/pleroma!1290

5 years agoMerge branch '963_oob_oauth_redirect_fix' into 'develop'
kaniini [Sat, 15 Jun 2019 13:45:50 +0000 (13:45 +0000)]
Merge branch '963_oob_oauth_redirect_fix' into 'develop'

[#963] No redirect on OOB OAuth authorize request with existing authorization

See merge request pleroma/pleroma!1276

5 years agoOEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in...
Mark Felder [Sat, 15 Jun 2019 12:04:01 +0000 (07:04 -0500)]
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
and this leftover artifact breaks compiling now.

5 years agoUpdate Phoenix to 1.4.8
Mark Felder [Sat, 15 Jun 2019 12:03:26 +0000 (07:03 -0500)]
Update Phoenix to 1.4.8

5 years agoMerge branch 'feature/add-chat-token-to-masto-api' into 'develop'
rinpatch [Sat, 15 Jun 2019 09:56:01 +0000 (09:56 +0000)]
Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'

Mastodon API: Return the token needed for the chat.

See merge request pleroma/pleroma!1292

5 years agoApply suggestion to CHANGELOG.md
lain [Sat, 15 Jun 2019 09:27:27 +0000 (09:27 +0000)]
Apply suggestion to CHANGELOG.md

5 years agoDocumentation: Document chat token response.
lain [Sat, 15 Jun 2019 09:11:45 +0000 (11:11 +0200)]
Documentation: Document chat token response.

5 years agoChangelog: Document chat token.
lain [Sat, 15 Jun 2019 09:02:05 +0000 (11:02 +0200)]
Changelog: Document chat token.

5 years agoMastodon API: Return the token needed for the chat.
lain [Sat, 15 Jun 2019 08:59:35 +0000 (10:59 +0200)]
Mastodon API: Return the token needed for the chat.

5 years agoMerge branch 'feature/add-background-image-to-mastoapi' into 'develop'
rinpatch [Fri, 14 Jun 2019 16:49:28 +0000 (16:49 +0000)]
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'

AccountView: Add user background.

See merge request pleroma/pleroma!1280

5 years agoMerge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'
kaniini [Fri, 14 Jun 2019 15:45:05 +0000 (15:45 +0000)]
Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'

Feature/905 dynamic configuration in sql

Closes #905

See merge request pleroma/pleroma!1195

5 years agoit is changed in compile time
Alexander Strizhakov [Fri, 14 Jun 2019 15:45:05 +0000 (15:45 +0000)]
it is changed in compile time

we can't change module attributes and endpoint settings in runtime

5 years agoMerge branch 'fix-rate-limit-test' into 'develop'
rinpatch [Fri, 14 Jun 2019 14:50:19 +0000 (14:50 +0000)]
Merge branch 'fix-rate-limit-test' into 'develop'

Fix rate limit test

See merge request pleroma/pleroma!1289

5 years agoFix rate limit test
Egor Kislitsyn [Fri, 14 Jun 2019 12:24:31 +0000 (19:24 +0700)]
Fix rate limit test

5 years agoMerge branch 'fix/hashtag-rich-media' into 'develop'
lain [Fri, 14 Jun 2019 11:52:04 +0000 (11:52 +0000)]
Merge branch 'fix/hashtag-rich-media' into 'develop'

Fix hashtags being picked up by rich media parser

Closes #989

See merge request pleroma/pleroma!1288

5 years agoMerge branch 'issues/948-account-search' into 'develop'
lain [Fri, 14 Jun 2019 11:39:57 +0000 (11:39 +0000)]
Merge branch 'issues/948-account-search' into 'develop'

[#948] /api/v1/account_search added optional parameters (limit, offset, following)

See merge request pleroma/pleroma!1270

5 years ago[#948] /api/v1/account_search added optional parameters (limit, offset, following)
Maksim [Fri, 14 Jun 2019 11:39:57 +0000 (11:39 +0000)]
[#948] /api/v1/account_search added optional parameters (limit, offset, following)

5 years agoFix hashtags being picked up by rich media parser
rinpatch [Fri, 14 Jun 2019 11:34:42 +0000 (14:34 +0300)]
Fix hashtags being picked up by rich media parser

Closes #989

5 years agoMerge branch 'patch-2' into 'develop'
lain [Fri, 14 Jun 2019 09:42:04 +0000 (09:42 +0000)]
Merge branch 'patch-2' into 'develop'

Add copyright info to containment.ex

See merge request pleroma/pleroma!1286

5 years agoAdd copyright info to containment.ex
Egor [Fri, 14 Jun 2019 09:26:36 +0000 (09:26 +0000)]
Add copyright info to containment.ex

5 years agoMerge branch '986-document-how-to-disable-rate-limiting' into 'develop'
lain [Fri, 14 Jun 2019 09:26:26 +0000 (09:26 +0000)]
Merge branch '986-document-how-to-disable-rate-limiting' into 'develop'

Resolve "Document how to disable rate limiting"

Closes #986

See merge request pleroma/pleroma!1285

5 years agoMastodon API: Document changes.
lain [Fri, 14 Jun 2019 09:24:09 +0000 (11:24 +0200)]
Mastodon API: Document changes.

5 years agoMastodonAPI: Add a way to update the background image.
lain [Fri, 14 Jun 2019 09:19:22 +0000 (11:19 +0200)]
MastodonAPI: Add a way to update the background image.

5 years agoImprove rate limiter documentation
Egor Kislitsyn [Fri, 14 Jun 2019 08:02:10 +0000 (15:02 +0700)]
Improve rate limiter documentation

Documents how to disable rate limiting

5 years agoMerge branch 'feature/ci-release-build' into 'develop'
lain [Fri, 14 Jun 2019 06:56:27 +0000 (06:56 +0000)]
Merge branch 'feature/ci-release-build' into 'develop'

CI: build otp releases for master and develop branches

See merge request pleroma/pleroma!1279

5 years agoMerge branch 'release-move-out-application-dir' into 'develop'
lain [Fri, 14 Jun 2019 06:40:04 +0000 (06:40 +0000)]
Merge branch 'release-move-out-application-dir' into 'develop'

Set instance static/uploads to be outside of application directory in release config

See merge request pleroma/pleroma!1283

5 years agoSet instance static/uploads to be outside of application directory in release config
rinpatch [Thu, 13 Jun 2019 22:38:32 +0000 (01:38 +0300)]
Set instance static/uploads to be outside of application directory in release config

In case of releases the application directory changes with each version
so the contents will not be accessible

5 years agoremove the feature branch from only
rinpatch [Thu, 13 Jun 2019 19:31:15 +0000 (22:31 +0300)]
remove the feature branch from only

5 years agoMerge branch 'fix/pleroma-ctl-shellcheck' into 'develop'
rinpatch [Thu, 13 Jun 2019 19:25:48 +0000 (19:25 +0000)]
Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop'

pleroma_ctl: fix == instead of = and double quote the path to prevent globing

See merge request pleroma/pleroma!1282

5 years agopleroma_ctl: fix == instead of = and double quote the path to prevent globing
rinpatch [Thu, 13 Jun 2019 19:16:57 +0000 (22:16 +0300)]
pleroma_ctl: fix == instead of = and double quote the path to prevent globing

5 years agoMerge branch 'develop' into feature/ci-release-build
rinpatch [Thu, 13 Jun 2019 18:37:56 +0000 (21:37 +0300)]
Merge branch 'develop' into feature/ci-release-build

5 years agoMerge branch 'remove-prometheus-nif' into 'develop'
rinpatch [Thu, 13 Jun 2019 18:37:12 +0000 (18:37 +0000)]
Merge branch 'remove-prometheus-nif' into 'develop'

Prometheus: Remove flaky process collection NIF.

See merge request pleroma/pleroma!1281

5 years agoPrometheus: Remove flaky process collection NIF.
lain [Thu, 13 Jun 2019 17:29:02 +0000 (19:29 +0200)]
Prometheus: Remove flaky process collection NIF.

5 years agoRemove a TODO
rinpatch [Thu, 13 Jun 2019 18:23:37 +0000 (21:23 +0300)]
Remove a TODO

5 years agoAccountView: Add user background.
lain [Thu, 13 Jun 2019 17:08:05 +0000 (19:08 +0200)]
AccountView: Add user background.

5 years agoExpire artifacts in 42 years
rinpatch [Thu, 13 Jun 2019 15:22:59 +0000 (18:22 +0300)]
Expire artifacts in 42 years

5 years agoMerge branch 'fix/ogp-title' into 'develop'
lain [Thu, 13 Jun 2019 13:26:39 +0000 (13:26 +0000)]
Merge branch 'fix/ogp-title' into 'develop'

Rich Media Parser: Attempt to use <title> from HTML as a fallback

Closes #979

See merge request pleroma/pleroma!1277

5 years agoMerge branch 'feld/pleroma-fix/ogp-title' into 'fix/ogp-title'
feld [Thu, 13 Jun 2019 12:49:01 +0000 (12:49 +0000)]
Merge branch 'feld/pleroma-fix/ogp-title' into 'fix/ogp-title'

Improve <title> fallback; Add a test

See merge request feld/pleroma!1

5 years agoMerge branch 'develop' into feature/ci-release-build
rinpatch [Thu, 13 Jun 2019 10:54:24 +0000 (13:54 +0300)]
Merge branch 'develop' into feature/ci-release-build

5 years agoCI: Add automatic release builds
rinpatch [Thu, 13 Jun 2019 10:53:59 +0000 (13:53 +0300)]
CI: Add automatic release builds

5 years agoMerge branch 'improve-410-handling' into 'develop'
lain [Thu, 13 Jun 2019 10:47:35 +0000 (10:47 +0000)]
Merge branch 'improve-410-handling' into 'develop'

Handle HTTP 404 and 410 response

Closes #977

See merge request pleroma/pleroma!1278

5 years agoHandle HTTP 404 response
Egor Kislitsyn [Thu, 13 Jun 2019 10:13:35 +0000 (17:13 +0700)]
Handle HTTP 404 response

5 years agoHandle HTTP "410 Gone" response
Egor Kislitsyn [Thu, 13 Jun 2019 09:34:03 +0000 (16:34 +0700)]
Handle HTTP "410 Gone" response

5 years agoImprove <title> fallback; Add a test
Egor Kislitsyn [Thu, 13 Jun 2019 08:02:46 +0000 (15:02 +0700)]
Improve <title> fallback; Add a test

5 years agoRevert "Only run Floki if title is missing from the map"
Mark Felder [Wed, 12 Jun 2019 23:32:28 +0000 (18:32 -0500)]
Revert "Only run Floki if title is missing from the map"

This reverts commit 97d2b1a45ab12c530dd730518b9d8ca546bbc9f2.

5 years agoOnly run Floki if title is missing from the map
Mark Felder [Wed, 12 Jun 2019 23:27:35 +0000 (18:27 -0500)]
Only run Floki if title is missing from the map

5 years agoAttempt to use <title> from HTML as a fallback
Mark Felder [Wed, 12 Jun 2019 22:56:51 +0000 (17:56 -0500)]
Attempt to use <title> from HTML as a fallback

5 years ago[#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth...
Ivan Tashkinov [Wed, 12 Jun 2019 18:30:06 +0000 (21:30 +0300)]
[#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.

5 years agoMastodonAPI Controller: Band-Aid double vote problem.
lain [Wed, 12 Jun 2019 14:36:23 +0000 (16:36 +0200)]
MastodonAPI Controller: Band-Aid double vote problem.

5 years agoMerge branch 'release-config-import' into 'develop'
lain [Wed, 12 Jun 2019 09:58:16 +0000 (09:58 +0000)]
Merge branch 'release-config-import' into 'develop'

Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing

See merge request pleroma/pleroma!1269

5 years agoMerge branch 'chore/tagpolicy_docs' into 'develop'
lain [Wed, 12 Jun 2019 09:52:55 +0000 (09:52 +0000)]
Merge branch 'chore/tagpolicy_docs' into 'develop'

Document TagPolicy in `rewrite_policy` section

See merge request pleroma/pleroma!1271

5 years agoMerge branch 'update_auto_linker' into 'develop'
lain [Wed, 12 Jun 2019 09:52:29 +0000 (09:52 +0000)]
Merge branch 'update_auto_linker' into 'develop'

Update `auto_linker` dependency

See merge request pleroma/pleroma!1272

5 years agoMerge branch 'remove-search-result-order' into 'develop'
lain [Wed, 12 Jun 2019 09:51:54 +0000 (09:51 +0000)]
Merge branch 'remove-search-result-order' into 'develop'

Remove search result order for non-RUM indexes

Closes #940

See merge request pleroma/pleroma!1273

5 years agoRemove search result order for non-RUM indexes
Egor Kislitsyn [Wed, 12 Jun 2019 09:22:56 +0000 (16:22 +0700)]
Remove search result order for non-RUM indexes

5 years agoUpdate `auto_linker` dependency
Egor Kislitsyn [Wed, 12 Jun 2019 08:53:33 +0000 (15:53 +0700)]
Update `auto_linker` dependency

5 years agoDocument TagPolicy in `rewrite_policy` section
rinpatch [Tue, 11 Jun 2019 19:15:28 +0000 (22:15 +0300)]
Document TagPolicy in `rewrite_policy` section

5 years agoMerge branch 'improve-local-content-limit' into 'develop'
kaniini [Tue, 11 Jun 2019 17:30:13 +0000 (17:30 +0000)]
Merge branch 'improve-local-content-limit' into 'develop'

Add option to restrict all users to local content

See merge request pleroma/pleroma!1268

5 years agoImport release config from env variable or /etc/pleroma/config.exs and
rinpatch [Tue, 11 Jun 2019 15:55:55 +0000 (18:55 +0300)]
Import release config from env variable or /etc/pleroma/config.exs and
warn if the file is missing

5 years agoAdd option to restrict all users to local content
Egor Kislitsyn [Tue, 11 Jun 2019 14:25:53 +0000 (21:25 +0700)]
Add option to restrict all users to local content

5 years agoMerge branch 'better-default-parameters-for-suggestion' into 'develop'
lain [Tue, 11 Jun 2019 11:34:23 +0000 (11:34 +0000)]
Merge branch 'better-default-parameters-for-suggestion' into 'develop'

Better default parameters for suggestion

See merge request pleroma/pleroma!1265

5 years agoBetter default parameters for suggestion
Hakaba Hitoyo [Tue, 11 Jun 2019 11:34:22 +0000 (11:34 +0000)]
Better default parameters for suggestion

5 years agoMerge branch 'feature/rate-limiter' into 'develop'
lain [Tue, 11 Jun 2019 11:32:01 +0000 (11:32 +0000)]
Merge branch 'feature/rate-limiter' into 'develop'

Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266

5 years agoMerge branch 'update-plug' into 'develop'
lain [Tue, 11 Jun 2019 10:24:01 +0000 (10:24 +0000)]
Merge branch 'update-plug' into 'develop'

Update `plug` dependency

Closes #655

See merge request pleroma/pleroma!1267

5 years agoUpdate `plug` dependency
Egor Kislitsyn [Tue, 11 Jun 2019 09:50:35 +0000 (16:50 +0700)]
Update `plug` dependency

5 years agoUpdate `ex_rated` dependency
Egor Kislitsyn [Tue, 11 Jun 2019 09:25:47 +0000 (16:25 +0700)]
Update `ex_rated` dependency

5 years agoReplace `MastodonAPIController.account_register/2` rate limiter
Egor Kislitsyn [Tue, 11 Jun 2019 09:06:03 +0000 (16:06 +0700)]
Replace `MastodonAPIController.account_register/2` rate limiter

5 years agoUpdate CHANGELOG
Egor Kislitsyn [Tue, 11 Jun 2019 07:36:51 +0000 (14:36 +0700)]
Update CHANGELOG

5 years agoAdd rate limiting for search endpoints
Egor Kislitsyn [Tue, 11 Jun 2019 07:28:39 +0000 (14:28 +0700)]
Add rate limiting for search endpoints

5 years agoAdd RateLimiter
Egor Kislitsyn [Tue, 11 Jun 2019 07:27:41 +0000 (14:27 +0700)]
Add RateLimiter

5 years agoMerge branch 'change-containment-default' into 'develop'
kaniini [Tue, 11 Jun 2019 02:38:13 +0000 (02:38 +0000)]
Merge branch 'change-containment-default' into 'develop'

Configuration: Skip thread containment by default

See merge request pleroma/pleroma!1256

5 years agoMerge branch 'preload-changes' into 'develop'
kaniini [Tue, 11 Jun 2019 02:37:08 +0000 (02:37 +0000)]
Merge branch 'preload-changes' into 'develop'

Conversations: Fetch users in one query.

See merge request pleroma/pleroma!1258

5 years agoMerge branch 'fix/warnings-in-migration' into 'develop'
lain [Mon, 10 Jun 2019 13:20:37 +0000 (13:20 +0000)]
Merge branch 'fix/warnings-in-migration' into 'develop'

Remove unused imports and aliases from migration

Closes #964

See merge request pleroma/pleroma!1263

5 years agoRemove unused imports and aliases from migration
Sergey Suprunenko [Mon, 10 Jun 2019 13:20:37 +0000 (13:20 +0000)]
Remove unused imports and aliases from migration

5 years agoMerge branch 'feature/releases' into 'develop'
lain [Mon, 10 Jun 2019 13:03:48 +0000 (13:03 +0000)]
Merge branch 'feature/releases' into 'develop'

Releases

See merge request pleroma/pleroma!1261

5 years agoUpdate pleroma_ctl
lain [Mon, 10 Jun 2019 11:47:22 +0000 (11:47 +0000)]
Update pleroma_ctl

5 years agoMerge branch 'issue/media-proxy-whitelist' into 'develop'
lain [Mon, 10 Jun 2019 11:34:11 +0000 (11:34 +0000)]
Merge branch 'issue/media-proxy-whitelist' into 'develop'

Add more tests for using media_proxy and whitelists

See merge request pleroma/pleroma!1262

5 years agoAdd more tests for using media_proxy and whitelists
Sergey Suprunenko [Mon, 10 Jun 2019 11:34:11 +0000 (11:34 +0000)]
Add more tests for using media_proxy and whitelists

5 years agoAdd a changelog entry for releases
rinpatch [Sun, 9 Jun 2019 10:56:41 +0000 (13:56 +0300)]
Add a changelog entry for releases

5 years agoMerge branch 'develop' into feature/releases
rinpatch [Sun, 9 Jun 2019 10:55:32 +0000 (13:55 +0300)]
Merge branch 'develop' into feature/releases

5 years agospecify that a version is needed for rollback
rinpatch [Sun, 9 Jun 2019 10:34:58 +0000 (13:34 +0300)]
specify that a version is needed for rollback

5 years agoAdd migrate/rollback to release tasks
rinpatch [Sun, 9 Jun 2019 10:33:44 +0000 (13:33 +0300)]
Add migrate/rollback to release tasks

5 years agoFix wrong placement of serve_endpoints
rinpatch [Sat, 8 Jun 2019 18:26:00 +0000 (21:26 +0300)]
Fix wrong placement of serve_endpoints

5 years agoUse Mix.shell().yes? if available
rinpatch [Sat, 8 Jun 2019 17:10:25 +0000 (20:10 +0300)]
Use Mix.shell().yes? if available

5 years agoMerge branch 'prod-loglevel-warn' into 'develop'
lain [Sat, 8 Jun 2019 16:05:10 +0000 (16:05 +0000)]
Merge branch 'prod-loglevel-warn' into 'develop'

Set default loglevel to `warn` in prod

Closes #962

See merge request pleroma/pleroma!1260

5 years agoSet default loglevel to `warn` in prod
rinpatch [Sat, 8 Jun 2019 15:02:57 +0000 (18:02 +0300)]
Set default loglevel to `warn` in prod

It's rare that info logs are needed to debug the issue, so I would
suggest setting them to warn in prod by default to make finding the
relevant parts easier and potentially even decrease cpu usage on bigger
instances

Closes #962

5 years agoMake mix tasks work in a release
rinpatch [Sat, 8 Jun 2019 14:40:40 +0000 (17:40 +0300)]
Make mix tasks work in a release

5 years agoSet serve_endpoints to true in prod config as setting it in runtime
rinpatch [Sat, 8 Jun 2019 14:17:28 +0000 (17:17 +0300)]
Set serve_endpoints to true in prod config as setting it in runtime
config would cause issues with mix tasks

5 years agoLoad ex_syslog and copy pleroma_ctl
rinpatch [Sat, 8 Jun 2019 14:17:10 +0000 (17:17 +0300)]
Load ex_syslog and copy pleroma_ctl

5 years agoBasic release skeleton
rinpatch [Sat, 8 Jun 2019 14:15:49 +0000 (17:15 +0300)]
Basic release skeleton

5 years agoMerge branch 'fix/transmogrifier-inReplyTo' into 'develop'
lain [Sat, 8 Jun 2019 10:22:15 +0000 (10:22 +0000)]
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'

Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched

See merge request pleroma/pleroma!1259

5 years agoMerge branch 'bugfix/959-emoji-loading' into 'develop'
rinpatch [Sat, 8 Jun 2019 10:10:34 +0000 (10:10 +0000)]
Merge branch 'bugfix/959-emoji-loading' into 'develop'

Emoji: Use full path to check if a file is a directory.

Closes #959

See merge request pleroma/pleroma!1257

5 years agoreplace missing mock with a 404
rinpatch [Fri, 7 Jun 2019 17:48:25 +0000 (20:48 +0300)]
replace missing mock with a 404

5 years agoTransmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
rinpatch [Fri, 7 Jun 2019 17:40:38 +0000 (20:40 +0300)]
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched

5 years agoConversations: Fetch users in one query.
lain [Fri, 7 Jun 2019 15:51:47 +0000 (17:51 +0200)]
Conversations: Fetch users in one query.

5 years agoEmoji: Use full path to check if a file is a directory.
lain [Fri, 7 Jun 2019 15:31:21 +0000 (17:31 +0200)]
Emoji: Use full path to check if a file is a directory.

5 years agoFix tests.
lain [Fri, 7 Jun 2019 15:16:56 +0000 (17:16 +0200)]
Fix tests.