Mark Felder
73e0e6a8a2
Remove unused import
4 years ago
lain
7a88b726bf
User: Remote users don't need to be confirmed or approved
4 years ago
rinpatch
eca8d26784
Merge branch 'chores/mrf-loglevel' into 'develop'
...
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
4 years ago
rinpatch
adbd0032fa
Merge branch 'features/validators-video' into 'develop'
...
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
4 years ago
lain
6b088ed76a
Merge branch 'issue/2089' into 'develop'
...
[#2089 ] fix notifications
See merge request pleroma/pleroma!3000
4 years ago
Maksim Pechnikov
599f8bb152
RepoStreamer.chunk_stream -> Repo.chunk_stream
4 years ago
Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
Maksim Pechnikov
f879d07fa1
fixed tests
4 years ago
eugenijm
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
4 years ago
Haelwenn
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
4 years ago
stwf
f900a40d5d
fix credo warning
4 years ago
stwf
38b2db297b
search indexing metadata respects discoverable flag
4 years ago
Mark Felder
d31f0393bf
Validate Welcome Chat message works with Simple policy applied to local instance
4 years ago
rinpatch
738685a629
Apply 1 suggestion(s) to 1 file(s)
4 years ago
rinpatch
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).
4 years ago
Roman Chvanikov
c5830ac037
Merge develop
4 years ago
Alex Gleason
c4061f06ba
Merge branch 'chat-moderation-stable' into chat-moderation
4 years ago
Alex Gleason
bc86d0a906
Chat moderation: fix formatting
4 years ago
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
4 years ago
Alex Gleason
dfb831ca39
Chat moderation: add tests for unauthorized access
4 years ago
Alex Gleason
e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
4 years ago
Alex Gleason
67726453f8
Credo fix
4 years ago
Alex Gleason
02d70228b5
AdminAPI: fix delete chat message
4 years ago
Alex Gleason
9dd0b23da4
AdminAPI: show chat
4 years ago
Alex Gleason
f13b52a703
AdminAPI: list messages in a chat
4 years ago
Alex Gleason
fb0de07343
AdminAPI: list chats for a user
4 years ago
Alex Gleason
b40a627ab0
AdminAPI: delete a chat message
4 years ago
Alex Gleason
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
4 years ago
Haelwenn (lanodan) Monnier
f1f44069ae
Fetcher: Correctly return MRF reject reason
4 years ago
Ivan Tashkinov
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
4 years ago
Haelwenn (lanodan) Monnier
dbc013f24c
instance: Handle not getting a favicon
4 years ago
Haelwenn (lanodan) Monnier
1b3d5956b1
Pipeline Ingestion: Article
4 years ago
Haelwenn (lanodan) Monnier
846b59ccb0
Pipeline Ingestion: Video
4 years ago
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
Alexander Strizhakov
15aece7238
remove validate_expires_at from enqueue method
4 years ago
Alexander Strizhakov
2c2094d4b2
configurable lifetime for ephemeral activities
4 years ago
Alexander Strizhakov
eb5ff715f7
pin/unpin for activities with expires_at option
4 years ago
Alexander Strizhakov
93e1c8df9d
reject activity creation
...
if passed expires_at option and expiring activities are not configured
4 years ago
Alexander Strizhakov
de4c935071
don't expire pinned posts
4 years ago
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
4 years ago
rinpatch
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
4 years ago
rinpatch
541a3eede2
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
...
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
4 years ago
rinpatch
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
4 years ago
Alexander Strizhakov
7dd986a563
expire mfa tokens through Oban
4 years ago
Alexander Strizhakov
3ce658b930
schedule expired oauth tokens deletion with Oban
4 years ago
Maksim Pechnikov
9853c90abb
added paginate links to headers for /chats/:id/messages
4 years ago
Ivan Tashkinov
68a74d6659
[ #2497 ] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_.
4 years ago
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
4 years ago
Mark Felder
b900c06d4e
Add tests for the bulk confirm/unconfirm tasks
4 years ago
Mark Felder
6c79a60649
Add test for pleroma.user set --confirmed
...
Order now matters because of testing shell_info
4 years ago
rinpatch
0d2814ec8e
Metadata: Move restriction check from Feed provider to activated_providers
4 years ago
Mark Felder
a85ed6defb
Do not serve RSS/Atom feeds when instance is private
4 years ago
Mark Felder
44ced17634
Fix test so setting doesn't leak
4 years ago
Mark Felder
ff07014b26
Disable providers of user and status metadata when instance is private
4 years ago
Haelwenn (lanodan) Monnier
10ef532c63
AP C2S: Restrict character limit on Note
4 years ago
Haelwenn
073f5490ec
Merge branch 'bugfix/mock' into 'develop'
...
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
4 years ago
rinpatch
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
4 years ago
Haelwenn (lanodan) Monnier
921f926e96
Remove OStatus in testsuite
4 years ago
Haelwenn (lanodan) Monnier
ee0e05f930
Drop unused "inReplyToAtomUri" in objects
4 years ago
Alexander Strizhakov
fd7e9bdd25
don't run async tests, which use Mock
4 years ago
feld
bf048ab72f
Merge branch 'develop' into 'develop'
...
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
4 years ago
Haelwenn (lanodan) Monnier
f6723dc9bd
account_view_test: Remove empty test
4 years ago
Haelwenn (lanodan) Monnier
788dececff
test: remove extraneous :instances_favicons config bits
4 years ago
Mark Felder
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
4 years ago
rinpatch
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
4 years ago
Roman Chvanikov
880a92ccc7
Merge branch 'develop' into feature/expire-mutes
4 years ago
Roman Chvanikov
e3f845b243
Add expiring mutes for activities
4 years ago
rinpatch
ce3474f4d3
Disable favicon scraping in tests
4 years ago
Roman Chvanikov
f6b250fb8d
Add test for expiring mutes
4 years ago
lain
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
4 years ago
rinpatch
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
4 years ago
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
4 years ago
rinpatch
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
4 years ago
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
4 years ago
rinpatch
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
4 years ago
rinpatch
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
4 years ago
rinpatch
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
4 years ago
rinpatch
84acfab156
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
4 years ago
rinpatch
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
4 years ago
Mark Felder
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.
4 years ago
Mark Felder
216c84a8f4
Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.
4 years ago
Mark Felder
3a98960c26
Verify webp files are not processed with exiftool
4 years ago
Mark Felder
2165a24974
Improve upload filter return values so we can identify when filters make no changes to the input
4 years ago
Alibek Omarov
d074e54013
ForceBotUnlistedPolicy: try to fix test 2
4 years ago
Alibek Omarov
0a25c92cfa
ForceBotUnlistedPolicy: try to fix test
4 years ago
Alibek Omarov
d2fd1d3481
ForceBotUnlistedPolicy: fix test extension
4 years ago
Alibek Omarov
8b695c3eeb
ForceBotUnlistedPolicy: format
4 years ago
Alibek Omarov
57cf0cc3b3
ForceBotUnlistedPolicy: add test
4 years ago
Alexander Strizhakov
18d21aed00
deprecation warnings
4 years ago
Alexander Strizhakov
696bf09433
passing adapter options directly without adapter key
4 years ago
Alexander Strizhakov
ee67c98e55
removing Stats worker from Oban cron jobs
4 years ago
rinpatch
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
4 years ago
lain
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
4 years ago
Haelwenn (lanodan) Monnier
08aef7dd4e
instance: Log catch favicon errors as warnings
4 years ago
Maksim Pechnikov
917d325972
added api spec
4 years ago
Maksim Pechnikov
5ae56aafb2
added import mutes
4 years ago
Ivan Tashkinov
759f8bc3ae
[ #2497 ] Fixed MediaProxyWarmingPolicyTest.
4 years ago
rinpatch
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
4 years ago
rinpatch
e198ba492e
Rich Media: Do not cache URLs for preview statuses
...
Closes #1987
4 years ago
Ivan Tashkinov
c3b02341bf
[ #2497 ] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
4 years ago
Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
4 years ago
lain
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
4 years ago
lain
5da3677607
Frontend mix task: Add tests.
4 years ago
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
4 years ago
lain
119e11f455
Merge branch 'bugfix/mastoapi-lists' into 'develop'
...
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
4 years ago
Mark Felder
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
4 years ago
rinpatch
19691389b9
Rich media: Add failure tracking
4 years ago
rinpatch
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
4 years ago
rinpatch
b2d776d77d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
4 years ago
Alexander Strizhakov
79f65b4374
correct pool and uniform headers format
4 years ago
Karol Kosek
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>
4 years ago
Alexander Strizhakov
03d06062ab
don't fail on url fetch
4 years ago
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
4 years ago
rinpatch
126461942b
User table: ensure bio is always a string
...
Gets rid of '|| ""' in multiple places and fixes #2067
4 years ago
Maksim Pechnikov
0d5088c2b8
remove `unread_conversation_count` from User
4 years ago
Haelwenn (lanodan) Monnier
a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question
4 years ago
Haelwenn
9d63b2c9db
Merge branch 'chat-relation-constraints' into 'develop'
...
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
4 years ago
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.
4 years ago
Mark Felder
3737f38432
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
Maksim Pechnikov
f0fefc4f5c
marks notifications as read after mute
4 years ago
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
4 years ago
lain
78939c1d16
ChatController: Don't die if the recipient is gone.
4 years ago
Mark Felder
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
4 years ago
feld
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
4 years ago
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
lain
112bec5225
Webfinger: Handle bogus ids better.
4 years ago
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
feld
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
4 years ago
Maksim Pechnikov
14ec12ac95
added tests
4 years ago
Maksim Pechnikov
f5845ff033
upload emoji zip file
4 years ago
lain
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
...
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
4 years ago
Alexander Strizhakov
1f8c32b773
adding actor type in user show
4 years ago
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event
4 years ago
lain
c1277be041
AudioHandlingTest: Make mock explicit
4 years ago
lain
9aae342e7a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
4 years ago
Alexander Strizhakov
c68bcae362
fix for sometimes failing tests
4 years ago
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
4 years ago
Maksim Pechnikov
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
4 years ago
Haelwenn (lanodan) Monnier
5316e231b0
Pipeline Ingestion: Audio (Part 2)
4 years ago
Haelwenn
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
4 years ago
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
4 years ago
Ivan Tashkinov
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain
f0a8d723bb
Transmogrifier Test: Extract audio tests.
4 years ago
lain
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
4 years ago
Alex Gleason
a0f5eb1a55
Test that `POST /api/pleroma/delete_account` purges the user
4 years ago
Alex Gleason
dcc8926ff1
Test purging a user with User.delete/1
4 years ago
Alex Gleason
c12c576ee2
Also purge bio and display name
4 years ago
Alex Gleason
d55faa2f8f
Purge a local user upon deletion, fixes #2062
4 years ago
lain
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
4 years ago
Sergey Suprunenko
25c69e271a
Make notifications about new statuses from muted threads read
4 years ago
Maksim Pechnikov
f6da12f45d
fix search media proxy urls
4 years ago
Ivan Tashkinov
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
4 years ago
Sergey Suprunenko
0865f36965
Mark notifications about statuses from muted users as read automatically
4 years ago
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
4 years ago
Haelwenn
f99b8a25eb
Merge branch 'reject' into 'develop'
...
Move Accepts and Rejects to the Pipeline
See merge request pleroma/pleroma!2878
4 years ago
lain
5be25b3e38
Merge branch '1152-deletion' into 'develop'
...
User deletion issue exploration
See merge request pleroma/pleroma!2879
4 years ago
Maksim Pechnikov
56470647de
Merge branch 'develop' into issue/1936
4 years ago
Alexander Strizhakov
3ab83f837e
don't load pinned activities in due_expirations
4 years ago
feld
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
4 years ago
lain
05ff666f99
AdminApiControllerTest: Add test that `deleted` users get deactivated.
4 years ago
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
4 years ago
lain
62f7cca9a1
Transmogrifier Tests: Extract rejections.
4 years ago
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
4 years ago
lain
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
4 years ago
lain
9dda13bfa1
Transmogrifier Test: Remove mastodon hack test.
4 years ago
lain
3f6d50111e
Linter fixes.
4 years ago
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.
4 years ago
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
4 years ago
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
4 years ago
Ivan Tashkinov
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
4 years ago
lain
8f9fbc86c0
Transmogrifier: Small readability changes.
4 years ago
lain
54a6855ddf
Transmogrifier Tests: Extract Accept handling
4 years ago
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
4 years ago
lain
9a9121805c
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain
7e4932362b
SideEffects: Handle strange deletion case.
4 years ago
Maksim Pechnikov
345ac512e4
added paginate+search for admin/MediaProxy URLs
4 years ago
feld
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
4 years ago
Egor Kislitsyn
249f21dcbb
Admin API: Filter out unapproved users when the `active` filter is on
4 years ago
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
4 years ago
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
4 years ago
lain
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
4 years ago
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
4 years ago
Alex Gleason
4af1b80381
Clean up account aliases
4 years ago
Alex Gleason
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
4 years ago
lain
50d5bdfd31
Mix Task Frontend test: Expand.
4 years ago
rinpatch
7e23a48d38
rel me test: fix HTML so broken browsers (and therefore
...
lexbor) refuse to parse it like mochiweb does
4 years ago
rinpatch
325c7c924b
Make Floki use fast_html
4 years ago
lain
de00a4c0f1
Mix Task Frontend Test: Capture IO.
4 years ago
lain
d97b76104e
Mix Task Frontend: Add tests.
4 years ago
lain
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
Maksim Pechnikov
8e90cc58e7
Merge branch 'develop' into feature/update-welcome-setting-in-description
4 years ago
Maksim Pechnikov
6e6276b4f8
added test
4 years ago
Ivan Tashkinov
56ddf20208
Removed unused alias.
4 years ago
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
lain
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
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
4 years ago
Mary Kate
f785dba09b
changelog for filter whole_word fix
4 years ago
Mary Kate
d6ab9f2132
update test for whole_word in filter
4 years ago
Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Alex Gleason
ad9c925efb
Speed up instance timeline query
4 years ago
Roman Chvanikov
4672b61106
Merge branch 'develop' into command-available-check
4 years ago
lain
7755f49e28
Merge branch 'migrate-legacy-tags' into 'develop'
...
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
See merge request pleroma/pleroma!2836
4 years ago
lain
9c96fc052a
CommonValidations: Extract modification right checker
4 years ago
lain
2173945f90
MailerTest: Give it some time.
4 years ago
Roman Chvanikov
8c57a299b4
Handle non-list keys in Config.fetch/1
4 years ago
Roman Chvanikov
2299bfe4c1
Merge branch 'develop' into refactor/config-get
4 years ago
Roman Chvanikov
97b5701449
Update clear_config macro
4 years ago
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.
4 years ago
Mark Felder
f7146583e5
Remove LDAP mail attribute as a requirement for registering an account
4 years ago
Roman Chvanikov
6f60ac9f41
Refactor config
4 years ago
lain
19c108170e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain
474aba984f
Merge branch 'unique-app-id' into 'develop'
...
Add unique index for apps.client_id, fixes #2022
Closes #2022
See merge request pleroma/pleroma!2844
4 years ago
rinpatch
b1b6a7dfa8
Merge branch 'deactivated-user-posts' into 'develop'
...
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
4 years ago
Alex Gleason
184742af5e
Unique apps.client_id for new installations, fixes #2022
4 years ago
Egor Kislitsyn
91fbb5b21f
Fix ActivityExpirationPolicy
4 years ago
lain
878c7f3f30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain
36aa34a1a8
MastodonAPITest: Do the needful
4 years ago
Haelwenn (lanodan) Monnier
0f088d8ce3
question_validator: Allow content to be an empty-string (blank)
4 years ago
lain
1a00713744
CommonValidations: Treat deactivated users as not present.
4 years ago
lain
0cfadcf2ca
TransmogrifierTest: Add test for deactivated users
4 years ago
lain
e92c040ad3
CommonAPITest: Add test that deactivated users can't post.
4 years ago
lain
953f71bcfa
App Test: Make more resilient
4 years ago
Roman Chvanikov
56e9bf3393
Unify Config.get behaviour for atom/list key param
4 years ago
lain
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
4 years ago
Alex Gleason
4f57e85ab9
Email blacklist: Update phrasing again
4 years ago
Alex Gleason
058daf498f
Email blacklist: Update response phrasing
4 years ago
lain
e3953923ac
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
...
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
4 years ago
Ilja
cbf8bfc694
Improved WelcomeChatMessageTest
...
* Checks if message is the same using ==/2 instead of =~/2
4 years ago
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
4 years ago
lain
de3bdc63ad
AccountControllerTest: Add test for message returned.
4 years ago
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
4 years ago
lain
10c792110e
MRF Object Age Policy: Don't break on messages without cc/to
4 years ago
Alex Gleason
f9301044ed
Add ReportNote test
4 years ago
Alex Gleason
77b48cb4ce
Factory: Add report_activity_factory
4 years ago
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
4 years ago
Alex Gleason
c2c3dd4613
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
4 years ago
Ilja
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
4 years ago
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
4 years ago
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
4 years ago
lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
4 years ago
Haelwenn (lanodan) Monnier
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
4 years ago
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.
4 years ago
lain
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
4 years ago
Haelwenn
d1cf1108ac
Merge branch 'render-preview-cards-in-chats' into 'develop'
...
Render preview cards in chats
See merge request pleroma/pleroma!2816
4 years ago
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
4 years ago
lain
781b270863
ChatMessageReferenceView: Display preview cards.
4 years ago
lain
873ff5ce14
Merge branch 'hide-reactions' into 'develop'
...
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
4 years ago
lain
e2e66e50d3
SimplePolicyTest: Add test for leaking DMs.
4 years ago
lain
d39b72c8fa
Merge branch 'feature/captcha-expose-timeout' into 'develop'
...
Expose seconds_valid in Pleroma Captcha API endpoint
Closes #1954
See merge request pleroma/pleroma!2812
4 years ago
Maksim Pechnikov
cff7bb5cd4
Merge branch 'develop' into issue/1933-update-dependency
4 years ago
Mark Felder
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
4 years ago
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
Alex Gleason
00d090004e
:show_reactions, refactor the other test
4 years ago
Alex Gleason
026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
4 years ago
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain
a6d3bb5f30
Merge branch 'issue/1023' into 'develop'
...
[#1023 ] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
4 years ago
lain
d9bf2c58df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
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
4 years ago
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
4 years ago
Haelwenn (lanodan) Monnier
2e27847573
feed/user_controller: Return 404 when the user is remote
4 years ago
lain
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
4 years ago
lain
6a25f72a75
FrontendStatic: Work correctly for other frontend types.
4 years ago
lain
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
lain
edf8b6abfe
EnsureRePrepended: Don't break on chat messages.
4 years ago
Maksim Pechnikov
15b8446cdb
updated dev & test packages
4 years ago
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
4 years ago
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
lain
ad5c42628a
FrontendStatic: Add plug to serve frontends based on configuration.
4 years ago
Alex Gleason
f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
Alex Gleason
f43518eb74
Lint, fix test
4 years ago
Alex Gleason
6f44a0ee84
Add configurable registration_reason limit
4 years ago
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
lain
9e6f4694dd
Pipeline: Unify embedded_object / object_data, move to validator.
4 years ago
lain
762c9ea564
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
4 years ago
lain
2a3abfd326
Merge branch 'issue/1934-welcome-email' into 'develop'
...
[#1934 ] welcome email
See merge request pleroma/pleroma!2786
4 years ago
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Maksim Pechnikov
643664d583
added migrate old settings to new
4 years ago
Lain Soykaf
1dd6de03ee
CommonAPI Tests: Check that undoing objects federates them as embeds.
4 years ago
Lain Soykaf
3d13fb05f8
Side Effects: On undoing, put information about the undone object.
4 years ago
Lain Soykaf
91f3cf9bc6
Pipeline: Add embedded object federation.
4 years ago
feld
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
Mark Felder
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
Haelwenn
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
Maksim Pechnikov
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
4 years ago
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
4 years ago
Ivan Tashkinov
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
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
4 years ago
lain
250e0369c7
Merge branch 'issue/1878' into 'develop'
...
[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
4 years ago
lain
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
4 years ago
Maksim Pechnikov
7991ddad58
added warning to use old keys
4 years ago
Alex Gleason
b6488a4db4
Update linkify migration tests to use config from ConfigDB
4 years ago
Alex Gleason
c7a0016f9f
Migration to fix malformed Pleroma.Formatter config
4 years ago
Alex Gleason
b87a1f8eaf
Refactor require_migration/1 into a test helper function
4 years ago
Alex Gleason
67389b77af
Add AutolinkerToLinkify migration test
4 years ago
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.
4 years ago
lain
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
4 years ago
Lain Soykaf
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
4 years ago
Maksim Pechnikov
5879d36854
fix sender for welcome email
4 years ago
Maksim Pechnikov
8d6f7aec21
Merge branch 'develop' into issue/1023
4 years ago
Maksim Pechnikov
7cafb96c02
added tests
4 years ago
Mark Felder
109836306c
Test that Emoji Packs can be listed when instance is not public
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
lain
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
4 years ago
lain
fa2421dd7e
Merge branch 'gopher-fix' into 'develop'
...
Gopher: using atom keys in search params
See merge request pleroma/pleroma!2775
4 years ago
Ivan Tashkinov
b8021016eb
[ #2497 ] Resolved merge conflicts.
4 years ago
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
4 years ago
Alexander Strizhakov
6afc6717d6
copy tmp file if test depends on it
4 years ago
Maksim Pechnikov
3edaecae96
added welcome email
4 years ago
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
4 years ago
Alex Gleason
afa8b469ed
Allow restricting public timeline by instance
4 years ago
Alex Gleason
ae74c52e22
Test angry face in formatter D:< #1968
4 years ago
Alex Gleason
bd1e2e3a58
Validate alias IDs
4 years ago
Alex Gleason
d0eb43b58b
Add account aliases
4 years ago
Alex Gleason
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Alex Gleason
15f8921b11
Test that unapproved users can never log in regardless of admin settings
4 years ago
Alex Gleason
5756843736
Fully delete users with status :approval_pending
4 years ago
Alex Gleason
880301985b
Formatter: Test link with local mention
4 years ago
Maksim Pechnikov
6c59fe259d
Merge branch 'develop' into issue/1023
4 years ago
Alex Gleason
9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
Mark Felder
b2d398b1d0
Merge branch 'develop' into refactor/gun-pool-registry
4 years ago
Mark Felder
9d30bacace
Merge branch 'develop' into refactor/notification_settings
4 years ago
rinpatch
0fe36b311c
Merge branch 'features/mrf-reasons' into 'develop'
...
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
4 years ago
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
Maksim Pechnikov
3f8bff8d6b
Merge branch 'develop' into issue/sign-authority
4 years ago
href
e499275076
Don't test tls_options in adapter helper test.
4 years ago
rinpatch
bf3492ceb3
Connection Pool: add tests
4 years ago
rinpatch
721e89e88b
Remove tests for old pool
4 years ago
Haelwenn (lanodan) Monnier
e4beff90f5
Create Question: Add context field to create
4 years ago
Haelwenn (lanodan) Monnier
922ca23298
Question: Add tests on HTML tags in options
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1362
4 years ago
Haelwenn (lanodan) Monnier
c19bdc811e
Fix attachments in polls
4 years ago
lain
040524c09f
Merge branch 'tests/apc2s-update_outbox' into 'develop'
...
AP C2S tests: Make sure you can't use another user's AP id
See merge request pleroma/pleroma!2767
4 years ago
Haelwenn (lanodan) Monnier
39870d99b8
transmogrifier tests: Move & enhance in specialised modules
4 years ago
Haelwenn (lanodan) Monnier
82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
4 years ago
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)
4 years ago
Haelwenn (lanodan) Monnier
10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
4 years ago
Haelwenn (lanodan) Monnier
7bcd7a9595
QuestionValidator: Create
4 years ago
Haelwenn (lanodan) Monnier
6d8427cca2
AP C2S tests: Make sure you can't use another user's AP id
4 years ago
Alex Gleason
0d004a9d04
Email admins when a new unapproved account is up for review
4 years ago
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason
fab44f6970
Test User with confirmation_pending: true, approval_pending: true
4 years ago
Alex Gleason
20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
4 years ago
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by `need_approval`
4 years ago
Alex Gleason
b750129da1
AdminAPI: Return `approval_pending` with users
4 years ago
Maksim Pechnikov
1dd767b8c7
Include port in host for signatures
4 years ago
Mark Felder
777a7edc6b
Lint and fix test to match new log message
4 years ago
Alex Gleason
a1570ba6ad
AdminAPI: Return `registration_reason` with users
4 years ago
feld
3f65f2ea79
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
...
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
4 years ago
feld
2909dc873b
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
...
[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
4 years ago
Ivan Tashkinov
124b4709dc
[ #1940 ] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.
4 years ago
feld
246f49d685
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
...
Transmogrifier: filtering weirdness in address fields
Closes #1916
See merge request pleroma/pleroma!2762
4 years ago
Haelwenn (lanodan) Monnier
858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
4 years ago
Ivan Tashkinov
9b225db7d8
[ #1940 ] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.
4 years ago
Ivan Tashkinov
cf3f8cb72a
[ #1940 ] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
4 years ago
Maksim Pechnikov
3062f86613
added generated `pleroma.env`
4 years ago
Alex Gleason
5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
4 years ago
=
b221b640a2
Transmogrifier: filtering weirdness in address fields
4 years ago
Mark Felder
80c21100db
Merge branch 'develop' into refactor/notification_settings
4 years ago
feld
5d215fd81f
Merge branch 'config-behaviours-runtime' into 'develop'
...
Config/Docs: Expand behaviour suggestions modules at runtime
Closes #1941
See merge request pleroma/pleroma!2755
4 years ago
feld
8f9ee694ed
Merge branch 'features/profile-fields-emojo' into 'develop'
...
user: Add support for custom emojis in profile fields
See merge request pleroma/pleroma!2741
4 years ago
Haelwenn (lanodan) Monnier
2aac92e9e0
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
4 years ago
Haelwenn
f918b6f86d
Merge branch '1937-renaming' into 'develop'
...
ActivityPub: Don't rename a clashing nickname with the same ap id.
Closes #1937
See merge request pleroma/pleroma!2748
4 years ago
Alex Gleason
bcfd38c8f3
Make a user unapproved when registering with `account_approval_required` on
4 years ago
Alex Gleason
e4e5577818
Prevent unapproved users from logging in
4 years ago
Alex Gleason
51ab8d0128
Add `account_approval_required` instance setting
4 years ago
Alex Gleason
a62f17da17
Add `approval_pending` field to User
4 years ago
href
4347d2de5e
Config/Docs: Expand behaviour suggestions at runtime
4 years ago
Alexander Strizhakov
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
4 years ago
Roman Chvanikov
aedbbec88a
Add Pleroma.Utils.command_available?/1 and use where appropriate
4 years ago
Maksim Pechnikov
62fc8eab0d
fix reset confirmation email in admin section
4 years ago
Mark Felder
6167593881
Support Exiftool for stripping EXIF data
...
We really only want to strip location data anyway, and mogrify strips color profiles.
4 years ago
Mark Felder
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
4 years ago
feld
ce9514000d
Merge branch 'proxy-range-and-chunk' into 'develop'
...
ReverseProxy: Streaming and disable encoding if Range
Closes #1860 and #1823
See merge request pleroma/pleroma!2749
4 years ago
href
a1dace088c
ReverseProxy: Streaming and disable encoding if Range
...
Fixes #1823
Fixes #1860
4 years ago
lain
93e494ec21
ActivityPub: Don't rename a clashing nickname with the same ap id.
4 years ago
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Haelwenn
31a0ed5d01
Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
...
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
Closes admin-fe#107 and #1788
See merge request pleroma/pleroma!2554
4 years ago
lain
4d809144d8
Merge branch 'cluster-test-ci' into 'develop'
...
RE-enable cluster tests on CI
See merge request pleroma/pleroma!2743
4 years ago
Haelwenn
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn
5ea6387572
Merge branch 'user-search-nickname-rank-boost' into 'develop'
...
Improved search results for localized nickname match
See merge request pleroma/pleroma!2733
4 years ago
stwf
08211eff22
Re-enable the federated tests, increase timeout
4 years ago
Haelwenn (lanodan) Monnier
cc7153cd82
user: Add support for custom emojis in profile fields
4 years ago
Mark Felder
2b979cc90c
Add AdminFE reports URL to report emails
4 years ago
lain
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
lain
f4469dc741
Merge branch 'features/favicons' into 'develop'
...
Add support for remote favicons
See merge request pleroma/pleroma!2261
4 years ago
Haelwenn
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
4 years ago
eugenijm
c2be0da79f
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
4 years ago
Haelwenn
68036f5a3b
Merge branch 'follow-pipeline' into 'develop'
...
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
4 years ago
Maksim Pechnikov
31259cabcc
fix test
4 years ago
Ivan Tashkinov
123352ffa1
Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
4 years ago
lain
00e54f8fe7
ActivityPub: Remove `follow` and fix issues.
4 years ago
lain
9dda8b5427
CommonAPI: Switch to pipeline for following.
4 years ago
lain
172f4aff8e
Transmogrifier: Move following to the pipeline.
4 years ago
lain
7d0e2b3fdd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
4 years ago
lain
cdc153db31
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
4 years ago
lain
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
Ivan Tashkinov
704a383055
Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
4 years ago
lain
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
4 years ago
Maksim Pechnikov
e341f81785
fixed delete `Like` activity in remove user
4 years ago
Haelwenn (lanodan) Monnier
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
Haelwenn (lanodan) Monnier
6a679d80c9
Move get_favicon to Pleroma.Instances, use /
4 years ago
Haelwenn (lanodan) Monnier
f6d09fafee
Add support for remote favicons
4 years ago
Haelwenn
a8447c3803
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
...
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
4 years ago
lain
8939ff39e4
Merge branch 'remove-twitter-api' into 'develop'
...
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
4 years ago
Ivan Tashkinov
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
lain
c8dd973af5
AccountController: Remove unused `update_?` routes.
...
These were not documented and are also not used anymore.
4 years ago
lain
59cf78e412
AccountController: Allow removal / reset of user images.
4 years ago
lain
9ad305209a
Merge branch 'bugfix/peertube-videos' into 'develop'
...
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
4 years ago
Haelwenn
fa0fa4552f
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
...
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
4 years ago
Haelwenn (lanodan) Monnier
fbb9743a70
Fix getting videos from peertube
4 years ago
Haelwenn
d81acb5f62
Merge branch 'description-limits' into 'develop'
...
Add limits to image descriptions
See merge request pleroma/pleroma!2724
4 years ago
lain
a6a12b241f
FollowValidator: Add basic validation.
4 years ago
lain
4e3b3998ad
BlockValidation test: Rename.
4 years ago
lain
eb87430803
ObjectValidator tests: Extract block validation tests.
4 years ago
lain
410c1fab31
ObjectValidator tests: Extract update validation tests.
4 years ago
lain
b2e1ea9226
ObjectValidation tests: Extract announce validation tests.
4 years ago
lain
bbaf108aee
ObjectValidator tests: Extract undo validation tests.
4 years ago
lain
168256dce9
ObjectValidation tests: Extract like validation tests.
4 years ago
lain
e6a13d97d0
ObjectValidation tests: Extract delete validation tests.
4 years ago
lain
60d4c6c91d
ObjectValidator tests: Extract emoji react testing
4 years ago
lain
e0baaa967c
ObjectValidator tests: Extract chat tests
4 years ago
lain
0aa4c20d78
ObjectValidator Test: Extract attachments.
4 years ago
lain
28feba8af4
Preloaders: Remove status_net preloader
4 years ago
lain
1963e143c5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
4 years ago
lain
ed4f9f6a29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
4 years ago
lain
208baf157a
ActivityPub: Add new 'capabilities' to user.
4 years ago
lain
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
rinpatch
69f0b286f7
Merge branch '1915-dont-filter-announce-notifications' into 'develop'
...
Streamer: Don't filter out announce notifications.
Closes #1915
See merge request pleroma/pleroma!2719
4 years ago
lain
cc8b4e48d9
InstanceView: Add chat limit, description limit
4 years ago
lain
af7720237b
Upload: Restrict description length
4 years ago
Alexander Strizhakov
818f3c2393
test fixes
4 years ago
Alexander Strizhakov
028a241b7d
tests fixes
4 years ago
Alexander Strizhakov
20c27bef40
renaming back and reject nil on create
4 years ago
Alexander Strizhakov
52ff75413a
Apply suggestion to test/notification_test.exs
4 years ago
Alexander Strizhakov
086a260c04
Apply suggestion to test/notification_test.exs
4 years ago
Sergey Suprunenko
8277b29790
Restrict thread statuses that contain user's irreversible filters
4 years ago
Sergey Suprunenko
5af1bf443d
Skip notifications for statuses that contain an irreversible filtered word
4 years ago
Sergey Suprunenko
4a8c26654e
Restrict statuses that contain user's irreversible filters
4 years ago
Alexander Strizhakov
480dfafa83
don't save tesla settings into db
4 years ago
lain
cf56655614
Streamer: Don't filter out announce notifications.
4 years ago
Mark Felder
4695bdd81b
Merge branch 'develop' into issue/1790-updated-oban
4 years ago
lain
c2a052a346
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
...
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
4 years ago
lain
9a27ef47f1
Merge branch '1912-leading-trailing-space-search' into 'develop'
...
SearchController: Trim query.
Closes #1912
See merge request pleroma/pleroma!2717
4 years ago
lain
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
lain
19fbfbb767
Merge branch '1892-exclude-bots-from-search-results' into 'develop'
...
[#1892 ] Exclusion of service actors from user search results
Closes #1892
See merge request pleroma/pleroma!2708
4 years ago
lain
945e75c8e8
SearchController: Trim query.
4 years ago
lain
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
4 years ago
lain
4a7b89e372
ChatMessageValidator: Additional validation.
4 years ago
lain
5c0bf4c472
ActivityPub: Ingest information about chat acceptance.
4 years ago
lain
26a7cc3f00
UserView: Add acceptsChatMessages field
4 years ago
lain
db76c26469
AccountViewTest: Fix test.
4 years ago
lain
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
4 years ago
lain
98bfdba108
User: On registration, set `accepts_chat_messages` to true.
4 years ago
Ivan Tashkinov
90764670dc
[ #1892 ] Excluded internal users (applications) from user search results, reinstated service actors in search results.
4 years ago
Mark Felder
8121e46f25
Merge branch 'develop' into activation-meta
4 years ago
Ivan Tashkinov
61180ab6f4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
4 years ago
rinpatch
4c044f6225
Merge branch 'fetcher-fixes' into 'develop'
...
Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711
4 years ago
lain
311b7c19d0
Streamer: Align announce streaming with polling.
4 years ago
lain
61fe94d698
SideEffects: Refactor.
4 years ago
rinpatch
fa7a0be225
Merge branch '1716-handle-nickname-clashes' into 'develop'
...
ActivityPub: Handle clashing nicknames for the same ap id
Closes #1716
See merge request pleroma/pleroma!2712
4 years ago
lain
fedfe8f7d6
ActivityPub: Handle clashing nicknames for the same ap id
...
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
4 years ago
lain
ce92e6e5ce
Fetcher: Work when we can't get the OP.
4 years ago
lain
8ae572d5ae
Fixtures: Pretty print.
4 years ago
lain
691742e62d
Revert "Merge branch 'avatar-removing' into 'develop'"
...
This reverts merge request !2701
4 years ago
Mark Felder
5a8e0208b1
Add fields limits to instance metadata, add tests
4 years ago
Ivan Tashkinov
3d2989278c
[ #1892 ] Excluded bot actors (applications, services) from search results.
4 years ago
Mark Felder
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
4 years ago
lain
0176b7bca2
Merge branch 'preload-fixups-2' into preloadfixups
4 years ago
lain
2382a2a151
Preload: Load the correct instance panel
4 years ago
rinpatch
7bb3618939
Merge branch 'fix-notification-filtering' into 'develop'
...
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
4 years ago
lain
c01f4ca07f
Notification: Remove TODO.
4 years ago
lain
90083a754d
Notifications: Never return `nil` in the notification list.
4 years ago
Egor Kislitsyn
3aa04b81c4
Test default "content-type" for CastAndValidate
4 years ago
lain
07ff2d62f4
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
...
excluding attachment links from RichMedia
See merge request pleroma/pleroma!2702
4 years ago
Alexander Strizhakov
6512ef6879
excluding attachment links from RichMedia
4 years ago
Egor Kislitsyn
4a306720e8
Merge branch 'develop' into remove-twitter-api
4 years ago
lain
651f269568
Merge branch 'avatar-removing' into 'develop'
...
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
4 years ago
lain
e64d08439e
UpdateCredentialsTest: Add test for removing profile images.
4 years ago
lain
8630a6c7f5
Preloaders: Use strings as keys.
4 years ago
lain
a19f8778af
User preloader: Put user info at correct key
4 years ago
lain
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
4 years ago
Mark Felder
ce85db41a3
Lint
4 years ago
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
4 years ago
Mark Felder
69848d5c97
Rename notification "privacy_option" setting
4 years ago
Haelwenn
bf1c5e255a
Merge branch 'block-handling' into 'develop'
...
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
4 years ago
Haelwenn
09478c9cf7
Merge branch '1258-anti-link-spam-exemption' into 'develop'
...
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
4 years ago
Mark Felder
fd5e797379
Simplify notification filtering settings further
4 years ago
Mark Felder
b950fb01db
Merge branch 'develop' into refactor/notification_settings
4 years ago
lain
a5bbfa21a1
StaticFE: Prioritize json in requests.
4 years ago
lain
f378e93bf4
AccountController: Return scope in proper format.
4 years ago
lain
a2002ebb63
Preloading: Fix nodeinfo url.
4 years ago
lain
4a7a34ae8c
Preloading: Return correct data for statusnet stuff.
4 years ago
lain
7ed2296416
Nodeinfo: Add chat information back in.
4 years ago
lain
15a8b70318
User: Don't unfollow on block when the relevant setting is set.
4 years ago
lain
c3383d4fab
BlockValidator: Restore old behavior for incoming blocks.
4 years ago
Haelwenn (lanodan) Monnier
27c33f216a
activity_draft: Add source field
4 years ago
feld
8288419686
Merge branch 'preload-data' into 'develop'
...
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
4 years ago
Mark Felder
433c01b370
Merge branch 'develop' into refactor/notification_settings
4 years ago
lain
04abee782b
AntiSpamLinkPolicy: Exempt local users.
4 years ago
lain
1cd1977c0f
Merge branch 'issue/1872-ex_aws' into 'develop'
...
[#1872 ] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
4 years ago
lain
84f9ca1956
Blocking: Don't federate if the options is set.
4 years ago
lain
44bb7cfccd
ActivityPub: Remove `block`.
4 years ago
lain
e38293c8f1
Transmogrifier: Switch to pipeline for Blocks.
4 years ago
lain
89e5b2046b
ObjectValidator: Basic `Block` support.
4 years ago
lain
d137f934df
Transmogrifier Test: Extract block handling.
4 years ago
lain
0e26ef2ab9
Merge branch 'fix/following-request-from-deactivated' into 'develop'
...
Filter outstanding follower requests from deactivated accounts
Closes #1771
See merge request pleroma/pleroma!2682
4 years ago
Maksim Pechnikov
439a1a0218
added wrapper Pleroma.HTTP for ExAws.S3
4 years ago
Mark Felder
67ab580553
Filter outstanding follower requests from deactivated accounts
4 years ago
lain
35f6770436
StatusView: Add pleroma.parent_visible
4 years ago
lain
88ccade1cb
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
...
admin api status count per instance
See merge request pleroma/pleroma!2500
4 years ago
lain
65f3eb333b
Apply suggestion to test/http/tzdata_test.exs
4 years ago
Maksim Pechnikov
721fc7c554
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
4 years ago
lain
98af7b59e4
Merge branch 'update-validator' into 'develop'
...
Update validator
See merge request pleroma/pleroma!2668
4 years ago
Roman Chvanikov
1471b70ef1
Merge develop
4 years ago
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
4 years ago
Maksim Pechnikov
a8d967762e
migrate to oban 2.0-rc1
4 years ago
lain
b7f297f0bd
Merge branch 'issue/1798' into 'develop'
...
[#1798 ] fixed migration the settings to DB
See merge request pleroma/pleroma!2655
4 years ago
lain
adc199c6a8
ActivityPubControllerTest: Capture error log
4 years ago
lain
d93e01137b
ActivityPubControllerTest: Testing changes.
4 years ago
lain
2737809bbf
An act of desperation.
4 years ago
lain
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Maksim Pechnikov
84aa9c78dd
fix tests
4 years ago
Maksim Pechnikov
2715c40e1d
added tests
4 years ago
lain
46f7e51b27
Merge branch 'add-muted-to-notifications' into 'develop'
...
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
4 years ago
Egor Kislitsyn
7e6f43c0d7
Add `is_muted` to notifications
4 years ago
Maksim Pechnikov
b0a40fc2e4
added verify RUM settings before start app
4 years ago
lain
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
4 years ago
lain
8b5bdd164e
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
...
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
4 years ago
lain
e785cd5cae
ActivityPub: Remove `update` and switch to pipeline.
4 years ago
rinpatch
c75ba63bef
Merge branch '1865-media-only' into 'develop'
...
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
4 years ago
lain
1e7ca24430
Update Handling Test: Fix for re-used update ids.
4 years ago
lain
31a4d42ce0
SideEffects: Handle user updating.
4 years ago
rinpatch
282f492cd5
Merge branch '1883-mrf-chat' into 'develop'
...
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
4 years ago
lain
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
4 years ago
lain
35e9282ffd
HellthreadPolicy: Restrict to Notes and Articles.
4 years ago
Alexander Strizhakov
c5863438ba
proper error codes for error in adminFE
4 years ago
lain
31761340fe
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
...
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
4 years ago
lain
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Alexander Strizhakov
1a704e1f1e
fix for packs pagination
4 years ago
Haelwenn (lanodan) Monnier
3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
...
conversation field is still set for outgoing federation for compatibility.
4 years ago
feld
f928267773
Merge branch 'issue/1855' into 'develop'
...
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
4 years ago
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials
4 years ago
lain
75670a99e4
UpdateValidator: Only allow updates from the user themselves.
4 years ago
lain
abdb540d45
ObjectValidators: Add basic UpdateValidator.
4 years ago
Ivan Tashkinov
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
lain
7e488cd4a7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Alexander Strizhakov
3e3f9253e6
adding overall count for packs and files
4 years ago
Alexander Strizhakov
4975ed86bc
emoji pagination for pack show action
4 years ago
Alexander Strizhakov
3becdafd33
emoji packs pagination
4 years ago
Maksim Pechnikov
e4c61f1741
added test
4 years ago
Maksim Pechnikov
4044f24e2e
fix test
4 years ago
Mark Felder
2731ea1334
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
4 years ago
Mark Felder
3462d4b995
Merge branch 'develop' into issue/1855
4 years ago
lain
d772361e62
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
4 years ago
Maksim
96493da7bd
Apply suggestion to test/web/media_proxy/invalidation_test.exs
4 years ago
Maksim
078d687e6e
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
4 years ago
Maksim
2991aae4c4
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
4 years ago
Maksim
11b22a4229
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
4 years ago
Maksim
6d33a3a51b
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim
793a53f1ec
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim
1b45bc7b2a
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
4 years ago
Haelwenn
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
4 years ago
Alexander Strizhakov
b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
4 years ago
Alexander Strizhakov
3c2cee33ad
moving custom ecto types in context folders
4 years ago
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
4 years ago
Alexander Strizhakov
e1603ac8fe
fix attemps to merge map
4 years ago
Alexander Strizhakov
23decaab81
fix for updated hackney
...
warning: :hackney_connect.partial_chain/1 is undefined or private
4 years ago
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
4 years ago
lain
015f9258a9
Transmogrifier: Extract user update handling tests.
4 years ago
lain
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
4 years ago
stwf
faba1a6e33
fix tests
4 years ago
Maksim Pechnikov
579763126f
Merge branch 'develop' into issue/1855
4 years ago
Egor Kislitsyn
bd63089a63
Fix tests
4 years ago
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Maksim Pechnikov
62b8c31b7a
added tests
4 years ago
lain
b7df7436c8
Conversations: Return last dm for conversation, not last message.
4 years ago
Maksim Pechnikov
2e8a236cef
fix invalidates media url's
4 years ago
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
4 years ago
href
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn
520367d6fd
Fix atom leak in Rich Media Parser
4 years ago
Mark Felder
26f710b9e3
Merge branch 'develop' into preload-data
4 years ago
Haelwenn
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
4 years ago
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
4 years ago
Mark Felder
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
4 years ago
Maksim Pechnikov
f9dcf15ecb
added admin api for MediaProxy cache invalidation
4 years ago
Ivan Tashkinov
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
Haelwenn (lanodan) Monnier
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
4 years ago