akkoma
4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
lain [Wed, 12 Aug 2020 10:53:04 +0000 (12:53 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject

4 years agoleave expirations with Create and Note types
Alexander Strizhakov [Wed, 12 Aug 2020 09:41:47 +0000 (12:41 +0300)]
leave expirations with Create and Note types

4 years agoupdate docs
Maksim Pechnikov [Wed, 12 Aug 2020 05:51:09 +0000 (08:51 +0300)]
update docs

4 years agoMerge branch 'issue/2036-job-monitor' into 'develop'
rinpatch [Wed, 12 Aug 2020 03:30:01 +0000 (03:30 +0000)]
Merge branch 'issue/2036-job-monitor' into 'develop'

[#2036] fix job monitor

See merge request pleroma/pleroma!2877

4 years agofix job monitor
Maksim Pechnikov [Tue, 11 Aug 2020 19:06:33 +0000 (22:06 +0300)]
fix job monitor

4 years agoLinting fixes.
lain [Tue, 11 Aug 2020 17:22:14 +0000 (19:22 +0200)]
Linting fixes.

4 years agoEnsure only Note objects are set to expire
Mark Felder [Tue, 11 Aug 2020 16:28:22 +0000 (11:28 -0500)]
Ensure only Note objects are set to expire

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expira...
lain [Tue, 11 Aug 2020 15:49:24 +0000 (17:49 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again

4 years agoActivityPub: Remove ActivityPub.accept
lain [Tue, 11 Aug 2020 15:43:16 +0000 (17:43 +0200)]
ActivityPub: Remove ActivityPub.accept

Switch to the pipeline in CommonAPI and SideEffects

4 years agoEnsure ap_id column in users table cannot be null
Mark Felder [Tue, 11 Aug 2020 14:52:28 +0000 (09:52 -0500)]
Ensure ap_id column in users table cannot be null

4 years agoTransmogrifier: Handle accepts with the pipeline
lain [Tue, 11 Aug 2020 15:26:01 +0000 (17:26 +0200)]
Transmogrifier: Handle accepts with the pipeline

4 years agoTransmogrifier Test: Remove mastodon hack test.
lain [Tue, 11 Aug 2020 14:22:15 +0000 (16:22 +0200)]
Transmogrifier Test: Remove mastodon hack test.

4 years agoLinter fixes.
lain [Tue, 11 Aug 2020 14:07:42 +0000 (16:07 +0200)]
Linter fixes.

4 years agoMerge branch 'set-approval-pending-default-to-false' into 'develop'
lain [Tue, 11 Aug 2020 13:59:17 +0000 (13:59 +0000)]
Merge branch 'set-approval-pending-default-to-false' into 'develop'

Set `users.approval_pending` default to `false`

See merge request pleroma/pleroma!2874

4 years agoTransmogrifier: Remove handling of orphaned accepts
lain [Tue, 11 Aug 2020 13:41:19 +0000 (15:41 +0200)]
Transmogrifier: Remove handling of orphaned accepts

This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.

4 years agoAcceptValidation: Codify accept rules.
lain [Tue, 11 Aug 2020 13:32:00 +0000 (15:32 +0200)]
AcceptValidation: Codify accept rules.

4 years agoSet `users.approval_pending` default to `false`
Egor Kislitsyn [Tue, 11 Aug 2020 13:21:17 +0000 (17:21 +0400)]
Set `users.approval_pending` default to `false`

4 years agoAcceptValidator: Add basic validator with tests.
lain [Tue, 11 Aug 2020 13:13:07 +0000 (15:13 +0200)]
AcceptValidator: Add basic validator with tests.

4 years agoTransmogrifier: Small readability changes.
lain [Tue, 11 Aug 2020 12:02:09 +0000 (14:02 +0200)]
Transmogrifier: Small readability changes.

4 years agoTransmogrifier Tests: Extract Accept handling
lain [Tue, 11 Aug 2020 12:00:21 +0000 (14:00 +0200)]
Transmogrifier Tests: Extract Accept handling

4 years agoMerge branch '204-fix' into 'develop'
lain [Tue, 11 Aug 2020 09:18:56 +0000 (09:18 +0000)]
Merge branch '204-fix' into 'develop'

Fix 500 errors when returning :no_content, fixes #2029

Closes #2029

See merge request pleroma/pleroma!2856

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Tue, 11 Aug 2020 09:08:27 +0000 (09:08 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoMerge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma...
lain [Tue, 11 Aug 2020 08:55:10 +0000 (10:55 +0200)]
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again

4 years agoSideEffects: Handle strange deletion case.
lain [Tue, 11 Aug 2020 08:54:38 +0000 (10:54 +0200)]
SideEffects: Handle strange deletion case.

4 years agoadded paginate+search for admin/MediaProxy URLs
Maksim Pechnikov [Tue, 11 Aug 2020 07:28:35 +0000 (10:28 +0300)]
added paginate+search for admin/MediaProxy URLs

4 years agoMerge branch 'admin-active-filter' into 'develop'
feld [Mon, 10 Aug 2020 17:16:38 +0000 (17:16 +0000)]
Merge branch 'admin-active-filter' into 'develop'

Admin API: Filter out unapproved users when the `active` filter is on

Closes #2037

See merge request pleroma/pleroma!2872

4 years agoMerge branch 'develop' into fix/activity-expirations-again
Mark Felder [Mon, 10 Aug 2020 16:32:24 +0000 (11:32 -0500)]
Merge branch 'develop' into fix/activity-expirations-again

4 years agoAdmin API: Filter out unapproved users when the `active` filter is on
Egor Kislitsyn [Mon, 10 Aug 2020 13:57:36 +0000 (17:57 +0400)]
Admin API: Filter out unapproved users when the `active` filter is on

4 years agoMerge branch 'revert-a6d3bb5f' into 'develop'
lain [Mon, 10 Aug 2020 13:59:38 +0000 (13:59 +0000)]
Merge branch 'revert-a6d3bb5f' into 'develop'

Revert "Merge branch 'issue/1023' into 'develop'"

Closes #2033

See merge request pleroma/pleroma!2868

4 years agoMerge branch 'remove-unreachable-code' into 'develop'
lain [Mon, 10 Aug 2020 13:47:20 +0000 (13:47 +0000)]
Merge branch 'remove-unreachable-code' into 'develop'

Transmogrifier: Remove duplicate code.

See merge request pleroma/pleroma!2871

4 years agoMerge branch 'develop' into 'develop'
lain [Mon, 10 Aug 2020 13:47:02 +0000 (13:47 +0000)]
Merge branch 'develop' into 'develop'

docs: add cmake to other installation guides

Closes #2039

See merge request pleroma/pleroma!2870

4 years agoMerge branch '2039-cmake' into 'develop'
lain [Mon, 10 Aug 2020 13:46:52 +0000 (13:46 +0000)]
Merge branch '2039-cmake' into 'develop'

Docs: Add cmake dependency

Closes #2039

See merge request pleroma/pleroma!2869

4 years agoTransmogrifier: Remove duplicate code.
lain [Mon, 10 Aug 2020 13:31:36 +0000 (15:31 +0200)]
Transmogrifier: Remove duplicate code.

4 years agodocs: add cmake to other installation guides
Alibek Omarov [Mon, 10 Aug 2020 13:24:45 +0000 (16:24 +0300)]
docs: add cmake to other installation guides

4 years agoDocs: Add cmake dependency
lain [Mon, 10 Aug 2020 13:12:45 +0000 (15:12 +0200)]
Docs: Add cmake dependency

4 years agoRevert "Merge branch 'issue/1023' into 'develop'"
lain [Mon, 10 Aug 2020 13:05:13 +0000 (13:05 +0000)]
Revert "Merge branch 'issue/1023' into 'develop'"

This reverts merge request !2763

4 years agoApply 1 suggestion(s) to 1 file(s)
Ilja [Mon, 10 Aug 2020 11:29:54 +0000 (11:29 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoApply 1 suggestion(s) to 1 file(s)
Ilja [Mon, 10 Aug 2020 11:29:40 +0000 (11:29 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoMerge branch 'fix/flaky-migration-episode-666' into 'develop'
rinpatch [Mon, 10 Aug 2020 09:17:08 +0000 (09:17 +0000)]
Merge branch 'fix/flaky-migration-episode-666' into 'develop'

20200802170532_fix_legacy_tags: Select only fields the migration needs

See merge request pleroma/pleroma!2863

4 years agoMerge branch '2038-old-update-info' into 'develop'
rinpatch [Mon, 10 Aug 2020 09:04:16 +0000 (09:04 +0000)]
Merge branch '2038-old-update-info' into 'develop'

AccountController: Build the correct update activity.

Closes #2038

See merge request pleroma/pleroma!2867

4 years ago20200802170532_fix_legacy_tags: chunk the user query
rinpatch [Fri, 7 Aug 2020 19:10:09 +0000 (22:10 +0300)]
20200802170532_fix_legacy_tags: chunk the user query

4 years ago20200802170532_fix_legacy_tags: Select only fields the migration needs
rinpatch [Fri, 7 Aug 2020 19:05:17 +0000 (22:05 +0300)]
20200802170532_fix_legacy_tags: Select only fields the migration needs

Selecting the full struct will break as soon as a new field is added.

4 years agoAccountController: Build the correct update activity.
lain [Mon, 10 Aug 2020 08:33:05 +0000 (10:33 +0200)]
AccountController: Build the correct update activity.

Will fix federation issues.

4 years agoMerge branch 'feat/floki-fast-html-2' into 'develop'
lain [Sun, 9 Aug 2020 11:18:00 +0000 (11:18 +0000)]
Merge branch 'feat/floki-fast-html-2' into 'develop'

Update to fast_html 2 and use it for Floki parsing

See merge request pleroma/pleroma!2861

4 years agoMerge branch 'security-policy' into 'develop'
lain [Sun, 9 Aug 2020 11:06:54 +0000 (11:06 +0000)]
Merge branch 'security-policy' into 'develop'

Add security policy for Pleroma backend

Closes #1848

See merge request pleroma/pleroma!2862

4 years agoMerge branch 'develop' into 'feat/floki-fast-html-2'
lain [Sun, 9 Aug 2020 10:53:58 +0000 (10:53 +0000)]
Merge branch 'develop' into 'feat/floki-fast-html-2'

# Conflicts:
#   config/config.exs

4 years agoLimit expirations for each cron execution to 50.
Mark Felder [Sat, 8 Aug 2020 17:49:02 +0000 (12:49 -0500)]
Limit expirations for each cron execution to 50.

This should prevent servers from being crushed. 50/min is a pretty good rate.

4 years agoDon't filter on local
Mark Felder [Sat, 8 Aug 2020 17:44:18 +0000 (12:44 -0500)]
Don't filter on local

4 years agoEnsure we only expire Create activities with the Mix task
Mark Felder [Sat, 8 Aug 2020 17:40:52 +0000 (12:40 -0500)]
Ensure we only expire Create activities with the Mix task

4 years agoAdd migration to remove invalid activity expirations
Mark Felder [Sat, 8 Aug 2020 17:33:37 +0000 (12:33 -0500)]
Add migration to remove invalid activity expirations

4 years agoMerge branch 'ensure-expiration-mix-task' into 'develop'
lain [Sat, 8 Aug 2020 15:16:55 +0000 (15:16 +0000)]
Merge branch 'ensure-expiration-mix-task' into 'develop'

Add mix task to add expiration to all local statuses

Closes #2020

See merge request pleroma/pleroma!2865

4 years agoAdd mix task to add expiration to all local statuses
Egor Kislitsyn [Sat, 8 Aug 2020 12:29:40 +0000 (16:29 +0400)]
Add mix task to add expiration to all local statuses

4 years agoImprove static_dir documentation
Ilja [Sat, 8 Aug 2020 10:21:44 +0000 (12:21 +0200)]
Improve static_dir documentation

* It was still written for From Source installs. Now it's both OTP and From Source
* I linked to the cheatsheet where it was about configuration
* I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it
    * i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option
* I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers
* The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.)
* Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.

4 years agoMerge branch 'fix/ldap-auth-issues' into 'develop'
lain [Fri, 7 Aug 2020 20:59:44 +0000 (20:59 +0000)]
Merge branch 'fix/ldap-auth-issues' into 'develop'

Fix LDAP auth issues

Closes #1646

See merge request pleroma/pleroma!2852

4 years agoMerge branch 'develop' into fix/ldap-auth-issues
Mark Felder [Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)]
Merge branch 'develop' into fix/ldap-auth-issues

4 years agoMake a new function instead of overloading register_changeset/3
Mark Felder [Fri, 7 Aug 2020 19:54:14 +0000 (14:54 -0500)]
Make a new function instead of overloading register_changeset/3

4 years agoAdd security policy for Pleroma backend
rinpatch [Fri, 7 Aug 2020 18:25:16 +0000 (21:25 +0300)]
Add security policy for Pleroma backend

Closes #1848

4 years agoMerge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social...
Angelina Filippova [Fri, 7 Aug 2020 18:05:44 +0000 (21:05 +0300)]
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description

4 years agoAdd new `image` type to settings whose values are image urls
Angelina Filippova [Fri, 7 Aug 2020 18:04:13 +0000 (21:04 +0300)]
Add new `image` type to settings whose values are image urls

4 years agoForce 204 responses to be empty, fixes #2029
Alex Gleason [Fri, 7 Aug 2020 18:02:39 +0000 (13:02 -0500)]
Force 204 responses to be empty, fixes #2029

4 years agoMerge branch 'authenticator-docs' into 'develop'
rinpatch [Fri, 7 Aug 2020 17:51:48 +0000 (17:51 +0000)]
Merge branch 'authenticator-docs' into 'develop'

Docs: Remove wrong / confusing auth docs.

Closes #2028

See merge request pleroma/pleroma!2860

4 years agoDocs: Remove wrong / confusing auth docs.
lain [Fri, 7 Aug 2020 15:59:55 +0000 (17:59 +0200)]
Docs: Remove wrong / confusing auth docs.

4 years agoCI: install cmake since fast_html now requires it
rinpatch [Fri, 7 Aug 2020 14:33:59 +0000 (17:33 +0300)]
CI: install cmake since fast_html now requires it

4 years agoMerge branch 'spoopy-user' into 'develop'
lain [Fri, 7 Aug 2020 14:51:26 +0000 (14:51 +0000)]
Merge branch 'spoopy-user' into 'develop'

restricted_nicknames: Add names from MastoAPI endpoints

See merge request pleroma/pleroma!2857

4 years agoAdd a note about the proper value for uid
Mark Felder [Fri, 7 Aug 2020 14:42:10 +0000 (09:42 -0500)]
Add a note about the proper value for uid

4 years agoMerge branch 'object-age-changelog' into 'develop'
rinpatch [Fri, 7 Aug 2020 14:21:28 +0000 (14:21 +0000)]
Merge branch 'object-age-changelog' into 'develop'

Changelog: Add information about the object age policy

See merge request pleroma/pleroma!2859

4 years agoChangelog: Add information about the object age policy
lain [Fri, 7 Aug 2020 14:20:13 +0000 (16:20 +0200)]
Changelog: Add information about the object age policy

4 years agomix.exs: update fast_sanitize to 0.2.0
rinpatch [Fri, 7 Aug 2020 13:45:04 +0000 (16:45 +0300)]
mix.exs: update fast_sanitize to 0.2.0

4 years agorel me test: fix HTML so broken browsers (and therefore
rinpatch [Thu, 16 Jul 2020 18:09:48 +0000 (21:09 +0300)]
rel me test: fix HTML so broken browsers (and therefore
lexbor) refuse to parse it like mochiweb does

4 years agoMake Floki use fast_html
rinpatch [Mon, 10 Feb 2020 21:29:25 +0000 (00:29 +0300)]
Make Floki use fast_html

4 years agoMerge branch 'features/poll-validation' into 'develop'
lain [Fri, 7 Aug 2020 10:44:06 +0000 (10:44 +0000)]
Merge branch 'features/poll-validation' into 'develop'

Poll and votes pipeline ingestion

Closes #1362 and #1852

See merge request pleroma/pleroma!2635

4 years agoMerge branch 'develop' into feature/update-welcome-setting-in-description
Maksim Pechnikov [Fri, 7 Aug 2020 06:48:34 +0000 (09:48 +0300)]
Merge branch 'develop' into feature/update-welcome-setting-in-description

4 years agoadded test
Maksim Pechnikov [Fri, 7 Aug 2020 06:47:05 +0000 (09:47 +0300)]
added test

4 years agorestricted_nicknames: Add names from MastoAPI endpoints
Alex Gleason [Thu, 6 Aug 2020 23:01:29 +0000 (18:01 -0500)]
restricted_nicknames: Add names from MastoAPI endpoints

4 years agoMerge branch '2025-oauth-login-default-to-all-scopes' into 'develop'
lain [Thu, 6 Aug 2020 16:54:32 +0000 (16:54 +0000)]
Merge branch '2025-oauth-login-default-to-all-scopes' into 'develop'

[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes

Closes #2025

See merge request pleroma/pleroma!2855

4 years ago[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
Ivan Tashkinov [Thu, 6 Aug 2020 13:00:00 +0000 (16:00 +0300)]
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.

4 years agoMerge branch 'whole-word-filter-hotfix' into 'develop'
lain [Thu, 6 Aug 2020 08:35:39 +0000 (08:35 +0000)]
Merge branch 'whole-word-filter-hotfix' into 'develop'

Update filter_view.ex to return whole_word actual value

See merge request pleroma/pleroma!2851

4 years agoMerge branch 'command-available-check' into 'develop'
lain [Thu, 6 Aug 2020 08:27:10 +0000 (08:27 +0000)]
Merge branch 'command-available-check' into 'develop'

#1939  Check command availability for exiftool and git

See merge request pleroma/pleroma!2753

4 years agochangelog for filter whole_word fix
Mary Kate [Wed, 5 Aug 2020 20:39:11 +0000 (15:39 -0500)]
changelog for filter whole_word fix

4 years agoupdate test for whole_word in filter
Mary Kate [Wed, 5 Aug 2020 20:36:25 +0000 (15:36 -0500)]
update test for whole_word in filter

4 years agoAdd note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma...
Mark Felder [Wed, 5 Aug 2020 16:53:57 +0000 (11:53 -0500)]
Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma.Web.Auth.PleromaAuthenticator

4 years agoComments are good when they're precise...
Mark Felder [Wed, 5 Aug 2020 16:40:09 +0000 (11:40 -0500)]
Comments are good when they're precise...

4 years agoMove checks to application startup
Roman Chvanikov [Wed, 5 Aug 2020 16:38:55 +0000 (19:38 +0300)]
Move checks to application startup

4 years agoAdd email to user account only if it exists in LDAP
Mark Felder [Wed, 5 Aug 2020 16:36:12 +0000 (11:36 -0500)]
Add email to user account only if it exists in LDAP

4 years agoMerge branch 'develop' into command-available-check
Roman Chvanikov [Wed, 5 Aug 2020 16:16:48 +0000 (19:16 +0300)]
Merge branch 'develop' into command-available-check

4 years agoMerge branch 'migrate-legacy-tags' into 'develop'
lain [Wed, 5 Aug 2020 16:03:11 +0000 (16:03 +0000)]
Merge branch 'migrate-legacy-tags' into 'develop'

Migrate legacy tags set by AdminFE to match TagPolicy, #2010

See merge request pleroma/pleroma!2836

4 years agoMerge branch 'refactor/config-get' into 'develop'
lain [Wed, 5 Aug 2020 15:59:30 +0000 (15:59 +0000)]
Merge branch 'refactor/config-get' into 'develop'

Refactor Pleroma.Config.get to return consistent results for nil values

Closes #2001

See merge request pleroma/pleroma!2853

4 years agoCommonValidations: More refactors.
lain [Wed, 5 Aug 2020 15:56:12 +0000 (17:56 +0200)]
CommonValidations: More refactors.

4 years agoCommonValidations: Refactor `same_domain?`
lain [Wed, 5 Aug 2020 15:36:27 +0000 (17:36 +0200)]
CommonValidations: Refactor `same_domain?`

4 years agoCommonValidations: Extract modification right checker
lain [Wed, 5 Aug 2020 15:26:53 +0000 (17:26 +0200)]
CommonValidations: Extract modification right checker

4 years agoMailerTest: Give it some time.
lain [Wed, 5 Aug 2020 15:26:03 +0000 (17:26 +0200)]
MailerTest: Give it some time.

4 years agoHandle non-list keys in Config.fetch/1
Roman Chvanikov [Wed, 5 Aug 2020 15:23:12 +0000 (18:23 +0300)]
Handle non-list keys in Config.fetch/1

4 years agoPermit LDAP users to register without capturing their password hash
Mark Felder [Wed, 5 Aug 2020 15:07:31 +0000 (10:07 -0500)]
Permit LDAP users to register without capturing their password hash
We don't need it, and local auth fallback has been removed.

4 years agoMerge branch 'develop' into refactor/config-get
Roman Chvanikov [Wed, 5 Aug 2020 14:46:24 +0000 (17:46 +0300)]
Merge branch 'develop' into refactor/config-get

4 years agoUpdate clear_config macro
Roman Chvanikov [Wed, 5 Aug 2020 14:46:14 +0000 (17:46 +0300)]
Update clear_config macro

4 years agoDefine default authenticator in the config
Mark Felder [Wed, 5 Aug 2020 14:41:17 +0000 (09:41 -0500)]
Define default authenticator in the config

4 years agoFix linting.
lain [Wed, 5 Aug 2020 13:40:32 +0000 (15:40 +0200)]
Fix linting.

4 years agoRemove fallback to local database when LDAP is unavailable.
Mark Felder [Wed, 5 Aug 2020 13:18:16 +0000 (08:18 -0500)]
Remove fallback to local database when LDAP is unavailable.

In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.

4 years agoRemove LDAP mail attribute as a requirement for registering an account
Mark Felder [Wed, 5 Aug 2020 13:15:57 +0000 (08:15 -0500)]
Remove LDAP mail attribute as a requirement for registering an account

4 years agoQuestions: Move fixes to validators.
lain [Wed, 5 Aug 2020 12:51:33 +0000 (14:51 +0200)]
Questions: Move fixes to validators.