akkoma
5 years agoMerge branch 'feature/mrf-always-nsfw' into 'develop'
rinpatch [Sat, 18 May 2019 07:13:18 +0000 (07:13 +0000)]
Merge branch 'feature/mrf-always-nsfw' into 'develop'

suppress link previews from posts marked sensitive

Closes #865

See merge request pleroma/pleroma!1173

5 years agoMerge branch 'feature/http-ua-header-always' into 'develop'
Haelwenn [Sat, 18 May 2019 04:42:11 +0000 (04:42 +0000)]
Merge branch 'feature/http-ua-header-always' into 'develop'

http: request builder: send user-agent when making requests

Closes #546

See merge request pleroma/pleroma!1174

5 years agoadd Changelog entry
William Pitcock [Fri, 17 May 2019 20:43:31 +0000 (20:43 +0000)]
add Changelog entry

5 years agoalso suppress link previews from posts marked #nsfw
William Pitcock [Fri, 17 May 2019 20:42:51 +0000 (20:42 +0000)]
also suppress link previews from posts marked #nsfw

5 years agoadd CHANGELOG entry
William Pitcock [Fri, 17 May 2019 20:31:39 +0000 (20:31 +0000)]
add CHANGELOG entry

5 years agoconfig: make sending the user agent configurable, disable sending the user agent...
William Pitcock [Fri, 17 May 2019 20:28:58 +0000 (20:28 +0000)]
config: make sending the user agent configurable, disable sending the user agent in tests

5 years agohttp: request builder: send user-agent when making requests
William Pitcock [Fri, 17 May 2019 19:03:19 +0000 (19:03 +0000)]
http: request builder: send user-agent when making requests

5 years agorich media: suppress link previews if post is marked as sensitive
William Pitcock [Fri, 17 May 2019 18:49:43 +0000 (18:49 +0000)]
rich media: suppress link previews if post is marked as sensitive

5 years agomrf: simple policy: mark all posts instead of posts with media as sensitive if they...
William Pitcock [Fri, 17 May 2019 18:49:10 +0000 (18:49 +0000)]
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw

5 years agoMerge branch 'rum-index' into 'develop'
rinpatch [Fri, 17 May 2019 16:35:19 +0000 (16:35 +0000)]
Merge branch 'rum-index' into 'develop'

Search: Use RUM index.

See merge request pleroma/pleroma!1136

5 years agoCI: Use the correct image with the correct hostname.
lain [Fri, 17 May 2019 13:21:29 +0000 (15:21 +0200)]
CI: Use the correct image with the correct hostname.

5 years agoRUM: Set rum status by the environment.
lain [Fri, 17 May 2019 13:06:51 +0000 (15:06 +0200)]
RUM: Set rum status by the environment.

5 years agoRUM: Remove vacuum analyze from migration
lain [Fri, 17 May 2019 12:59:01 +0000 (14:59 +0200)]
RUM: Remove vacuum analyze from migration

Can't be run in a trnasaction.

5 years agoCI: Add rum variant testing.
lain [Fri, 17 May 2019 10:47:38 +0000 (12:47 +0200)]
CI: Add rum variant testing.

