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
rinpatch
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
rinpatch
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-02 09:38:43 +00:00
Alexander Strizhakov
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
Ivan Tashkinov
6ce28c4091
[ #2497 ] Fix for png media proxy preview response headers (content-type & content-disposition).
2020-09-01 21:21:58 +03:00
Alexander Strizhakov
03d06062ab
don't fail on url fetch
2020-09-01 19:39:07 +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
Haelwenn (lanodan) Monnier
b960cede9a
common_fixes: Force inserting context and context_id
2020-09-01 08:35:00 +02:00
Haelwenn (lanodan) Monnier
a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question
2020-09-01 08:34:57 +02:00
Haelwenn (lanodan) Monnier
2ecc7d9230
transmogrifier: Remove mastodon emoji-format from emoji field
2020-09-01 08:29:53 +02:00
Haelwenn
9d63b2c9db
Merge branch 'chat-relation-constraints' into 'develop'
...
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
2020-08-31 20:55:05 +00:00
lain
0b621a834a
Chats: Add cascading delete on both referenced users.
...
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
2020-08-31 16:48:17 +02:00
Ivan Tashkinov
0a839d51a7
[ #2497 ] Added Cache-Control response header for media proxy preview endpoint.
2020-08-31 13:08:50 +03:00
lain
d91c4feebe
Notification: Small refactor.
2020-08-31 11:02:54 +02:00
Mark Felder
3737f38432
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-30 11:28:45 -05:00
Mark Felder
2d2af75777
Support PNG previews to preserve alpha channels
2020-08-30 09:17:24 -05:00
Maksim Pechnikov
f0fefc4f5c
marks notifications as read after mute
2020-08-28 18:17:44 +03:00
Mark Felder
5b4d483f52
Add a note about the avatars and banners situation
2020-08-27 17:28:21 -05:00
Mark Felder
67c79394e8
Support static avatars and header images with Mediaproxy Preview
2020-08-27 17:15:23 -05:00
Mark Felder
ef9d12fcc5
Attempt at supporting video thumbnails via ffmpeg
2020-08-27 12:31:55 -05:00
Haelwenn
6b01a09a08
Merge branch '2078-list-fixes' into 'develop'
...
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
2020-08-27 17:05:53 +00:00
Mark Felder
157ecf4022
Follow redirects.
...
I think we should be using some global adapter options here, though.
2020-08-27 11:46:56 -05:00
lain
78939c1d16
ChatController: Don't die if the recipient is gone.
2020-08-27 12:13:18 +02:00
Mark Felder
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-26 16:37:57 -05:00
Mark Felder
eead2276e7
Ensure GIFs are redirected to the original or they become static.
2020-08-26 16:18:11 -05:00
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02:00
Mark Felder
ddbddc08fc
Redirects for videos right now
2020-08-25 17:31:55 -05:00
Mark Felder
899ea2da3e
Switch to imagemagick, only support videos
2020-08-25 17:18:22 -05:00
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
2020-08-25 21:32:32 +00:00
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
lain
112bec5225
Webfinger: Handle bogus ids better.
2020-08-25 17:35:59 +02:00
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
2020-08-24 17:03:18 +00:00
Mark Felder
98f8851f29
Use the image thumbnail for rich metadata (OGP/Twittercards)
2020-08-22 15:12:11 -05:00
Maksim Pechnikov
0922791e4d
updated errors on add emoji
2020-08-22 10:56:26 +03:00
Maksim Pechnikov
f5845ff033
upload emoji zip file
2020-08-22 10:42:02 +03:00
Mark Felder
4e6eb22b4a
Try to warm the cache with the preview image if preview proxy enabled
2020-08-21 12:19:35 -05:00
lain
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
...
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
2020-08-21 16:10:30 +00:00
Alexander Strizhakov
1f8c32b773
adding actor type in user show
2020-08-21 10:38:56 +03:00
Ivan Tashkinov
aa0a5ffb48
[ #2497 ] Media preview proxy: added quality config setting, adjusted width/height defaults.
2020-08-21 08:59:08 +03:00
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event
2020-08-20 21:49:26 +02:00
Ivan Tashkinov
02ad1cd8e9
[ #2497 ] Media preview proxy: added Content-Disposition header with filename to response.
2020-08-20 09:58:50 +03:00
Ivan Tashkinov
4ee15e991e
[ #2497 ] Media preview proxy config refactoring & documentation.
2020-08-19 21:36:26 +03:00
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
Maksim Pechnikov
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
2020-08-19 06:50:20 +03:00
Haelwenn (lanodan) Monnier
5316e231b0
Pipeline Ingestion: Audio (Part 2)
2020-08-19 00:06:31 +02:00
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
Ivan Tashkinov
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-18 18:02:09 +03:00
lain
3998ef9d64
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
2020-08-18 13:31:42 +02:00
lain
548ca43bcf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
2020-08-18 12:38:13 +02:00
Haelwenn (lanodan) Monnier
2f8c3c842d
common_fixes: Remove Utils.make_date call
2020-08-18 02:24:48 +02:00
Haelwenn (lanodan) Monnier
c9d6638461
common_fixes: Get fixes common from Audio and Question
2020-08-18 02:24:48 +02:00
Haelwenn (lanodan) Monnier
2bc08d5573
Pipeline Ingestion: Audio
2020-08-18 02:02:34 +02:00
Haelwenn (lanodan) Monnier
7a273087ed
object_validators: Use ecto_types where available
2020-08-17 23:47:00 +02:00
lain
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
2020-08-17 13:05:20 +00:00
Sergey Suprunenko
25c69e271a
Make notifications about new statuses from muted threads read
2020-08-17 00:11:33 +02:00
Maksim Pechnikov
f6da12f45d
fix search media proxy urls
2020-08-16 06:54:48 +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
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
Haelwenn (lanodan) Monnier
4f3c955f26
side_effects: Fix typo on notification
2020-08-13 18:10:43 +02:00
Maksim Pechnikov
56470647de
Merge branch 'develop' into issue/1936
2020-08-13 09:00:25 +03:00
lain
2e347e8286
ActivityPub: Remove reject, move everything to the Pipeline.
2020-08-12 15:07:46 +02:00
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
2020-08-12 14:48:51 +02:00
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
2020-08-12 12:53:04 +02:00
lain
500576dcb6
Linting fixes.
2020-08-11 19:22:14 +02:00
lain
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 17:49:24 +02:00
lain
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
2020-08-11 17:43:16 +02:00
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
2020-08-11 17:26:01 +02:00
lain
3f6d50111e
Linter fixes.
2020-08-11 16:07:42 +02:00
lain
da3f9b9988
Transmogrifier: Remove handling of orphaned accepts
...
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
2020-08-11 15:41:19 +02:00
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
2020-08-11 15:32:52 +02:00
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
2020-08-11 15:13:07 +02: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
8f9fbc86c0
Transmogrifier: Small readability changes.
2020-08-11 14:02:09 +02:00
lain
686002164a
Merge branch '204-fix' into 'develop'
...
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
2020-08-11 09:18:56 +00:00
lain
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 10:55:10 +02:00
lain
7e4932362b
SideEffects: Handle strange deletion case.
2020-08-11 10:54:38 +02:00
Maksim Pechnikov
345ac512e4
added paginate+search for admin/MediaProxy URLs
2020-08-11 10:30:13 +03:00
lain
11fc90744c
Transmogrifier: Remove duplicate code.
2020-08-10 15:31:36 +02:00
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
Mark Felder
474147a67a
Make a new function instead of overloading register_changeset/3
2020-08-07 14:54:14 -05:00
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05: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
lain
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-06 15:22:20 +02: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
Mark Felder
81126b0142
Add email to user account only if it exists in LDAP
2020-08-05 11:36:12 -05:00
lain
9d7ce1a6d0
CommonValidations: More refactors.
2020-08-05 17:56:12 +02:00
lain
3655175639
CommonValidations: Refactor same_domain?
2020-08-05 17:36:27 +02:00
lain
9c96fc052a
CommonValidations: Extract modification right checker
2020-08-05 17:26:53 +02:00
Mark Felder
2192d1e492
Permit LDAP users to register without capturing their password hash
...
We don't need it, and local auth fallback has been removed.
2020-08-05 10:07:31 -05:00
Mark Felder
0f9aecbca4
Remove fallback to local database when LDAP is unavailable.
...
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
2020-08-05 08:18:16 -05:00
Mark Felder
f7146583e5
Remove LDAP mail attribute as a requirement for registering an account
2020-08-05 08:15:57 -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
lain
00c4c6a382
CommonValidations: Remove superfluous function
...
The `is_active` functionality was integrated into the presence
checker.
2020-08-05 12:24:34 +02:00
lain
19c108170e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-05 11:12:14 +02: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
878c7f3f30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-04 15:28:41 +02:00
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
Haelwenn (lanodan) Monnier
0f088d8ce3
question_validator: Allow content to be an empty-string (blank)
2020-08-04 14:29:16 +02: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
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
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
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
2020-07-29 16:24:22 +02: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
66974e17a0
Endpoint: Serve a dynamically configured admin interface
2020-07-29 13:03:04 +02: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
lain
76aa49a0c5
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
...
[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
2020-07-23 12:52:02 +00:00
Ivan Tashkinov
9ea51a6de5
[ #2791 ] AccountView: renamed :force option to :skip_visibility_check.
2020-07-23 15:08:30 +03:00
lain
b2ba70eec4
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
...
Fix #783 : Make MRF reject log as info level instead of error
Closes #783
See merge request pleroma/pleroma!2758
2020-07-23 11:08:29 +00:00
lain
250e0369c7
Merge branch 'issue/1878' into 'develop'
...
[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
2020-07-23 10:56:33 +00:00
lain
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00
Ivan Tashkinov
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.
2020-07-22 19:06:00 +03:00
lain
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
2020-07-22 15:09:32 +00:00
Lain Soykaf
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
2020-07-22 14:44:06 +02:00
Mark Felder
341a8f3500
Skip the correct plug
2020-07-21 17:26:59 -05:00
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
Mark Felder
97c60b6a43
Merge branch 'develop' into fix/pleroma-api-emoji-packs
2020-07-21 16:25:45 -05:00
lain
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
2020-07-21 19:35:43 +00:00
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
2020-07-21 16:06:46 +04:00
Ivan Tashkinov
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
2020-07-19 20:05:37 +03:00
KokaKiwi
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
2020-07-18 12:55:04 +02:00
Haelwenn
10d46235cf
Merge branch 'fix-1958' into 'develop'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
2020-07-17 18:54:30 +00:00
Alex Gleason
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
2020-07-17 12:35:28 -05:00
Mark Felder
20a496d2cb
Expose the post formats in /api/v1/instance
2020-07-17 10:45:41 -05:00
Mark Felder
62438530e2
TOTP length is configurable, so we can't hardcode this here.
2020-07-17 08:19:49 -05:00
Alex Gleason
5e74556703
Sanitize reason param in POST /api/v1/accounts
2020-07-16 20:25:53 -05:00
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
Mark Felder
3be64556db
Improve TOTP token and recovery input fields in OAuth login
2020-07-16 13:11:03 -05:00
Alex Gleason
9ce95fa68f
Use approval_required in /api/v1/instance
2020-07-15 17:04:30 -05:00
Mark Felder
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
rinpatch
0fe36b311c
Merge branch 'features/mrf-reasons' into 'develop'
...
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
2020-07-15 14:00:22 +00:00
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
2020-07-15 15:25:33 +02:00
Haelwenn (lanodan) Monnier
e4beff90f5
Create Question: Add context field to create
2020-07-15 12:32:43 +02:00
Haelwenn (lanodan) Monnier
bfe2dafd39
{Answer,Question}Validator: Keep both actor and attributedTo for now but sync them
2020-07-15 12:32:42 +02:00
Haelwenn (lanodan) Monnier
c19bdc811e
Fix attachments in polls
2020-07-15 12:32:42 +02:00
Haelwenn (lanodan) Monnier
d713930ea7
Fixup for EctoType module move
2020-07-15 11:40:24 +02:00
Haelwenn (lanodan) Monnier
435a65b976
QuestionValidator: Use AttachmentValidator
2020-07-15 11:40:24 +02:00
Haelwenn (lanodan) Monnier
fe6924d00d
CreateGenericValidator: add expires_at
2020-07-15 11:40:24 +02:00
Haelwenn (lanodan) Monnier
82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
2020-07-15 11:40:23 +02:00
Haelwenn (lanodan) Monnier
4f70fd4105
question_validator: remove conversation field
2020-07-15 11:39:56 +02:00
Haelwenn (lanodan) Monnier
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)
2020-07-15 11:39:56 +02:00
Haelwenn (lanodan) Monnier
47ba796f41
create_question_validator: remove validate_recipients_match
2020-07-15 11:39:55 +02:00
Haelwenn (lanodan) Monnier
4644a8bd10
Fix multiple-choice poll detection
2020-07-15 11:39:55 +02:00
Haelwenn (lanodan) Monnier
10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
2020-07-15 11:39:54 +02:00
Haelwenn (lanodan) Monnier
89a2433154
QuestionOptionsValidator: inline schema for replies
2020-07-15 11:39:54 +02:00
Haelwenn (lanodan) Monnier
c5efaf6b00
AnswerValidator: Create
2020-07-15 11:39:54 +02:00
Haelwenn (lanodan) Monnier
7bcd7a9595
QuestionValidator: Create
2020-07-15 11:39:53 +02:00
Alex Gleason
0d004a9d04
Email admins when a new unapproved account is up for review
2020-07-14 20:31:20 -05:00
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
Alex Gleason
20d24741af
AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint
2020-07-14 18:02:44 -05:00
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by need_approval
2020-07-14 14:29:03 -05:00
