Alex Gleason
|
3104367931
|
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
|
4 years ago |
|
Alex Gleason
|
bf181ca968
|
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()
|
4 years ago |
|
lain
|
f2f0a0260f
|
ActivityPub: Don't block-filter your own posts
We are filtering out replies to people you block, but that should
not include your own posts.
|
4 years ago |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
stwf
|
41939e3175
|
User search respect discoverable flag
|
4 years ago |
|
Ivan Tashkinov
|
d9fb5bc08a
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
4 years ago |
|
Maksim Pechnikov
|
f879d07fa1
|
fixed tests
|
4 years ago |
|
Ivan Tashkinov
|
0bda85857e
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
|
4 years ago |
|
Alexander Strizhakov
|
2c2094d4b2
|
configurable lifetime for ephemeral activities
|
4 years ago |
|
Alexander Strizhakov
|
eb5ff715f7
|
pin/unpin for activities with expires_at option
|
4 years ago |
|
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
4 years ago |
|
Ivan Tashkinov
|
68a74d6659
|
[#2497] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_.
|
4 years ago |
|
Mark Felder
|
4ee99dafcc
|
Merge branch 'develop' into media-preview-proxy
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
921f926e96
|
Remove OStatus in testsuite
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f6723dc9bd
|
account_view_test: Remove empty test
|
4 years ago |
|
rinpatch
|
ce3474f4d3
|
Disable favicon scraping in tests
|
4 years ago |
|
lain
|
9b85592b8b
|
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
|
4 years ago |
|
feld
|
43b07c31cb
|
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
|
4 years ago |
|
Alexander Strizhakov
|
696bf09433
|
passing adapter options directly without adapter key
|
4 years ago |
|
rinpatch
|
e198ba492e
|
Rich Media: Do not cache URLs for preview statuses
Closes #1987
|
4 years ago |
|
Ivan Tashkinov
|
c3b02341bf
|
[#2497] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
|
4 years ago |
|
feld
|
d1a6f67b1d
|
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
|
4 years ago |
|
Mark Felder
|
cbf7f0e029
|
Disallow password resets for deactivated accounts.
Ensure all responses to password reset events are identical.
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
d872858046
|
Fix removing an account from a list
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
|
4 years ago |
|
lain
|
cfc99fe05c
|
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
|
4 years ago |
|
feld
|
fb33321fa2
|
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
36c125a071
|
Pipeline Ingestion: Event
|
4 years ago |
|
Ivan Tashkinov
|
60ac83a4c1
|
[#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
|
4 years ago |
|
Sergey Suprunenko
|
0865f36965
|
Mark notifications about statuses from muted users as read automatically
|
4 years ago |
|
lain
|
66122a11b5
|
AccountController: Build the correct update activity.
Will fix federation issues.
|
4 years ago |
|
lain
|
34cbe9f44a
|
Merge branch 'features/poll-validation' into 'develop'
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
|
4 years ago |
|
Mary Kate
|
f785dba09b
|
changelog for filter whole_word fix
|
4 years ago |
|
Mary Kate
|
d6ab9f2132
|
update test for whole_word in filter
|
4 years ago |
|
lain
|
19c108170e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
4 years ago |
|
lain
|
878c7f3f30
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
4 years ago |
|
lain
|
36aa34a1a8
|
MastodonAPITest: Do the needful
|
4 years ago |
|
Alex Gleason
|
4f57e85ab9
|
Email blacklist: Update phrasing again
|
4 years ago |
|
Alex Gleason
|
058daf498f
|
Email blacklist: Update response phrasing
|
4 years ago |
|
lain
|
de3bdc63ad
|
AccountControllerTest: Add test for message returned.
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
ac2598307d
|
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
|
4 years ago |
|
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.
|
4 years ago |
|
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
|
4 years ago |
|
Alex Gleason
|
00d090004e
|
:show_reactions, refactor the other test
|
4 years ago |
|
Alex Gleason
|
d8a01c9432
|
Merge remote-tracking branch 'upstream/develop' into hide-reactions
|
4 years ago |
|
lain
|
d9bf2c58df
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
|
4 years ago |
|
lain
|
c25c21dd22
|
AccountController: Don't explicitly ask to keep users unconfirmed.
Confirmation is set in User.register_changeset based on the config
settings.
|
4 years ago |
|
Alex Gleason
|
3b7c454418
|
Let favourites and emoji reactions optionally be hidden
|
4 years ago |
|
Alex Gleason
|
f688c8df82
|
Fix User.registration_reason HTML sanitizing issues
|
4 years ago |
|
Alex Gleason
|
f43518eb74
|
Lint, fix test
|
4 years ago |
|
Alex Gleason
|
6931dbfa58
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
4 years ago |
