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 |
|
Ivan Tashkinov
|
135ae4e35a
|
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
|
2020-08-06 16:00:00 +03:00 |
|
lain
|
10b0e55acf
|
Merge branch 'whole-word-filter-hotfix' into 'develop'
Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851
|
2020-08-06 08:35:39 +00:00 |
|
MK Fain
|
f341a8e142
|
Update filter_view.ex to return whole_word actual value
|
2020-08-05 02:01:27 +00:00 |
|
Karol Kosek
|
577b11167c
|
templates/layout/app.html.eex: fix link color
|
2020-08-05 00:01:30 +02: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 |
|
rinpatch
|
fede37e4c6
|
Merge branch 'chore/consolidate-rich-media-http' into 'develop'
Consolidate construction of Rich Media Parser HTTP requests
See merge request pleroma/pleroma!2827
|
2020-08-04 19:16:38 +00:00 |
|
Egor Kislitsyn
|
91fbb5b21f
|
Fix ActivityExpirationPolicy
|
2020-08-04 18:26:37 +04:00 |
|
lain
|
1a00713744
|
CommonValidations: Treat deactivated users as not present.
|
2020-08-04 14:17:03 +02:00 |
|
Mark Felder
|
016d8d6c56
|
Consolidate construction of Rich Media Parser HTTP requests
|
2020-08-03 12:37:31 -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
|
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
|
a3c37379e9
|
ChatMessage schema: Add preview cards.
|
2020-07-30 19:57:45 +02:00 |
|
lain
|
781b270863
|
ChatMessageReferenceView: Display preview cards.
|
2020-07-30 19:57:26 +02: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
|
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 |
|
Alex Gleason
|
2a99e7df8e
|
SimpleMRF silence: optimize, work okay with nil values in addressing
|
2020-07-28 20:32:58 -05: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 |
|
lain
|
ad5c42628a
|
FrontendStatic: Add plug to serve frontends based on configuration.
|
2020-07-28 17:35:16 +02:00 |
|
lain
|
e5ac9534aa
|
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
masto_fe_view: Remove @default_settings
See merge request pleroma/pleroma!2799
|
2020-07-28 07:41:44 +00:00 |
|
Alex Gleason
|
f688c8df82
|
Fix User.registration_reason HTML sanitizing issues
|
2020-07-27 20:36:31 -05:00 |
|
lain
|
e1a1c8e7de
|
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
|
2020-07-27 16:35:47 +00:00 |
|
Haelwenn (lanodan) Monnier
|
4a6389316d
|
masto_fe_view: Remove @default_settings
|
2020-07-27 17:59:13 +02:00 |
|
lain
|
9e6f4694dd
|
Pipeline: Unify embedded_object / object_data, move to validator.
|
2020-07-27 16:39:50 +02:00 |
|
lain
|
762c9ea564
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
|
2020-07-27 16:19:45 +02:00 |
|
Alex Gleason
|
6931dbfa58
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
2020-07-26 15:46:14 -05:00 |
|
|
|
6107440ea0
|
OpenAPI: remove accidentally pasted buffer data
|
2020-07-26 13:59:46 +00:00 |
|
|
|
b31844d6e0
|
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
|
2020-07-26 13:54:56 +00: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 |
|
|
|
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 |
|
Haelwenn
|
6100b90209
|
Merge branch '1976-status-view-fixes' into 'develop'
StatusView: Handle badly formatted emoji reactions.
Closes #1976
See merge request pleroma/pleroma!2788
|
2020-07-23 16:58:36 +00:00 |
|
