Commit graph

11041 commits

Author SHA1 Message Date
rinpatch 39ca4a23c6 Merge branch 'authenticator-docs' into 'develop'
Docs: Remove wrong / confusing auth docs.

Closes #2028

See merge request pleroma/pleroma!2860
2020-08-07 17:51:48 +00:00
lain 60fe0a08f0 Docs: Remove wrong / confusing auth docs. 2020-08-07 17:59:55 +02:00
lain 9cebdf30a4 Merge branch 'spoopy-user' into 'develop'
restricted_nicknames: Add names from MastoAPI endpoints

See merge request pleroma/pleroma!2857
2020-08-07 14:51:26 +00:00
rinpatch 568ded5aa4 Merge branch 'object-age-changelog' into 'develop'
Changelog: Add information about the object age policy

See merge request pleroma/pleroma!2859
2020-08-07 14:21:28 +00:00
lain ebb30128af Changelog: Add information about the object age policy 2020-08-07 16:20:13 +02:00
lain 34cbe9f44a Merge branch 'features/poll-validation' into 'develop'
Poll and votes pipeline ingestion

Closes #1362 and #1852

See merge request pleroma/pleroma!2635
2020-08-07 10:44:06 +00:00
Alex Gleason e639eee82e
restricted_nicknames: Add names from MastoAPI endpoints 2020-08-06 18:01:29 -05:00
lain b9ebb55d2a 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
2020-08-06 16:54:32 +00:00
Ivan Tashkinov 135ae4e35a [#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes. 2020-08-06 16:00:00 +03:00
lain 10b0e55acf Merge branch 'whole-word-filter-hotfix' into 'develop'
Update filter_view.ex to return whole_word actual value

See merge request pleroma/pleroma!2851
2020-08-06 08:35:39 +00:00
lain 4b47d9c5b6 Merge branch 'command-available-check' into 'develop'
#1939  Check command availability for exiftool and git

See merge request pleroma/pleroma!2753
2020-08-06 08:27:10 +00:00
Mary Kate f785dba09b changelog for filter whole_word fix 2020-08-05 15:41:35 -05:00
Mary Kate d6ab9f2132 update test for whole_word in filter 2020-08-05 15:36:25 -05:00
Roman Chvanikov 7569f225f1 Move checks to application startup 2020-08-05 19:38:55 +03:00
Roman Chvanikov 4672b61106 Merge branch 'develop' into command-available-check 2020-08-05 19:16:48 +03:00
lain 7755f49e28 Merge branch 'migrate-legacy-tags' into 'develop'
Migrate legacy tags set by AdminFE to match TagPolicy, #2010

See merge request pleroma/pleroma!2836
2020-08-05 16:03:11 +00:00
lain 9688e332d0 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
2020-08-05 15:59:30 +00:00
lain 9d7ce1a6d0 CommonValidations: More refactors. 2020-08-05 17:56:12 +02:00
lain 3655175639 CommonValidations: Refactor same_domain? 2020-08-05 17:36:27 +02:00
lain 9c96fc052a CommonValidations: Extract modification right checker 2020-08-05 17:26:53 +02:00
lain 2173945f90 MailerTest: Give it some time. 2020-08-05 17:26:03 +02:00
Roman Chvanikov 8c57a299b4 Handle non-list keys in Config.fetch/1 2020-08-05 18:23:12 +03:00
Roman Chvanikov 2299bfe4c1 Merge branch 'develop' into refactor/config-get 2020-08-05 17:46:24 +03:00
Roman Chvanikov 97b5701449 Update clear_config macro 2020-08-05 17:46:14 +03:00
lain 5221879c35 Fix linting. 2020-08-05 15:40:32 +02:00
lain f889400d05 Questions: Move fixes to validators. 2020-08-05 14:51:33 +02:00
lain b5f0cef156 Apply 1 suggestion(s) to 1 file(s) 2020-08-05 11:33:21 +00:00
lain 70522989d9 Apply 1 suggestion(s) to 1 file(s) 2020-08-05 11:14:58 +00:00
lain 00c4c6a382 CommonValidations: Remove superfluous function
The `is_active` functionality was integrated into the presence
checker.
2020-08-05 12:24:34 +02:00
Roman Chvanikov 6f60ac9f41 Refactor config 2020-08-05 13:00:49 +03:00
lain 19c108170e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-05 11:12:14 +02:00
lain 474aba984f Merge branch 'unique-app-id' into 'develop'
Add unique index for apps.client_id, fixes #2022

Closes #2022

See merge request pleroma/pleroma!2844
2020-08-05 09:08:50 +00:00
lain e8d10237da Merge branch 'fix/incorrect-expirations' into 'develop'
Add a migration to clean up activity_expirations table

See merge request pleroma/pleroma!2848
2020-08-05 08:55:39 +00:00
lain bd157b7369 Merge branch 'fix-link-color' into 'develop'
templates/layout/app.html.eex: fix link color

See merge request pleroma/pleroma!2850
2020-08-05 08:11:58 +00:00
MK Fain f341a8e142 Update filter_view.ex to return whole_word actual value 2020-08-05 02:01:27 +00:00
Karol Kosek 577b11167c
templates/layout/app.html.eex: fix link color 2020-08-05 00:01:30 +02:00
Mark Felder 079e410d6e Add a migration to clean up activity_expirations table 2020-08-04 14:58:42 -05:00
rinpatch b1b6a7dfa8 Merge branch 'deactivated-user-posts' into 'develop'
Deactivated user posts

Closes #2011

See merge request pleroma/pleroma!2845
2020-08-04 19:17:30 +00:00
rinpatch fede37e4c6 Merge branch 'chore/consolidate-rich-media-http' into 'develop'
Consolidate construction of Rich Media Parser HTTP requests

See merge request pleroma/pleroma!2827
2020-08-04 19:16:38 +00:00
Alex Gleason 184742af5e
Unique apps.client_id for new installations, fixes #2022 2020-08-04 13:31:40 -05:00
lain 917aa090f0 Merge branch 'fix/activity-expiration-policy' into 'develop'
Fix ActivityExpirationPolicy

Closes #2019

See merge request pleroma/pleroma!2847
2020-08-04 16:30:09 +00:00
Egor Kislitsyn 91fbb5b21f
Fix ActivityExpirationPolicy 2020-08-04 18:26:37 +04:00
lain b55e26e816 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
2020-08-04 14:09:23 +00:00
Mark Felder 697e3db01c Add analyze mix alias to run the same credo checks we use in CI 2020-08-04 08:55:40 -05:00
lain 878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-04 15:28:41 +02:00
lain 36aa34a1a8 MastodonAPITest: Do the needful 2020-08-04 15:08:51 +02:00
Haelwenn (lanodan) Monnier 0f088d8ce3
question_validator: Allow content to be an empty-string (blank) 2020-08-04 14:29:16 +02:00
lain 1a00713744 CommonValidations: Treat deactivated users as not present. 2020-08-04 14:17:03 +02:00
lain 0cfadcf2ca TransmogrifierTest: Add test for deactivated users 2020-08-04 14:15:32 +02:00
lain e92c040ad3 CommonAPITest: Add test that deactivated users can't post. 2020-08-04 14:08:12 +02:00