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
rinpatch
ce3474f4d3
Disable favicon scraping in tests
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
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
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
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
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