Mark Felder
|
dcdf75fbac
|
Merge branch 'develop' into fix/deprecation-warning-welcome-message
|
4 years ago |
feld
|
1672d8b37c
|
Merge branch 'feature/bulk-confirmation' into 'develop'
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
|
4 years ago |
Mark Felder
|
2bf2c68dee
|
Merge branch 'develop' into fix/deprecation-warning-welcome-message
|
4 years ago |
Mark Felder
|
8b84ca4901
|
Simplify the value comparison
|
4 years ago |
rinpatch
|
5cd71208d9
|
Merge branch 'search-even-more' into 'develop'
More user search improvements
See merge request pleroma/pleroma!3032
|
4 years ago |
rinpatch
|
f67c967c4a
|
Merge branch 'features/incoming-create-exists' into 'develop'
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
|
4 years ago |
lain
|
05b5241314
|
Linter fixes
|
4 years ago |
lain
|
a8c17ea25a
|
User Search: Also find user by uri
|
4 years ago |
Mark Felder
|
81faf540b3
|
Add some user feedback
|
4 years ago |
Mark Felder
|
e33360fdb9
|
Cannot use batches with User.try_send_confirmation_email/1
|
4 years ago |
Mark Felder
|
935ef21b02
|
Use the import
|
4 years ago |
lain
|
d0078bc404
|
User Search: Boost resolved results and exact ap_id matches.
|
4 years ago |
Mark Felder
|
8af8eb5ce7
|
Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream
|
4 years ago |
Mark Felder
|
f3a1f9c3bb
|
Merge branch 'develop' into feature/bulk-confirmation
|
4 years ago |
lain
|
e02101e15c
|
Merge branch 'issue/2115' into 'develop'
[#2115] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
|
4 years ago |
lain
|
4dadb7c433
|
Merge branch 'user-query/filter-out-internal' into 'develop'
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
|
4 years ago |
lain
|
436d1a3c41
|
Merge branch 'develop' into 'issue/2115'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
Haelwenn (lanodan) Monnier
|
5e86a2809e
|
transmogrifier: Drop incoming create early if it already exists
|
4 years ago |
lain
|
a6c14041c4
|
Merge branch 'develop' into 'issue/1975'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
Maksim Pechnikov
|
72d2b34d3b
|
Merge branch 'develop' into issue/1975
|
4 years ago |
Alex Gleason
|
3104367931
|
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
|
4 years ago |
Mark Felder
|
e2dcf039d2
|
Fix gun_pool_options deprecation warning message
|
4 years ago |
Mark Felder
|
2fc3b46ee7
|
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
|
4 years ago |
lain
|
c95859e45b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
|
4 years ago |
Egor Kislitsyn
|
0e0ece251a
|
Filter out internal users by default
|
4 years ago |
Mark Felder
|
e5927e92a6
|
Fix deprecation warning for welcome message
|
4 years ago |
feld
|
a5c34e3123
|
Merge branch 'fix/fedsocket-useragent' into 'develop'
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
|
4 years ago |
Alex Gleason
|
23d5d7cf59
|
Fix #2172 HTTP error on password reset
|
4 years ago |
Alex Gleason
|
8b6ac45f3c
|
Allow emails to be sent again, #2101 #2172
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
|
4 years ago |
lain
|
59680f27ff
|
Merge branch 'bugfix/federator-actor-error' into 'develop'
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
|
4 years ago |
lain
|
9108e27c2f
|
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
[#2074] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
|
4 years ago |
lain
|
b36b6259d8
|
Merge branch 'issue/2099' into 'develop'
[#2099] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
|
4 years ago |
Mark Felder
|
8afdbcdb1c
|
Force HTTP for fedsockets
|
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
|
60b025b782
|
[#2074] OAuth scope checking in Streaming API.
|
4 years ago |
rinpatch
|
4b12e071ac
|
OpenAPI: make it possible to generate a spec without starting the app
Needed for api docs generation on pleroma.social that will come later
|
4 years ago |
rinpatch
|
51116b5392
|
OpenAPI: fix various errors pointed out by editor.swagger.io
|
4 years ago |
Mark Felder
|
26859c549c
|
Add user agent to fedsocket requests
|
4 years ago |
Maksim Pechnikov
|
ed3bc53fa1
|
Merge branch 'develop' into issue/2099
|
4 years ago |
feld
|
6c052bd5b6
|
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
|
4 years ago |
rinpatch
|
26c571df33
|
FedSockets: fix log spam on cached rejects
|
4 years ago |
Steven Fuchs
|
f2ef9735c5
|
Federate data through persistent websocket connections
|
4 years ago |
Maksim Pechnikov
|
2ec0dcf001
|
Merge branch 'develop' into issue/2099
|
4 years ago |
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
4 years ago |
Haelwenn (lanodan) Monnier
|
7bf269fe83
|
Fix MRF reject for ChatMessage
|
4 years ago |
Haelwenn (lanodan) Monnier
|
abf25e5d52
|
Create MRF.filter_pipeline to inject :object_data when present
|
4 years ago |
Haelwenn (lanodan) Monnier
|
3a0f99ed35
|
KeywordPolicy: Still match when fields are absent
|
4 years ago |
Haelwenn
|
beefc022dd
|
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
|
4 years ago |
feld
|
608824b97e
|
Merge branch 'instance-docs' into 'develop'
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
|
4 years ago |
rinpatch
|
6bbd65fb09
|
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
[#2130] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
|
4 years ago |