7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
2020-09-17 14:09:01 +00:00
c711a2b157
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
2020-09-17 16:55:53 +03:00
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
5e3c70afa5
AdminAPI Chat tests: Remove factory.
...
The factory system doesn't work too well with how the chats are
done. Instead of tempting people to use it, let's rather use the
CommonAPI system for now.
2020-09-17 13:37:25 +02:00
e39ff2616b
Admin chat api tests: Small additions.
2020-09-17 13:29:26 +02:00
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
2020-09-17 13:26:04 +02:00
b867f9d7ae
Merge branch 'develop' into issue/2099
2020-09-17 08:41:35 +03:00
73e0e6a8a2
Remove unused import
2020-09-16 10:56:42 -05:00
7a88b726bf
User: Remote users don't need to be confirmed or approved
2020-09-16 17:29:16 +02:00
eca8d26784
Merge branch 'chores/mrf-loglevel' into 'develop'
...
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
2020-09-16 13:37:04 +00:00
adbd0032fa
Merge branch 'features/validators-video' into 'develop'
...
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
2020-09-16 13:36:27 +00:00
6b088ed76a
Merge branch 'issue/2089' into 'develop'
...
[#2089 ] fix notifications
See merge request pleroma/pleroma!3000
2020-09-16 12:22:48 +00:00
599f8bb152
RepoStreamer.chunk_stream -> Repo.chunk_stream
2020-09-16 09:47:18 +03:00
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-15 20:29:39 +03:00
f879d07fa1
fixed tests
2020-09-15 15:32:49 +03:00
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
2020-09-15 13:00:56 +03:00
5c4ff5c73c
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
2020-09-15 08:25:10 +00:00
f900a40d5d
fix credo warning
2020-09-14 13:55:49 -04:00
38b2db297b
search indexing metadata respects discoverable flag
2020-09-14 13:18:11 -04:00
d31f0393bf
Validate Welcome Chat message works with Simple policy applied to local instance
2020-09-14 12:06:08 -05:00
738685a629
Apply 1 suggestion(s) to 1 file(s)
2020-09-14 11:56:00 +00:00
f70335002d
RichMedia: Do a HEAD request to check content type/length
...
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
2020-09-14 14:45:58 +03:00
c4061f06ba
Merge branch 'chat-moderation-stable' into chat-moderation
2020-09-11 14:30:28 -05:00
bc86d0a906
Chat moderation: fix formatting
2020-09-11 14:29:56 -05:00
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
dfb831ca39
Chat moderation: add tests for unauthorized access
2020-09-11 14:11:07 -05:00
e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
2020-09-11 14:11:00 -05:00
67726453f8
Credo fix
2020-09-11 14:10:52 -05:00
02d70228b5
AdminAPI: fix delete chat message
2020-09-11 14:10:35 -05:00
9dd0b23da4
AdminAPI: show chat
2020-09-11 14:10:28 -05:00
f13b52a703
AdminAPI: list messages in a chat
2020-09-11 14:10:19 -05:00
fb0de07343
AdminAPI: list chats for a user
2020-09-11 14:10:05 -05:00
b40a627ab0
AdminAPI: delete a chat message
2020-09-11 14:09:58 -05:00
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
2020-09-11 14:09:50 -05:00
f1f44069ae
Fetcher: Correctly return MRF reject reason
2020-09-11 20:00:41 +02:00
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
dbc013f24c
instance: Handle not getting a favicon
2020-09-11 11:37:46 +02:00
1b3d5956b1
Pipeline Ingestion: Article
2020-09-11 01:40:20 +02:00
846b59ccb0
Pipeline Ingestion: Video
2020-09-11 01:39:39 +02:00
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
eb5ff715f7
pin/unpin for activities with expires_at option
2020-09-10 21:50:41 +03:00
93e1c8df9d
reject activity creation
...
if passed expires_at option and expiring activities are not configured
2020-09-10 21:50:41 +03:00
de4c935071
don't expire pinned posts
2020-09-10 21:50:41 +03:00
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
0254696e30
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'
...
Feature/1790 removing expired tokens through Oban scheduled jobs
See merge request pleroma/pleroma!2957
2020-09-10 18:45:04 +00:00
541a3eede2
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
...
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
2020-09-10 18:41:00 +00:00
275602daa7
Streaming integration tests: remove unexpected error assumption
...
For some reason instead of fixing unexpected errors, we made tests
assert they indeed trigger... Now that the errors are fixed these were
failing
2020-09-10 21:28:47 +03:00
7dd986a563
expire mfa tokens through Oban
2020-09-10 16:01:19 +03:00
3ce658b930
schedule expired oauth tokens deletion with Oban
2020-09-10 16:01:19 +03:00
9853c90abb
added paginate links to headers for /chats/:id/messages
2020-09-10 12:39:29 +03:00
68a74d6659
[ #2497 ] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_.
2020-09-09 19:30:42 +03:00
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
2020-09-09 11:11:36 -05:00
b900c06d4e
Add tests for the bulk confirm/unconfirm tasks
2020-09-09 09:02:07 -05:00
6c79a60649
Add test for pleroma.user set --confirmed
...
Order now matters because of testing shell_info
2020-09-09 08:44:01 -05:00
0d2814ec8e
Metadata: Move restriction check from Feed provider to activated_providers
2020-09-08 20:21:34 +03:00
a85ed6defb
Do not serve RSS/Atom feeds when instance is private
2020-09-08 20:21:34 +03:00
44ced17634
Fix test so setting doesn't leak
2020-09-08 20:21:34 +03:00
ff07014b26
Disable providers of user and status metadata when instance is private
2020-09-08 20:21:34 +03:00
10ef532c63
AP C2S: Restrict character limit on Note
2020-09-08 20:21:34 +03:00
073f5490ec
Merge branch 'bugfix/mock' into 'develop'
...
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
2020-09-08 19:46:23 +03:00
7490b76bbf
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
2020-09-08 19:45:44 +03:00
921f926e96
Remove OStatus in testsuite
2020-09-08 18:43:57 +02:00
ee0e05f930
Drop unused "inReplyToAtomUri" in objects
2020-09-08 18:43:57 +02:00
fd7e9bdd25
don't run async tests, which use Mock
2020-09-08 17:40:23 +02:00
bf048ab72f
Merge branch 'develop' into 'develop'
...
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
2020-09-08 14:52:51 +00:00
f6723dc9bd
account_view_test: Remove empty test
2020-09-08 16:33:22 +02:00
788dececff
test: remove extraneous :instances_favicons config bits
2020-09-08 16:32:54 +02:00
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
2020-09-08 09:31:26 -05:00
0a05670b44
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
2020-09-08 12:21:33 +00:00
ce3474f4d3
Disable favicon scraping in tests
2020-09-08 15:09:10 +03:00
9b85592b8b
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-08 13:56:42 +03:00
964bc8e2e8
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-08 13:55:52 +03:00
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
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-08 13:53:16 +03:00
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
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-08 13:00:15 +03:00
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
84acfab156
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-08 12:53:02 +03:00
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
2020-09-08 12:51:38 +03:00
4ea07f74e9
Revert/simplify.
...
We only need to check the content-type. There's no chance a webp file
will get mismatched as another image type.
2020-09-08 12:29:38 +03:00
216c84a8f4
Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.
2020-09-08 12:29:38 +03:00
3a98960c26
Verify webp files are not processed with exiftool
2020-09-08 12:29:38 +03:00
2165a24974
Improve upload filter return values so we can identify when filters make no changes to the input
2020-09-08 12:29:38 +03:00
d074e54013
ForceBotUnlistedPolicy: try to fix test 2
2020-09-07 23:28:29 +02:00
0a25c92cfa
ForceBotUnlistedPolicy: try to fix test
2020-09-07 23:18:36 +02:00
d2fd1d3481
ForceBotUnlistedPolicy: fix test extension
2020-09-07 23:04:07 +02:00
8b695c3eeb
ForceBotUnlistedPolicy: format
2020-09-07 22:53:45 +02:00
57cf0cc3b3
ForceBotUnlistedPolicy: add test
2020-09-07 22:50:57 +02:00
18d21aed00
deprecation warnings
2020-09-07 19:59:17 +03:00
696bf09433
passing adapter options directly without adapter key
2020-09-07 19:59:17 +03:00
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
d5c286b802
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-07 11:12:30 +00:00
fdab01ab56
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-07 10:19:19 +00:00
08aef7dd4e
instance: Log catch favicon errors as warnings
2020-09-07 08:40:52 +02:00
917d325972
added api spec
2020-09-07 07:17:30 +03:00
5ae56aafb2
added import mutes
2020-09-06 21:42:51 +03:00
759f8bc3ae
[ #2497 ] Fixed MediaProxyWarmingPolicyTest.
2020-09-06 15:30:11 +03:00
170599c390
RichMedia: do not log webpages missing metadata as errors
...
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
2020-09-05 22:05:35 +03:00
e198ba492e
Rich Media: Do not cache URLs for preview statuses
...
Closes #1987
2020-09-05 20:53:46 +03:00
c3b02341bf
[ #2497 ] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
2020-09-05 16:16:35 +03:00
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
9433311923
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
...
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
2020-09-03 11:50:30 +00:00
5da3677607
Frontend mix task: Add tests.
2020-09-03 11:40:17 +02:00
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
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
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
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
b2d776d77d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-02 09:36:56 +00:00
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
868057871a
search: fix 'following' query parameter
...
The parameter included the accounts that are following you (followers)
instead of those you are actually following.
Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2020-09-02 02:08:43 +02:00
03d06062ab
don't fail on url fetch
2020-09-01 19:39:07 +03:00
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
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
a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question
2020-09-01 08:34:57 +02:00
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
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
3737f38432
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-30 11:28:45 -05:00
f0fefc4f5c
marks notifications as read after mute
2020-08-28 18:17:44 +03:00
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
78939c1d16
ChatController: Don't die if the recipient is gone.
2020-08-27 12:13:18 +02:00
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-26 16:37:57 -05:00
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02: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
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
112bec5225
Webfinger: Handle bogus ids better.
2020-08-25 17:35:59 +02:00
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
14ec12ac95
added tests
2020-08-24 15:01:45 +03:00
f5845ff033
upload emoji zip file
2020-08-22 10:42:02 +03:00
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
1f8c32b773
adding actor type in user show
2020-08-21 10:38:56 +03:00
36c125a071
Pipeline Ingestion: Event
2020-08-20 21:49:26 +02:00
c1277be041
AudioHandlingTest: Make mock explicit
2020-08-19 14:36:42 +02:00
9aae342e7a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
2020-08-19 14:10:11 +02:00
c68bcae362
fix for sometimes failing tests
2020-08-19 12:57:29 +03:00
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
2020-08-19 06:50:20 +03:00
5316e231b0
Pipeline Ingestion: Audio (Part 2)
2020-08-19 00:06:31 +02:00
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
2020-08-18 19:02:33 +00:00
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-18 18:02:09 +03:00
f0a8d723bb
Transmogrifier Test: Extract audio tests.
2020-08-18 13:37:28 +02:00
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
2020-08-18 13:21:30 +02:00
a0f5eb1a55
Test that `POST /api/pleroma/delete_account` purges the user
2020-08-18 00:24:28 -05:00
dcc8926ff1
Test purging a user with User.delete/1
2020-08-18 00:10:09 -05:00
c12c576ee2
Also purge bio and display name
2020-08-17 22:11:45 -05:00
d55faa2f8f
Purge a local user upon deletion, fixes #2062
2020-08-17 21:52:28 -05:00
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
25c69e271a
Make notifications about new statuses from muted threads read
2020-08-17 00:11:33 +02:00
f6da12f45d
fix search media proxy urls
2020-08-16 06:54:48 +03:00
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
2020-08-15 18:30:20 +03:00
0865f36965
Mark notifications about statuses from muted users as read automatically
2020-08-15 15:27:41 +02:00
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
f99b8a25eb
Merge branch 'reject' into 'develop'
...
Move Accepts and Rejects to the Pipeline
See merge request pleroma/pleroma!2878
2020-08-13 16:04:43 +00:00
5be25b3e38
Merge branch '1152-deletion' into 'develop'
...
User deletion issue exploration
See merge request pleroma/pleroma!2879
2020-08-13 09:06:33 +00:00
56470647de
Merge branch 'develop' into issue/1936
2020-08-13 09:00:25 +03:00
3ab83f837e
don't load pinned activities in due_expirations
2020-08-12 19:46:47 +03:00
dfc56de167
Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
...
Update :welcome settings in description.exs
Closes #2024
See merge request pleroma/pleroma!2843
2020-08-12 16:18:40 +00:00
05ff666f99
AdminApiControllerTest: Add test that `deleted` users get deactivated.
2020-08-12 16:31:00 +02:00
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
2020-08-12 14:48:51 +02:00
62f7cca9a1
Transmogrifier Tests: Extract rejections.
2020-08-12 13:39:54 +02:00
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
2020-08-12 12:53:04 +02:00
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 17:49:24 +02:00
f988d82e46
Transmogrifier: Handle accepts with the pipeline
2020-08-11 17:26:01 +02:00
9dda13bfa1
Transmogrifier Test: Remove mastodon hack test.
2020-08-11 16:22:15 +02:00
3f6d50111e
Linter fixes.
2020-08-11 16:07:42 +02:00
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
8b1e8bec2f
AcceptValidation: Codify accept rules.
2020-08-11 15:32:52 +02:00
f1a0c10b17
AcceptValidator: Add basic validator with tests.
2020-08-11 15:13:07 +02:00
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
8f9fbc86c0
Transmogrifier: Small readability changes.
2020-08-11 14:02:09 +02:00
54a6855ddf
Transmogrifier Tests: Extract Accept handling
2020-08-11 14:01:45 +02:00
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
9a9121805c
Apply 1 suggestion(s) to 1 file(s)
2020-08-11 09:08:27 +00:00
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
7e4932362b
SideEffects: Handle strange deletion case.
2020-08-11 10:54:38 +02:00
345ac512e4
added paginate+search for admin/MediaProxy URLs
2020-08-11 10:30:13 +03:00
78484fe0ef
Merge branch 'admin-active-filter' into 'develop'
...
Admin API: Filter out unapproved users when the `active` filter is on
Closes #2037
See merge request pleroma/pleroma!2872
2020-08-10 17:16:38 +00:00
249f21dcbb
Admin API: Filter out unapproved users when the `active` filter is on
2020-08-10 18:27:39 +04:00
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
2020-08-09 10:53:58 +00:00
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05:00
50d5bdfd31
Mix Task Frontend test: Expand.
2020-08-07 16:03:06 +02:00
7e23a48d38
rel me test: fix HTML so broken browsers (and therefore
...
lexbor) refuse to parse it like mochiweb does
2020-08-07 16:45:33 +03:00
325c7c924b
Make Floki use fast_html
2020-08-07 16:45:33 +03:00
de00a4c0f1
Mix Task Frontend Test: Capture IO.
2020-08-07 15:27:41 +02:00
d97b76104e
Mix Task Frontend: Add tests.
2020-08-07 15:10:34 +02:00
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
8e90cc58e7
Merge branch 'develop' into feature/update-welcome-setting-in-description
2020-08-07 09:48:34 +03:00
6e6276b4f8
added test
2020-08-07 09:47:05 +03:00
56ddf20208
Removed unused alias.
2020-08-07 09:43:49 +03:00
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