479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
36c125a071
Pipeline Ingestion: Event
4 years ago
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
4 years ago
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
4 years ago
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
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
f889400d05
Questions: Move fixes to validators.
4 years ago
70522989d9
Apply 1 suggestion(s) to 1 file(s)
4 years ago
f341a8e142
Update filter_view.ex to return whole_word actual value
4 years ago
878c7f3f30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
4 years ago
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
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
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
d9bf2c58df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
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
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
4 years ago
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
6100b90209
Merge branch '1976-status-view-fixes' into 'develop'
...
StatusView: Handle badly formatted emoji reactions.
Closes #1976
See merge request pleroma/pleroma!2788
4 years ago
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
4 years ago
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
4 years ago
bdb3375933
Allow unblocking a domain via query params
4 years ago
bdf57b8ef4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
4 years ago
20a496d2cb
Expose the post formats in /api/v1/instance
4 years ago
9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
173f69c854
question_validator: fix for mastodon poll expiration
...
Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380
which runs Mastodon 3.1.4 (SDF runs 3.1.2)
4 years ago
4644a8bd10
Fix multiple-choice poll detection
4 years ago
51ab8d0128
Add `account_approval_required` instance setting
4 years ago
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
...
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
4 years ago
f4469dc741
Merge branch 'features/favicons' into 'develop'
...
Add support for remote favicons
See merge request pleroma/pleroma!2261
4 years ago
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
4 years ago
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
4 years ago
6335b32aa8
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
...
[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
4 years ago
a6495f4a68
[ #1895 ] credo fix.
4 years ago
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
4 years ago
3f8370a285
[ #1895 ] Applied code review suggestion.
4 years ago
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
013e2c5057
Use instances table instead of Cachex
4 years ago
6a679d80c9
Move get_favicon to Pleroma.Instances, use /
4 years ago
f6d09fafee
Add support for remote favicons
4 years ago
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
59cf78e412
AccountController: Allow removal / reset of user images.
4 years ago
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Mark Felder