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
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
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
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
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
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
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
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
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