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 |
|
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 |
|
Egor Kislitsyn
|
91fbb5b21f
|
Fix ActivityExpirationPolicy
|
2020-08-04 18:26:37 +04:00 |
|
lain
|
36aa34a1a8
|
MastodonAPITest: Do the needful
|
2020-08-04 15:08:51 +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 |
|
lain
|
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 |
|
Alex Gleason
|
4f57e85ab9
|
Email blacklist: Update phrasing again
|
2020-08-03 22:20:49 -05:00 |
|
Alex Gleason
|
058daf498f
|
Email blacklist: Update response phrasing
|
2020-08-03 19:57:53 -05:00 |
|
lain
|
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 |
|
lain
|
de3bdc63ad
|
AccountControllerTest: Add test for message returned.
|
2020-08-03 15:00:14 +02:00 |
|
lain
|
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 |
|
lain
|
10c792110e
|
MRF Object Age Policy: Don't break on messages without cc/to
|
2020-08-03 14:12:32 +02:00 |
|
lain
|
4b18a07392
|
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
This reverts merge request !2825
|
2020-07-31 15:18:04 +00:00 |
|
lain
|
010d77ec85
|
Revert "Merge branch 'mrf-silence-2' into 'develop'"
This reverts merge request !2820
|
2020-07-31 15:17:09 +00:00 |
|
lain
|
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 |
|
Ivan Tashkinov
|
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 |
|
lain
|
1dd162a5f7
|
SimplePolicy: Fix problem with DM leaks.
|
2020-07-31 09:57:30 +02:00 |
|
Haelwenn
|
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 |
|
Haelwenn
|
87fe31fb5c
|
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
|
2020-07-30 20:01:04 +00:00 |
|
lain
|
781b270863
|
ChatMessageReferenceView: Display preview cards.
|
2020-07-30 19:57:26 +02:00 |
|
lain
|
873ff5ce14
|
Merge branch 'hide-reactions' into 'develop'
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
|
2020-07-30 12:41:47 +00:00 |
|
lain
|
e2e66e50d3
|
SimplePolicyTest: Add test for leaking DMs.
|
2020-07-30 14:29:00 +02:00 |
|
Maksim Pechnikov
|
cff7bb5cd4
|
Merge branch 'develop' into issue/1933-update-dependency
|
2020-07-30 08:52:13 +03:00 |
|
Alex Gleason
|
702f0fb822
|
Merge remote-tracking branch 'upstream/develop' into mrf-silence
|
2020-07-29 13:01:16 -05:00 |
|
Alex Gleason
|
93638935d7
|
SimpleMRF: :silence --> :followers_only
|
2020-07-29 12:58:08 -05:00 |
|
Alex Gleason
|
00d090004e
|
:show_reactions, refactor the other test
|
2020-07-29 12:50:11 -05:00 |
|
Alex Gleason
|
026a51cb27
|
:show_reactions, add CHANGELOG.md, refactor test
|
2020-07-29 12:45:32 -05:00 |
|
Alex Gleason
|
d8a01c9432
|
Merge remote-tracking branch 'upstream/develop' into hide-reactions
|
2020-07-29 12:43:39 -05:00 |
|
lain
|
d9bf2c58df
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
|
2020-07-29 14:42:09 +02:00 |
|
Haelwenn
|
269b61a240
|
Merge branch '1996-dont-break-on-chatmessages' into 'develop'
EnsureRePrepended: Don't break on chat messages.
Closes #1996
See merge request pleroma/pleroma!2808
|
2020-07-29 12:20:04 +00:00 |
|
lain
|
de5c7e20a3
|
Merge branch 'bugfix/remote-user-atom' into 'develop'
feed/user_controller: Return 404 when the user is remote
Closes #1911
See merge request pleroma/pleroma!2811
|
2020-07-29 12:16:20 +00:00 |
|
Haelwenn (lanodan) Monnier
|
2e27847573
|
feed/user_controller: Return 404 when the user is remote
|
2020-07-29 14:02:02 +02:00 |
|
lain
|
79f9ddd8b7
|
Merge branch 'by-approval' into 'develop'
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
|
2020-07-29 11:27:26 +00:00 |
|
lain
|
c25c21dd22
|
AccountController: Don't explicitly ask to keep users unconfirmed.
Confirmation is set in User.register_changeset based on the config
settings.
|
2020-07-29 11:47:03 +02:00 |
|
lain
|
edf8b6abfe
|
EnsureRePrepended: Don't break on chat messages.
|
2020-07-29 10:53:08 +02:00 |
|
Maksim Pechnikov
|
15b8446cdb
|
updated dev & test packages
|
2020-07-29 06:47:56 +03:00 |
|
Alex Gleason
|
3c90f7f715
|
SimpleMRF: Let instances be silenced
|
2020-07-28 19:06:42 -05:00 |
|
Alex Gleason
|
3b7c454418
|
Let favourites and emoji reactions optionally be hidden
|
2020-07-28 14:58:30 -05:00 |
|
Alex Gleason
|
f688c8df82
|
Fix User.registration_reason HTML sanitizing issues
|
2020-07-27 20:36:31 -05:00 |
|
Alex Gleason
|
f43518eb74
|
Lint, fix test
|
2020-07-27 19:22:31 -05:00 |
|
lain
|
9e6f4694dd
|
Pipeline: Unify embedded_object / object_data, move to validator.
|
2020-07-27 16:39:50 +02:00 |
|
Alex Gleason
|
6931dbfa58
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
2020-07-26 15:46:14 -05:00 |
|
Lain Soykaf
|
1dd6de03ee
|
CommonAPI Tests: Check that undoing objects federates them as embeds.
|
2020-07-24 14:54:13 +02:00 |
|
Lain Soykaf
|
3d13fb05f8
|
Side Effects: On undoing, put information about the undone object.
|
2020-07-24 14:40:22 +02:00 |
|
Lain Soykaf
|
91f3cf9bc6
|
Pipeline: Add embedded object federation.
|
2020-07-24 14:06:41 +02:00 |
|
feld
|
51627a10e5
|
Merge branch 'unblock-domain-via-query' into 'develop'
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
|
2020-07-23 20:06:11 +00:00 |
|
Mark Felder
|
4bfad0b483
|
Support blocking via query parameters as well and document the change.
|
2020-07-23 12:59:40 -05:00 |
|