1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
2020-08-07 16:35:15 -05:00
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
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
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
f785dba09b
changelog for filter whole_word fix
2020-08-05 15:41:35 -05:00
d6ab9f2132
update test for whole_word in filter
2020-08-05 15:36:25 -05:00
4672b61106
Merge branch 'develop' into command-available-check
2020-08-05 19:16:48 +03:00
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
9c96fc052a
CommonValidations: Extract modification right checker
2020-08-05 17:26:53 +02:00
2173945f90
MailerTest: Give it some time.
2020-08-05 17:26:03 +02:00
8c57a299b4
Handle non-list keys in Config.fetch/1
2020-08-05 18:23:12 +03:00
2299bfe4c1
Merge branch 'develop' into refactor/config-get
2020-08-05 17:46:24 +03:00
97b5701449
Update clear_config macro
2020-08-05 17:46:14 +03:00
0f9aecbca4
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.
2020-08-05 08:18:16 -05:00
f7146583e5
Remove LDAP mail attribute as a requirement for registering an account
2020-08-05 08:15:57 -05:00
6f60ac9f41
Refactor config
2020-08-05 13:00:49 +03:00
19c108170e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-05 11:12:14 +02:00
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
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
184742af5e
Unique apps.client_id for new installations, fixes #2022
2020-08-04 13:31:40 -05:00
91fbb5b21f
Fix ActivityExpirationPolicy
2020-08-04 18:26:37 +04:00
878c7f3f30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-04 15:28:41 +02:00
36aa34a1a8
MastodonAPITest: Do the needful
2020-08-04 15:08:51 +02:00
0f088d8ce3
question_validator: Allow content to be an empty-string (blank)
2020-08-04 14:29:16 +02:00
1a00713744
CommonValidations: Treat deactivated users as not present.
2020-08-04 14:17:03 +02:00
0cfadcf2ca
TransmogrifierTest: Add test for deactivated users
2020-08-04 14:15:32 +02:00
e92c040ad3
CommonAPITest: Add test that deactivated users can't post.
2020-08-04 14:08:12 +02:00
953f71bcfa
App Test: Make more resilient
2020-08-04 13:38:30 +02:00
56e9bf3393
Unify Config.get behaviour for atom/list key param
2020-08-04 14:35:47 +03:00
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00
4f57e85ab9
Email blacklist: Update phrasing again
2020-08-03 22:20:49 -05:00
058daf498f
Email blacklist: Update response phrasing
2020-08-03 19:57:53 -05:00
e3953923ac
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
2020-08-03 21:01:56 +00:00
cbf8bfc694
Improved WelcomeChatMessageTest
...
* Checks if message is the same using ==/2 instead of =~/2
2020-08-03 20:13:43 +02:00
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
2020-08-03 14:22:11 +00:00
de3bdc63ad
AccountControllerTest: Add test for message returned.
2020-08-03 15:00:14 +02:00
5876d5123c
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
2020-08-03 12:50:10 +00:00
10c792110e
MRF Object Age Policy: Don't break on messages without cc/to
2020-08-03 14:12:32 +02:00
f9301044ed
Add ReportNote test
2020-08-02 17:45:15 -05:00
77b48cb4ce
Factory: Add report_activity_factory
2020-08-02 16:36:55 -05:00
dc88b6f091
Add email blacklist, fixes #1404
2020-08-02 14:53:42 -05:00
c2c3dd4613
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
2020-08-02 13:42:23 -05:00
f671d7e68c
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
2020-08-02 15:54:59 +02:00
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
2020-07-31 14:43:33 +00:00
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
2020-07-31 13:57:21 +02:00
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31 14:13:38 +03:00
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
2020-07-31 09:57:30 +02:00
d1cf1108ac
Merge branch 'render-preview-cards-in-chats' into 'develop'
...
Render preview cards in chats
See merge request pleroma/pleroma!2816
2020-07-30 20:08:03 +00:00
Alex Gleason