5 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
lain [Fri, 17 May 2019 10:26:59 +0000 (12:26 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index

5 years agoMerge branch 'ecto_sql_update' into 'develop'
lambda [Fri, 17 May 2019 10:21:38 +0000 (10:21 +0000)]
Merge branch 'ecto_sql_update' into 'develop'

Dependencies: Update Ecto SQL.

See merge request pleroma/pleroma!1160

5 years agoMerge branch 'update-tzdata' into 'develop'
lambda [Fri, 17 May 2019 10:21:14 +0000 (10:21 +0000)]
Merge branch 'update-tzdata' into 'develop'

Dependencies: Update tzdata.

Closes #910

See merge request pleroma/pleroma!1171

5 years agoMerge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
lambda [Fri, 17 May 2019 10:07:51 +0000 (10:07 +0000)]
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'

MastoAPI account_view.ex: requested is false when following is true

Closes #903

See merge request pleroma/pleroma!1169

5 years agoUpdate account_view.ex
lambda [Fri, 17 May 2019 09:53:44 +0000 (09:53 +0000)]
Update account_view.ex

5 years agoDependencies: Update tzdata.
lain [Fri, 17 May 2019 09:51:50 +0000 (11:51 +0200)]
Dependencies: Update tzdata.

This fixes the bug that tz data could not be loaded. Closes #910.

5 years agoFix specs.
lain [Fri, 17 May 2019 09:49:13 +0000 (11:49 +0200)]
Fix specs.

5 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
lain [Fri, 17 May 2019 09:33:04 +0000 (11:33 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update

5 years agoConfiguration: disable migration lock.
lain [Fri, 17 May 2019 09:30:35 +0000 (11:30 +0200)]
Configuration: disable migration lock.

5 years agoDependencies: Update ecto sql once more.
lain [Fri, 17 May 2019 09:19:30 +0000 (11:19 +0200)]
Dependencies: Update ecto sql once more.

5 years agoMerge branch 'fix/902-random-compile-failing' into 'develop'
rinpatch [Fri, 17 May 2019 07:25:20 +0000 (07:25 +0000)]
Merge branch 'fix/902-random-compile-failing' into 'develop'

Fix/902 random compile failing

Closes #902

See merge request pleroma/pleroma!1168

5 years agoFix/902 random compile failing
Alexander Strizhakov [Fri, 17 May 2019 07:25:20 +0000 (07:25 +0000)]
Fix/902 random compile failing

5 years agoMastoAPI account_view.ex: requested is false when following is true
Haelwenn (lanodan) Monnier [Fri, 17 May 2019 05:34:52 +0000 (07:34 +0200)]
MastoAPI account_view.ex: requested is false when following is true

Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
5 years agoMerge branch 'fix/mrf-tag-typo' into 'develop'
kaniini [Fri, 17 May 2019 01:20:04 +0000 (01:20 +0000)]
Merge branch 'fix/mrf-tag-typo' into 'develop'

Fix MRF "tag" typo

See merge request pleroma/pleroma!1167

5 years agoAdd tests for MRF.SimplePolicy
Aaron Tinio [Fri, 17 May 2019 00:11:17 +0000 (08:11 +0800)]
Add tests for MRF.SimplePolicy

5 years agoFix typo: s/"tags"/"tag"/g
Aaron Tinio [Fri, 17 May 2019 01:02:04 +0000 (09:02 +0800)]
Fix typo: s/"tags"/"tag"/g

5 years agoMerge branch 'feature/890-add-report-uri' into 'develop'
kaniini [Thu, 16 May 2019 20:11:12 +0000 (20:11 +0000)]
Merge branch 'feature/890-add-report-uri' into 'develop'

Feature/890 add report uri

Closes #890

See merge request pleroma/pleroma!1164

5 years agoMerge branch 'feature/task-update-following' into 'develop'
feld [Thu, 16 May 2019 20:04:08 +0000 (20:04 +0000)]
Merge branch 'feature/task-update-following' into 'develop'

Remove duplicated entries in users' following lists

Closes #888

See merge request pleroma/pleroma!1166

5 years agoRemove duplicated entries in users' following lists
Sergey Suprunenko [Thu, 16 May 2019 20:04:08 +0000 (20:04 +0000)]
Remove duplicated entries in users' following lists

5 years agoMerge branch 'feature/admin-api-reports' into 'develop'
feld [Thu, 16 May 2019 19:09:19 +0000 (19:09 +0000)]
Merge branch 'feature/admin-api-reports' into 'develop'

Add Reports to Admin API

Closes #774

See merge request pleroma/pleroma!1107

5 years agoAdd Reports to Admin API
Sergey Suprunenko [Thu, 16 May 2019 19:09:18 +0000 (19:09 +0000)]
Add Reports to Admin API

5 years agoMerge branch 'fix/domain-unblocked-reblogs' into 'develop'
feld [Thu, 16 May 2019 18:57:14 +0000 (18:57 +0000)]
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'

Fix domain-unblocked reblogs

Closes #892

See merge request pleroma/pleroma!1157

5 years agoMerge branch 'conversations-import' into 'develop'
rinpatch [Thu, 16 May 2019 18:32:42 +0000 (18:32 +0000)]
Merge branch 'conversations-import' into 'develop'

Conversations import

Closes #871

See merge request pleroma/pleroma!1127

5 years agoUpdate CHANGELOG
Mark Felder [Thu, 16 May 2019 18:17:09 +0000 (13:17 -0500)]
Update CHANGELOG

5 years agoMove to pleroma.database mix task
Mark Felder [Thu, 16 May 2019 18:14:48 +0000 (13:14 -0500)]
Move to pleroma.database mix task

5 years agoMerge branch 'develop' into conversations-import
Mark Felder [Thu, 16 May 2019 18:11:17 +0000 (13:11 -0500)]
Merge branch 'develop' into conversations-import

5 years agoMerge branch 'feature/sql-thread-sat' into 'develop'
lambda [Thu, 16 May 2019 13:44:22 +0000 (13:44 +0000)]
Merge branch 'feature/sql-thread-sat' into 'develop'

SQL thread visibility solver

See merge request pleroma/pleroma!971

5 years agoMerge branch 'feature/896-toggling-confirmation' into 'develop'
rinpatch [Thu, 16 May 2019 13:23:42 +0000 (13:23 +0000)]
Merge branch 'feature/896-toggling-confirmation' into 'develop'

Feature/896 toggling confirmation

Closes #896

See merge request pleroma/pleroma!1165

5 years agoFeature/896 toggling confirmation
Alexander Strizhakov [Thu, 16 May 2019 13:23:41 +0000 (13:23 +0000)]
Feature/896 toggling confirmation

5 years agotry this
Alex S [Thu, 16 May 2019 10:35:07 +0000 (17:35 +0700)]
try this

5 years agotrailing spaces
Alex S [Thu, 16 May 2019 10:03:12 +0000 (17:03 +0700)]
trailing spaces

5 years agoMerge branch 'develop' into feature/890-add-report-uri
Alex S [Thu, 16 May 2019 05:54:06 +0000 (12:54 +0700)]
Merge branch 'develop' into feature/890-add-report-uri

5 years agoadd report uri and report to
Alex S [Thu, 16 May 2019 05:49:40 +0000 (12:49 +0700)]
add report uri and report to

5 years agoMerge branch 'docs/update_debian_instructions' into 'develop'
kaniini [Thu, 16 May 2019 05:03:37 +0000 (05:03 +0000)]
Merge branch 'docs/update_debian_instructions' into 'develop'

Added package to dependency list documentation

See merge request pleroma/pleroma!1161

5 years agoMerge branch 'chore/docs-update' into 'develop'
kaniini [Thu, 16 May 2019 05:02:50 +0000 (05:02 +0000)]
Merge branch 'chore/docs-update' into 'develop'

Update Admin API docs

See merge request pleroma/pleroma!1162

5 years agoMerge branch 'fix/slow-federation' into 'develop'
kaniini [Thu, 16 May 2019 04:50:15 +0000 (04:50 +0000)]
Merge branch 'fix/slow-federation' into 'develop'

publisher: use the correct queue name for outgoing federation

See merge request pleroma/pleroma!1163

5 years agopublisher: use the correct queue name for outgoing federation
William Pitcock [Thu, 16 May 2019 04:41:27 +0000 (04:41 +0000)]
publisher: use the correct queue name for outgoing federation

5 years agoNote that nicknames is an array
Angelina Filippova [Wed, 15 May 2019 22:48:53 +0000 (01:48 +0300)]
Note that nicknames is an array

5 years agoNote that nicknames is an array
Angelina Filippova [Wed, 15 May 2019 22:46:43 +0000 (01:46 +0300)]
Note that nicknames is an array

5 years agoUpdate tag/untag docs
Angelina Filippova [Wed, 15 May 2019 22:36:26 +0000 (01:36 +0300)]
Update tag/untag docs

5 years agoAdded package to dependency list
PolymerWitch [Wed, 15 May 2019 22:36:20 +0000 (15:36 -0700)]
Added package to dependency list

Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.

5 years agoUse named binding to conditionally join object
Aaron Tinio [Wed, 15 May 2019 22:25:14 +0000 (06:25 +0800)]
Use named binding to conditionally join object

5 years agoRestrict reblogs of activities from blocked domains
Aaron Tinio [Tue, 14 May 2019 23:59:24 +0000 (07:59 +0800)]
Restrict reblogs of activities from blocked domains

5 years agoAdd test for blocked domains
Aaron Tinio [Tue, 14 May 2019 22:13:47 +0000 (06:13 +0800)]
Add test for blocked domains

5 years agothread visibility function: fix use of no longer used author variable
William Pitcock [Wed, 15 May 2019 17:02:40 +0000 (17:02 +0000)]
thread visibility function: fix use of no longer used author variable

5 years agoactivity pub: remove Ecto SQL query dumps
William Pitcock [Wed, 15 May 2019 16:56:46 +0000 (16:56 +0000)]
activity pub: remove Ecto SQL query dumps

5 years agothread visibility function: significantly improve efficiency
William Pitcock [Wed, 15 May 2019 16:54:14 +0000 (16:54 +0000)]
thread visibility function: significantly improve efficiency

5 years agochase test failures
William Pitcock [Wed, 15 May 2019 16:23:01 +0000 (16:23 +0000)]
chase test failures

5 years agoupdate migration
William Pitcock [Wed, 15 May 2019 16:22:52 +0000 (16:22 +0000)]
update migration

5 years agobbs: chase timeline containment patch
William Pitcock [Wed, 8 May 2019 23:17:51 +0000 (23:17 +0000)]
bbs: chase timeline containment patch

5 years agomigration: only care about Create activities
William Pitcock [Mon, 25 Mar 2019 02:56:13 +0000 (02:56 +0000)]
migration: only care about Create activities

5 years agotest: update obsolete test
William Pitcock [Mon, 25 Mar 2019 01:23:15 +0000 (01:23 +0000)]
test: update obsolete test

5 years agoactivitypub: visibility: use SQL thread_visibility() function instead of manually...
William Pitcock [Mon, 25 Mar 2019 00:38:28 +0000 (00:38 +0000)]
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread

5 years agoactivitypub: remove contain_timeline()
William Pitcock [Mon, 25 Mar 2019 00:10:20 +0000 (00:10 +0000)]
activitypub: remove contain_timeline()

5 years agoactivitypub: add restrict_thread_visibility()
William Pitcock [Mon, 25 Mar 2019 00:06:02 +0000 (00:06 +0000)]
activitypub: add restrict_thread_visibility()

5 years agomigrations: add function to see if a thread can be satisfied
William Pitcock [Sun, 24 Mar 2019 23:45:57 +0000 (23:45 +0000)]
migrations: add function to see if a thread can be satisfied

5 years agoMerge remote-tracking branch 'origin/develop' into conversations-import
lain [Wed, 15 May 2019 15:47:29 +0000 (17:47 +0200)]
Merge remote-tracking branch 'origin/develop' into conversations-import

5 years agoMerge branch 'fix/public-option-not-working' into 'develop'
kaniini [Wed, 15 May 2019 15:42:21 +0000 (15:42 +0000)]
Merge branch 'fix/public-option-not-working' into 'develop'

Fix public option not working

Closes #873

See merge request pleroma/pleroma!1143

5 years agoMerge branch 'chore/extricate-http-signatures' into 'develop'
lambda [Wed, 15 May 2019 15:37:31 +0000 (15:37 +0000)]
Merge branch 'chore/extricate-http-signatures' into 'develop'

switch to pleroma/http_signatures library

See merge request pleroma/pleroma!1155

5 years agotests: fixup
William Pitcock [Wed, 15 May 2019 15:29:42 +0000 (15:29 +0000)]
tests: fixup

5 years agoMerge branch 'prevent-public-answers' into 'develop'
kaniini [Wed, 15 May 2019 15:26:07 +0000 (15:26 +0000)]
Merge branch 'prevent-public-answers' into 'develop'

Prevent public answers to direct messages

See merge request pleroma/pleroma!1159

5 years agoMerge branch 'cleanup' into 'develop'
lambda [Wed, 15 May 2019 15:23:13 +0000 (15:23 +0000)]
Merge branch 'cleanup' into 'develop'

Remove unused queue from the config

See merge request pleroma/pleroma!1158

5 years agoMerge branch 'ci/coverage' into 'develop'
lambda [Wed, 15 May 2019 15:19:20 +0000 (15:19 +0000)]
Merge branch 'ci/coverage' into 'develop'

Excoveralls for code coverage

See merge request pleroma/pleroma!1156

5 years agoExcoveralls for code coverage
feld [Wed, 15 May 2019 15:19:20 +0000 (15:19 +0000)]
Excoveralls for code coverage

5 years agoDependencies: Update Ecto SQL.
lain [Wed, 15 May 2019 14:45:26 +0000 (16:45 +0200)]
Dependencies: Update Ecto SQL.

5 years agoCommonAPI: Visibility refactor.
lain [Wed, 15 May 2019 14:35:33 +0000 (16:35 +0200)]
CommonAPI: Visibility refactor.

5 years agoCommonAPI: Refactor visibility, forbid public to private replies.
lain [Wed, 15 May 2019 14:30:08 +0000 (16:30 +0200)]
CommonAPI: Refactor visibility, forbid public to private replies.

5 years agoSearch: Add optional rum indexing / searching.
lain [Wed, 15 May 2019 13:28:01 +0000 (15:28 +0200)]
Search: Add optional rum indexing / searching.

5 years agoMerge branch 'legacy-fe-config' into 'develop'
rinpatch [Wed, 15 May 2019 10:56:19 +0000 (10:56 +0000)]
Merge branch 'legacy-fe-config' into 'develop'

remove deprecated PleromaFE configuration

See merge request pleroma/pleroma!1152

5 years agoremove deprecated PleromaFE configuration
Sachin Joshi [Tue, 14 May 2019 17:52:08 +0000 (23:37 +0545)]
remove deprecated PleromaFE configuration

5 years agoRemove unused queue from the config
Egor Kislitsyn [Wed, 15 May 2019 07:40:20 +0000 (14:40 +0700)]
Remove unused queue from the config

5 years agoPipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
Aaron Tinio [Mon, 13 May 2019 15:07:11 +0000 (23:07 +0800)]
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug

5 years agoImplement Pleroma.Plugs.EnsurePublicOrAuthenticated
Aaron Tinio [Tue, 14 May 2019 00:21:44 +0000 (08:21 +0800)]
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated

5 years agoMerge branch 'fix/raise-registration-api-ratelimit' into 'develop'
lambda [Tue, 14 May 2019 20:33:35 +0000 (20:33 +0000)]
Merge branch 'fix/raise-registration-api-ratelimit' into 'develop'

Make rate limiting for Mastodon Registration API less agressive and enable it by default.

See merge request pleroma/pleroma!1154

5 years agoFix rate-limiting tests
rinpatch [Tue, 14 May 2019 20:16:34 +0000 (23:16 +0300)]
Fix rate-limiting tests

5 years agoswitch to pleroma/http_signatures library
William Pitcock [Tue, 14 May 2019 20:03:13 +0000 (20:03 +0000)]
switch to pleroma/http_signatures library

5 years agoMake rate limiting for Mastodon Registration API less agressive and enable it by...
rinpatch [Tue, 14 May 2019 19:47:23 +0000 (22:47 +0300)]
Make rate limiting for Mastodon Registration API less agressive and enable it by default.

As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)

Also in this commit: minor changelog improvements.

5 years agoMerge branch 'fix-the-build' into 'develop'
lambda [Tue, 14 May 2019 17:40:08 +0000 (17:40 +0000)]
Merge branch 'fix-the-build' into 'develop'

Group def perform() together to fix the build

See merge request pleroma/pleroma!1151

5 years agoGroup def perform() together to fix the build
Mark Felder [Tue, 14 May 2019 17:33:03 +0000 (12:33 -0500)]
Group def perform() together to fix the build

5 years agoMerge branch 'fix/gopher' into 'develop'
lambda [Tue, 14 May 2019 15:41:37 +0000 (15:41 +0000)]
Merge branch 'fix/gopher' into 'develop'

gopher: fix rendering of post content (closes #895)

Closes #895

See merge request pleroma/pleroma!1150

5 years agogopher: fix rendering of post content (closes #895)
William Pitcock [Tue, 14 May 2019 15:35:06 +0000 (15:35 +0000)]
gopher: fix rendering of post content (closes #895)

5 years agoMerge branch 'refactor/use-job-queue-everywhere' into 'develop'
lambda [Tue, 14 May 2019 15:27:34 +0000 (15:27 +0000)]
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'

use job queue everywhere

Closes #862

See merge request pleroma/pleroma!1142

5 years agoclean up follow/block imports a little
William Pitcock [Tue, 14 May 2019 15:07:38 +0000 (15:07 +0000)]
clean up follow/block imports a little

5 years agoMerge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
kaniini [Tue, 14 May 2019 14:58:45 +0000 (14:58 +0000)]
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'

Fix Pleroma.Config.get!/1 raising an error when value is false

See merge request pleroma/pleroma!1148

5 years agoMerge branch 'refactor/oauth_controller_response' into 'develop'
lambda [Tue, 14 May 2019 14:49:45 +0000 (14:49 +0000)]
Merge branch 'refactor/oauth_controller_response' into 'develop'

Refactoring  oauth response.

See merge request pleroma/pleroma!1149

5 years agoRefactoring oauth response.
Maksim [Tue, 14 May 2019 14:49:45 +0000 (14:49 +0000)]
Refactoring  oauth response.