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.
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
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
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
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
Roman Chvanikov [Wed, 5 Aug 2020 16:38:55 +0000 (19:38 +0300)]
Move checks to application startup
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
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
lain [Wed, 5 Aug 2020 13:40:32 +0000 (15:40 +0200)]
Fix linting.
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
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
lain [Tue, 4 Aug 2020 10:49:56 +0000 (12:49 +0200)]
Changelog: Add info about email blacklist
Alex Gleason [Tue, 4 Aug 2020 03:20:49 +0000 (22:20 -0500)]
Email blacklist: Update phrasing again
Alex Gleason [Tue, 4 Aug 2020 00:57:53 +0000 (19:57 -0500)]
Email blacklist: Update response phrasing
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
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
Mark Felder [Mon, 3 Aug 2020 17:37:31 +0000 (12:37 -0500)]
Consolidate construction of Rich Media Parser HTTP requests
Ilja [Mon, 3 Aug 2020 16:44:56 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
lain [Mon, 3 Aug 2020 14:22:11 +0000 (14:22 +0000)]
Merge branch 'follower-mrf-again' into 'develop'
Follower mrf again
See merge request pleroma/pleroma!2833
lain [Mon, 3 Aug 2020 13:00:14 +0000 (15:00 +0200)]
AccountControllerTest: Add test for message returned.
lain [Mon, 3 Aug 2020 12:50:29 +0000 (12:50 +0000)]
Merge branch 'config/default_ok_oldage' into 'develop'
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
lain [Mon, 3 Aug 2020 12:50:10 +0000 (12:50 +0000)]
Merge branch 'object-age-fix' into 'develop'
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
lain [Mon, 3 Aug 2020 12:12:32 +0000 (14:12 +0200)]
MRF Object Age Policy: Don't break on messages without cc/to
lain [Mon, 3 Aug 2020 11:37:55 +0000 (11:37 +0000)]
Merge branch 'indigenous-client' into 'develop'
Add indigenous to clients
See merge request pleroma/pleroma!2835
lain [Mon, 3 Aug 2020 09:55:56 +0000 (09:55 +0000)]
Merge branch 'reportnote-test' into 'develop'
ReportNote test
Closes #2014
See merge request pleroma/pleroma!2839
Alex Gleason [Sun, 2 Aug 2020 21:37:33 +0000 (16:37 -0500)]
Add ReportNote test
Alex Gleason [Sun, 2 Aug 2020 21:36:55 +0000 (16:36 -0500)]
Factory: Add report_activity_factory
Alex Gleason [Sun, 2 Aug 2020 19:53:42 +0000 (14:53 -0500)]
Add email blacklist, fixes #1404
Alex Gleason [Sun, 2 Aug 2020 18:42:23 +0000 (13:42 -0500)]
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
swentel [Sun, 2 Aug 2020 17:33:22 +0000 (19:33 +0200)]
Add indigenous to clients
Ilja [Sun, 2 Aug 2020 13:54:59 +0000 (15:54 +0200)]
Add welcome chatmessages
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
Alex Gleason [Sat, 1 Aug 2020 21:08:29 +0000 (16:08 -0500)]
SimpleMRF: Add missing :followers_only to config.exs
lain [Sat, 1 Aug 2020 15:58:17 +0000 (15:58 +0000)]
Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'
[#1985] Prevented force login on registration if account approval and/or email confirmation needed
Closes #1985
See merge request pleroma/pleroma!2823
rinpatch [Sat, 1 Aug 2020 15:17:41 +0000 (15:17 +0000)]
Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'
ConnectionPool: fix gun open errors being returned without an error tuple
Closes #2008
See merge request pleroma/pleroma!2832
rinpatch [Sat, 1 Aug 2020 14:59:50 +0000 (17:59 +0300)]
ConnectionPool: fix gun open errors being returned without an error tuple
When gun shuts down due to the host being unreachable, the worker
process shuts down with the same shutdown reason since they are linked.
Gun doesn't have error tuples in it's shutdown reason though, so we need
to handle it in get_conn.
Closes #2008
rinpatch [Sat, 1 Aug 2020 10:49:35 +0000 (10:49 +0000)]
Merge branch 'fix/gun-limiter' into 'develop'
Fix ConnecitonPool deadlocking after reaching the connection limit
Closes #1977
See merge request pleroma/pleroma!2830
rinpatch [Sat, 1 Aug 2020 09:16:06 +0000 (12:16 +0300)]
Fix ConnecitonPool deadlocking after reaching the connection limit
The issue was with ConcurrentLimiter not decrementing counters on
overload. It was fixed in the latest commit, but concurrentlimiter
version wasn't updated in Pleroma for some reason.
Closes #1977
rinpatch [Sat, 1 Aug 2020 07:25:32 +0000 (07:25 +0000)]
Merge branch 'fix/user-agent-overriding' into 'develop'
Don't override user-agent header if it's been set
Closes #1923
See merge request pleroma/pleroma!2829
Roman Chvanikov [Sat, 1 Aug 2020 07:04:25 +0000 (10:04 +0300)]
Don't override user-agent header if it's been set
lain [Fri, 31 Jul 2020 15:18:04 +0000 (15:18 +0000)]
Revert "Merge branch 'revert-
1ac0969c' into 'develop'"
This reverts merge request !2825
lain [Fri, 31 Jul 2020 15:17:33 +0000 (15:17 +0000)]
Merge branch 'revert-
1ac0969c' into 'develop'
Revert "Merge branch 'mrf-silence-2' into 'develop'"
See merge request pleroma/pleroma!2825
lain [Fri, 31 Jul 2020 15:17:09 +0000 (15:17 +0000)]
Revert "Merge branch 'mrf-silence-2' into 'develop'"
This reverts merge request !2820
lain [Fri, 31 Jul 2020 14:43:33 +0000 (14:43 +0000)]
Merge branch 'mrf-silence-2' into 'develop'
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
Haelwenn (lanodan) Monnier [Fri, 31 Jul 2020 11:57:21 +0000 (13:57 +0200)]
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
Ivan Tashkinov [Fri, 31 Jul 2020 11:13:38 +0000 (14:13 +0300)]
[#1985] Prevented force login on registration if account approval and/or email confirmation needed.
Refactored login code in OAuthController, reused in AccountController. Added tests.
lain [Fri, 31 Jul 2020 10:29:16 +0000 (10:29 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Haelwenn (lanodan) Monnier [Thu, 30 Jul 2020 16:49:48 +0000 (18:49 +0200)]
Default MRF to ObjectAgePolicy, 7 days threshold
lain [Fri, 31 Jul 2020 09:11:24 +0000 (09:11 +0000)]
Merge branch 'deactivate-gun-again' into 'develop'
Config: Default to Hackney again
See merge request pleroma/pleroma!2821
lain [Fri, 31 Jul 2020 08:50:45 +0000 (10:50 +0200)]
Config: Default to Hackney again
Gun is still acting up.
lain [Fri, 31 Jul 2020 07:57:30 +0000 (09:57 +0200)]
SimplePolicy: Fix problem with DM leaks.
feld [Thu, 30 Jul 2020 21:25:30 +0000 (21:25 +0000)]
Merge branch 'chore/fix-docs-typo' into 'develop'
Fix example json response
See merge request pleroma/pleroma!2819
Mark Felder [Thu, 30 Jul 2020 20:57:41 +0000 (15:57 -0500)]
Fix example json response
feld [Thu, 30 Jul 2020 20:28:28 +0000 (20:28 +0000)]
Merge branch 'fix/configdb-otp-instructions' into 'develop'
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
See merge request pleroma/pleroma!2817
Haelwenn [Thu, 30 Jul 2020 20:08:03 +0000 (20:08 +0000)]
Merge branch 'render-preview-cards-in-chats' into 'develop'
Render preview cards in chats
See merge request pleroma/pleroma!2816
Haelwenn [Thu, 30 Jul 2020 20:01:04 +0000 (20:01 +0000)]
Merge branch '1993-confirm-users-on-registration' into 'develop'
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
Mark Felder [Thu, 30 Jul 2020 18:04:49 +0000 (13:04 -0500)]
Merge branch 'develop' into fix/configdb-otp-instructions
lain [Thu, 30 Jul 2020 17:57:45 +0000 (19:57 +0200)]
ChatMessage schema: Add preview cards.
projects / akkoma / log