Ivan Tashkinov [Wed, 12 Aug 2020 14:13:01 +0000 (17:13 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
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
Maksim Pechnikov [Tue, 11 Aug 2020 19:06:33 +0000 (22:06 +0300)]
fix job monitor
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
Egor Kislitsyn [Tue, 11 Aug 2020 13:21:17 +0000 (17:21 +0400)]
Set `users.approval_pending` default to `false`
Ivan Tashkinov [Tue, 11 Aug 2020 12:13:29 +0000 (15:13 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# mix.lock
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
lain [Tue, 11 Aug 2020 09:08:27 +0000 (09:08 +0000)]
Apply 1 suggestion(s) to 1 file(s)
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
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
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
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
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
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
lain [Mon, 10 Aug 2020 13:31:36 +0000 (15:31 +0200)]
Transmogrifier: Remove duplicate code.
Alibek Omarov [Mon, 10 Aug 2020 13:24:45 +0000 (16:24 +0300)]
docs: add cmake to other installation guides
lain [Mon, 10 Aug 2020 13:12:45 +0000 (15:12 +0200)]
Docs: Add cmake dependency
lain [Mon, 10 Aug 2020 13:05:13 +0000 (13:05 +0000)]
Revert "Merge branch 'issue/1023' into 'develop'"
This reverts merge request !2763
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
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
rinpatch [Fri, 7 Aug 2020 19:10:09 +0000 (22:10 +0300)]
20200802170532_fix_legacy_tags: chunk the user query
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.
lain [Mon, 10 Aug 2020 08:33:05 +0000 (10:33 +0200)]
AccountController: Build the correct update activity.
Will fix federation issues.
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
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
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
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
Egor Kislitsyn [Sat, 8 Aug 2020 12:29:40 +0000 (16:29 +0400)]
Add mix task to add expiration to all local statuses
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
Mark Felder [Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)]
Merge branch 'develop' into fix/ldap-auth-issues
Mark Felder [Fri, 7 Aug 2020 19:54:14 +0000 (14:54 -0500)]
Make a new function instead of overloading register_changeset/3
rinpatch [Fri, 7 Aug 2020 18:25:16 +0000 (21:25 +0300)]
Add security policy for Pleroma backend
Closes #1848
Alex Gleason [Fri, 7 Aug 2020 18:02:39 +0000 (13:02 -0500)]
Force 204 responses to be empty, fixes #2029
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
lain [Fri, 7 Aug 2020 15:59:55 +0000 (17:59 +0200)]
Docs: Remove wrong / confusing auth docs.
rinpatch [Fri, 7 Aug 2020 14:33:59 +0000 (17:33 +0300)]
CI: install cmake since fast_html now requires it
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
Mark Felder [Fri, 7 Aug 2020 14:42:10 +0000 (09:42 -0500)]
Add a note about the proper value for uid
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
lain [Fri, 7 Aug 2020 14:20:13 +0000 (16:20 +0200)]
Changelog: Add information about the object age policy
rinpatch [Fri, 7 Aug 2020 13:45:04 +0000 (16:45 +0300)]
mix.exs: update fast_sanitize to 0.2.0
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
rinpatch [Mon, 10 Feb 2020 21:29:25 +0000 (00:29 +0300)]
Make Floki use fast_html
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
Ivan Tashkinov [Fri, 7 Aug 2020 06:43:49 +0000 (09:43 +0300)]
Removed unused alias.
Ivan Tashkinov [Fri, 7 Aug 2020 06:38:05 +0000 (09:38 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
Alex Gleason [Thu, 6 Aug 2020 23:01:29 +0000 (18:01 -0500)]
restricted_nicknames: Add names from MastoAPI endpoints
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
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.
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
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
Mary Kate [Wed, 5 Aug 2020 20:39:11 +0000 (15:39 -0500)]
changelog for filter whole_word fix
Mary Kate [Wed, 5 Aug 2020 20:36:25 +0000 (15:36 -0500)]
update test for whole_word in filter
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
Mark Felder [Wed, 5 Aug 2020 16:40:09 +0000 (11:40 -0500)]
Comments are good when they're precise...
Roman Chvanikov [Wed, 5 Aug 2020 16:38:55 +0000 (19:38 +0300)]
Move checks to application startup
Mark Felder [Wed, 5 Aug 2020 16:36:12 +0000 (11:36 -0500)]
Add email to user account only if it exists in LDAP
Roman Chvanikov [Wed, 5 Aug 2020 16:16:48 +0000 (19:16 +0300)]
Merge branch 'develop' into command-available-check
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
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
lain [Wed, 5 Aug 2020 15:56:12 +0000 (17:56 +0200)]
CommonValidations: More refactors.
lain [Wed, 5 Aug 2020 15:36:27 +0000 (17:36 +0200)]
CommonValidations: Refactor `same_domain?`
lain [Wed, 5 Aug 2020 15:26:53 +0000 (17:26 +0200)]
CommonValidations: Extract modification right checker
lain [Wed, 5 Aug 2020 15:26:03 +0000 (17:26 +0200)]
MailerTest: Give it some time.
Roman Chvanikov [Wed, 5 Aug 2020 15:23:12 +0000 (18:23 +0300)]
Handle non-list keys in Config.fetch/1
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.
Roman Chvanikov [Wed, 5 Aug 2020 14:46:24 +0000 (17:46 +0300)]
Merge branch 'develop' into refactor/config-get
Roman Chvanikov [Wed, 5 Aug 2020 14:46:14 +0000 (17:46 +0300)]
Update clear_config macro
Mark Felder [Wed, 5 Aug 2020 14:41:17 +0000 (09:41 -0500)]
Define default authenticator in the config
lain [Wed, 5 Aug 2020 13:40:32 +0000 (15:40 +0200)]
Fix linting.
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.
Mark Felder [Wed, 5 Aug 2020 13:15:57 +0000 (08:15 -0500)]
Remove LDAP mail attribute as a requirement for registering an account
lain [Wed, 5 Aug 2020 12:51:33 +0000 (14:51 +0200)]
Questions: Move fixes to validators.
lain [Wed, 5 Aug 2020 11:33:21 +0000 (11:33 +0000)]
Apply 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)
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.
Roman Chvanikov [Wed, 5 Aug 2020 10:00:49 +0000 (13:00 +0300)]
Refactor config
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
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
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
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
MK Fain [Wed, 5 Aug 2020 02:01:27 +0000 (02:01 +0000)]
Update filter_view.ex to return whole_word actual value
Karol Kosek [Tue, 4 Aug 2020 22:01:30 +0000 (00:01 +0200)]
templates/layout/app.html.eex: fix link color
Mark Felder [Tue, 4 Aug 2020 18:12:23 +0000 (13:12 -0500)]
Add a migration to clean up activity_expirations table
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
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
Alex Gleason [Tue, 4 Aug 2020 03:32:51 +0000 (22:32 -0500)]
Unique apps.client_id for new installations, fixes #2022
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
Egor Kislitsyn [Tue, 4 Aug 2020 14:26:37 +0000 (18:26 +0400)]
Fix ActivityExpirationPolicy
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
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
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
lain [Tue, 4 Aug 2020 13:08:51 +0000 (15:08 +0200)]
MastodonAPITest: Do the needful
Haelwenn (lanodan) Monnier [Tue, 4 Aug 2020 12:23:35 +0000 (14:23 +0200)]
question_validator: Allow content to be an empty-string (blank)
lain [Tue, 4 Aug 2020 12:17:03 +0000 (14:17 +0200)]
CommonValidations: Treat deactivated users as not present.
lain [Tue, 4 Aug 2020 12:15:32 +0000 (14:15 +0200)]
TransmogrifierTest: Add test for deactivated users
lain [Tue, 4 Aug 2020 12:08:12 +0000 (14:08 +0200)]
CommonAPITest: Add test that deactivated users can't post.
lain [Tue, 4 Aug 2020 12:07:10 +0000 (14:07 +0200)]
Test Config: Don't have any MRFs by default
lain [Tue, 4 Aug 2020 11:38:30 +0000 (13:38 +0200)]
App Test: Make more resilient
Roman Chvanikov [Tue, 4 Aug 2020 11:35:47 +0000 (14:35 +0300)]
Unify Config.get behaviour for atom/list key param
projects / akkoma / log