Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
2020-10-13 19:26:04 -05:00 |
|
Alexander Strizhakov
|
1d0e130cb3
|
fixes after rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
011525a3d1
|
EnsurePublicOrAuthenticatedPlug module name
|
2020-10-13 16:43:57 +03:00 |
|
Alexander Strizhakov
|
a6d8cef33e
|
OAuthScopesPlug module name
|
2020-10-13 16:43:54 +03:00 |
|
Alexander Strizhakov
|
4b1863ca4e
|
RateLimiter module name
|
2020-10-13 16:43:53 +03:00 |
|
Alex Gleason
|
3f9263fb16
|
Merge remote-tracking branch 'upstream/develop' into restrict-origin
|
2020-10-08 17:24:09 -05:00 |
|
Alex Gleason
|
3104367931
|
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
|
2020-09-22 13:37:02 -05:00 |
|
Alex Gleason
|
23d5d7cf59
|
Fix #2172 HTTP error on password reset
|
2020-09-21 14:09:26 -05:00 |
|
Ivan Tashkinov
|
60b025b782
|
[#2074] OAuth scope checking in Streaming API.
|
2020-09-19 19:16:55 +03:00 |
|
rinpatch
|
608017b7df
|
Merge branch 'fix/streaming-termination-errors' into 'develop'
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
|
2020-09-17 19:50:51 +03:00 |
|
Ivan Tashkinov
|
d9fb5bc08a
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
2020-09-17 17:14:20 +03:00 |
|
Ivan Tashkinov
|
a781f41f96
|
[#2497] Media preview proxy: misc. improvements (static param support, dynamic fifo pipe path), refactoring.
|
2020-09-16 22:30:42 +03:00 |
|
Alex Gleason
|
9733c9d065
|
Merge remote-tracking branch 'upstream/develop' into chat-moderation
|
2020-09-11 14:13:38 -05:00 |
|
Alex Gleason
|
f88dc1937e
|
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
|
2020-09-11 14:09:50 -05:00 |
|
Ivan Tashkinov
|
0bda85857e
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
|
2020-09-11 17:19:58 +03:00 |
|
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
2020-09-10 21:50:40 +03:00 |
|
rinpatch
|
01fa68fe45
|
Websocket handler: fix never matching code on failed auth
`:cowboy_req.reply` does not return tuples since 2.0, see
https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
|
2020-09-10 21:26:52 +03:00 |
|
rinpatch
|
e16e8f9816
|
Websocket handler: do not raise if handler is terminated before switching protocols
Closes #2131
|
2020-09-10 21:14:23 +03:00 |
|
rinpatch
|
cb06e98da2
|
websocket handler: Do not log client ping frames as errors
|
2020-09-10 21:14:23 +03:00 |
|
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
|
2020-09-08 13:53:47 +03:00 |
|
rinpatch
|
ea4b6c64d6
|
Merge branch 'feat/rich-media-improvements' into 'develop'
Rich media improvements
See merge request pleroma/pleroma!2944
|
2020-09-08 13:00:49 +03:00 |
|
Ivan Tashkinov
|
60c925380d
|
[#2497] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).
|
2020-09-03 20:13:29 +03:00 |
|
Mark Felder
|
85446cc30c
|
Merge branch 'develop' into media-preview-proxy
|
2020-09-03 10:34:06 -05:00 |
|
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
|
2020-09-02 17:11:24 +00:00 |
|
lain
|
119e11f455
|
Merge branch 'bugfix/mastoapi-lists' into 'develop'
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
|
2020-09-02 17:03:45 +00:00 |
|
lain
|
581f382e71
|
ListController: DRY up stuff.
|
2020-09-02 18:32:00 +02:00 |
|
Mark Felder
|
cbf7f0e029
|
Disallow password resets for deactivated accounts.
Ensure all responses to password reset events are identical.
|
2020-09-02 09:09:13 -05:00 |
|
rinpatch
|
d48fc90978
|
StatusView: Start fetching rich media cards as soon as possible
|
2020-09-02 16:45:54 +03:00 |
|
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
|
2020-09-01 12:49:32 +02:00 |
|
rinpatch
|
126461942b
|
User table: ensure bio is always a string
Gets rid of '|| ""' in multiple places and fixes #2067
|
2020-09-01 10:45:42 +03:00 |
|
Mark Felder
|
3737f38432
|
Merge branch 'develop' into feld-2168-media-preview-proxy
|
2020-08-30 11:28:45 -05:00 |
|
Mark Felder
|
67c79394e8
|
Support static avatars and header images with Mediaproxy Preview
|
2020-08-27 17:15:23 -05:00 |
|
lain
|
cfc99fe05c
|
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
|
2020-08-26 15:37:30 +02:00 |
|
Mark Felder
|
479578b148
|
Merge branch 'develop' into feld-2168-media-preview-proxy
|
2020-08-25 11:57:23 -05:00 |
|
Haelwenn (lanodan) Monnier
|
36c125a071
|
Pipeline Ingestion: Event
|
2020-08-20 21:49:26 +02:00 |
|
Ivan Tashkinov
|
27e7999a15
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
|
2020-08-18 18:02:09 +03:00 |
|
Ivan Tashkinov
|
95529ab709
|
[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
|
2020-08-14 20:55:45 +03:00 |
|
Ivan Tashkinov
|
2def3cbf41
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# mix.lock
|
2020-08-11 15:13:29 +03:00 |
|
lain
|
66122a11b5
|
AccountController: Build the correct update activity.
Will fix federation issues.
|
2020-08-10 10:33:05 +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 |
|
Ivan Tashkinov
|
1298a2ea2c
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
|
2020-08-07 09:38:05 +03:00 |
|
Alex Gleason
|
cc196e2cd5
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
2020-08-05 13:08:31 -05:00 |
|
lain
|
f889400d05
|
Questions: Move fixes to validators.
|
2020-08-05 14:51:33 +02:00 |
|
lain
|
70522989d9
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-08-05 11:14:58 +00:00 |
|
MK Fain
|
f341a8e142
|
Update filter_view.ex to return whole_word actual value
|
2020-08-05 02:01:27 +00:00 |
|
lain
|
878c7f3f30
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
2020-08-04 15:28:41 +02:00 |
|
Haelwenn (lanodan) Monnier
|
ac2598307d
|
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
|
2020-07-31 13:57:21 +02: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 |
|
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 |
|