akkoma
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 agoDocs: Add OTP commands to frontend docs.
lain [Fri, 7 Aug 2020 15:04:44 +0000 (17:04 +0200)]
Docs: Add OTP commands to frontend docs.

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 Task Frontend test: Expand.
lain [Fri, 7 Aug 2020 14:03:06 +0000 (16:03 +0200)]
Mix Task Frontend test: Expand.

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 agoMix Task Frontend Test: Capture IO.
lain [Fri, 7 Aug 2020 13:27:41 +0000 (15:27 +0200)]
Mix Task Frontend Test: Capture IO.

4 years agoMix Task Frontend: Add tests.
lain [Fri, 7 Aug 2020 13:10:34 +0000 (15:10 +0200)]
Mix Task Frontend: Add tests.

4 years agoMerge branch 'frontend-bundles-downloads' of git.pleroma.social:pleroma/pleroma into...
lain [Fri, 7 Aug 2020 13:02:16 +0000 (15:02 +0200)]
Merge branch 'frontend-bundles-downloads' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads

4 years agoMix task frontend: Read the docs.
lain [Fri, 7 Aug 2020 13:01:08 +0000 (15:01 +0200)]
Mix task frontend: Read the docs.

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Fri, 7 Aug 2020 11:07:02 +0000 (11:07 +0000)]
Apply 1 suggestion(s) to 1 file(s)

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 agoDescription: Refactor.
lain [Thu, 6 Aug 2020 14:41:56 +0000 (16:41 +0200)]
Description: Refactor.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...
lain [Thu, 6 Aug 2020 13:22:20 +0000 (15:22 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads

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 agoAdd checksum to docker buildx, add aarch/arm64 to the list of platforms
Guy Sheffer [Thu, 6 Aug 2020 06:50:10 +0000 (09:50 +0300)]
Add checksum to docker buildx, add aarch/arm64 to the list of platforms

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.

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Wed, 5 Aug 2020 11:33:21 +0000 (11:33 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Wed, 5 Aug 2020 11:14:58 +0000 (11:14 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoCommonValidations: Remove superfluous function
lain [Wed, 5 Aug 2020 10:24:34 +0000 (12:24 +0200)]
CommonValidations: Remove superfluous function

The `is_active` functionality was integrated into the presence
checker.

4 years agoRefactor config
Roman Chvanikov [Wed, 5 Aug 2020 10:00:49 +0000 (13:00 +0300)]
Refactor config

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-valid...
lain [Wed, 5 Aug 2020 09:12:14 +0000 (11:12 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation

4 years agoMerge branch 'unique-app-id' into 'develop'
lain [Wed, 5 Aug 2020 09:08:50 +0000 (09:08 +0000)]
Merge branch 'unique-app-id' into 'develop'

Add unique index for apps.client_id, fixes #2022

Closes #2022

See merge request pleroma/pleroma!2844

4 years agoMerge branch 'fix/incorrect-expirations' into 'develop'
lain [Wed, 5 Aug 2020 08:55:39 +0000 (08:55 +0000)]
Merge branch 'fix/incorrect-expirations' into 'develop'

Add a migration to clean up activity_expirations table

See merge request pleroma/pleroma!2848

4 years agoMerge branch 'fix-link-color' into 'develop'
lain [Wed, 5 Aug 2020 08:11:58 +0000 (08:11 +0000)]
Merge branch 'fix-link-color' into 'develop'

templates/layout/app.html.eex: fix link color

See merge request pleroma/pleroma!2850

4 years agoUpdate filter_view.ex to return whole_word actual value
MK Fain [Wed, 5 Aug 2020 02:01:27 +0000 (02:01 +0000)]
Update filter_view.ex to return whole_word actual value

4 years agotemplates/layout/app.html.eex: fix link color
Karol Kosek [Tue, 4 Aug 2020 22:01:30 +0000 (00:01 +0200)]
templates/layout/app.html.eex: fix link color

4 years agoAdd a migration to clean up activity_expirations table
Mark Felder [Tue, 4 Aug 2020 18:12:23 +0000 (13:12 -0500)]
Add a migration to clean up activity_expirations table

4 years agoMerge branch 'deactivated-user-posts' into 'develop'
rinpatch [Tue, 4 Aug 2020 19:17:30 +0000 (19:17 +0000)]
Merge branch 'deactivated-user-posts' into 'develop'

Deactivated user posts

Closes #2011

See merge request pleroma/pleroma!2845

4 years agoMerge branch 'chore/consolidate-rich-media-http' into 'develop'
rinpatch [Tue, 4 Aug 2020 19:16:38 +0000 (19:16 +0000)]
Merge branch 'chore/consolidate-rich-media-http' into 'develop'

Consolidate construction of Rich Media Parser HTTP requests

See merge request pleroma/pleroma!2827

4 years agoUnique apps.client_id for new installations, fixes #2022
Alex Gleason [Tue, 4 Aug 2020 03:32:51 +0000 (22:32 -0500)]
Unique apps.client_id for new installations, fixes #2022

4 years agoMerge branch 'fix/activity-expiration-policy' into 'develop'
lain [Tue, 4 Aug 2020 16:30:09 +0000 (16:30 +0000)]
Merge branch 'fix/activity-expiration-policy' into 'develop'

Fix ActivityExpirationPolicy

Closes #2019

See merge request pleroma/pleroma!2847

4 years agoFix ActivityExpirationPolicy
Egor Kislitsyn [Tue, 4 Aug 2020 14:26:37 +0000 (18:26 +0400)]
Fix ActivityExpirationPolicy

4 years agoMerge branch 'chore/credo-alias' into 'develop'
lain [Tue, 4 Aug 2020 14:09:23 +0000 (14:09 +0000)]
Merge branch 'chore/credo-alias' into 'develop'

Add a simple credo mix alias to run the same checks we use in CI

See merge request pleroma/pleroma!2846

4 years agoAdd analyze mix alias to run the same credo checks we use in CI
Mark Felder [Tue, 4 Aug 2020 13:55:40 +0000 (08:55 -0500)]
Add analyze mix alias to run the same credo checks we use in CI

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-valid...
lain [Tue, 4 Aug 2020 13:28:41 +0000 (15:28 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...
lain [Tue, 4 Aug 2020 13:10:36 +0000 (15:10 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads

4 years agoMastodonAPITest: Do the needful
lain [Tue, 4 Aug 2020 13:08:51 +0000 (15:08 +0200)]
MastodonAPITest: Do the needful

4 years agoquestion_validator: Allow content to be an empty-string (blank)
Haelwenn (lanodan) Monnier [Tue, 4 Aug 2020 12:23:35 +0000 (14:23 +0200)]
question_validator: Allow content to be an empty-string (blank)

4 years agoCommonValidations: Treat deactivated users as not present.
lain [Tue, 4 Aug 2020 12:17:03 +0000 (14:17 +0200)]
CommonValidations: Treat deactivated users as not present.

4 years agoTransmogrifierTest: Add test for deactivated users
lain [Tue, 4 Aug 2020 12:15:32 +0000 (14:15 +0200)]
TransmogrifierTest: Add test for deactivated users

4 years agoUpdate descriptions in :frontends group
Angelina Filippova [Tue, 4 Aug 2020 12:10:44 +0000 (15:10 +0300)]
Update descriptions in :frontends group

4 years agoCommonAPITest: Add test that deactivated users can't post.
lain [Tue, 4 Aug 2020 12:08:12 +0000 (14:08 +0200)]
CommonAPITest: Add test that deactivated users can't post.

4 years agoTest Config: Don't have any MRFs by default
lain [Tue, 4 Aug 2020 12:07:10 +0000 (14:07 +0200)]
Test Config: Don't have any MRFs by default

4 years agoApp Test: Make more resilient
lain [Tue, 4 Aug 2020 11:38:30 +0000 (13:38 +0200)]
App Test: Make more resilient

4 years agoUnify Config.get behaviour for atom/list key param
Roman Chvanikov [Tue, 4 Aug 2020 11:35:47 +0000 (14:35 +0300)]
Unify Config.get behaviour for atom/list key param

4 years agoMerge branch 'email-blacklist' into 'develop'
lain [Tue, 4 Aug 2020 11:00:30 +0000 (11:00 +0000)]
Merge branch 'email-blacklist' into 'develop'

Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837

4 years agoChangelog: Add info about email blacklist
lain [Tue, 4 Aug 2020 10:49:56 +0000 (12:49 +0200)]
Changelog: Add info about email blacklist

4 years agoEmail blacklist: Update phrasing again
Alex Gleason [Tue, 4 Aug 2020 03:20:49 +0000 (22:20 -0500)]
Email blacklist: Update phrasing again

4 years agoEmail blacklist: Update response phrasing
Alex Gleason [Tue, 4 Aug 2020 00:57:53 +0000 (19:57 -0500)]
Email blacklist: Update response phrasing

4 years agoAdd label to :restrict_unauthenticated setting, fix typos
Angelina Filippova [Mon, 3 Aug 2020 23:21:25 +0000 (02:21 +0300)]
Add label to :restrict_unauthenticated setting, fix typos

4 years agoUpdate :welcome settings description
Angelina Filippova [Mon, 3 Aug 2020 23:04:29 +0000 (02:04 +0300)]
Update :welcome settings description

4 years agoFix :args settings description in Upload.Filter.Mogrify group
Angelina Filippova [Mon, 3 Aug 2020 22:45:18 +0000 (01:45 +0300)]
Fix :args settings description in Upload.Filter.Mogrify group

4 years agoMerge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into...
lain [Mon, 3 Aug 2020 21:01:56 +0000 (21:01 +0000)]
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'

fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782

4 years agoImproved WelcomeChatMessageTest
Ilja [Mon, 3 Aug 2020 18:13:43 +0000 (20:13 +0200)]
Improved WelcomeChatMessageTest

* Checks if message is the same using ==/2 instead of =~/2

4 years agoConsolidate construction of Rich Media Parser HTTP requests
Mark Felder [Mon, 3 Aug 2020 17:37:31 +0000 (12:37 -0500)]
Consolidate construction of Rich Media Parser HTTP requests

4 years agoApply 1 suggestion(s) to 1 file(s)
Ilja [Mon, 3 Aug 2020 16:44:56 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoChangelog: Update with frontend mix task.
lain [Mon, 3 Aug 2020 16:23:26 +0000 (18:23 +0200)]
Changelog: Update with frontend mix task.

4 years agoDocs: Add info about installing from a local path.
lain [Mon, 3 Aug 2020 15:50:53 +0000 (17:50 +0200)]
Docs: Add info about installing from a local path.