Commit Graph

4042 Commits (fa4ec17c841a65eccacdc35c98b6c047549b305b)

Author SHA1 Message Date
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results
5 years ago
lain 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
rinpatch 00d08c9231 Merge branch 'favoritng-responses' into 'develop'
5 years ago
Alexander Strizhakov 8023fa48db
merge fix
5 years ago
lain 4c5b5f14dc StatusView: Add `emoji_reactions`
5 years ago
lain 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop'
5 years ago
lain 42ea480e95 Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
5 years ago
lain 510776ba31 CommonAPI: Don't error out on double favs/repeats
5 years ago
lain c814f22030 Merge branch 'fix-admin-api-scope' into 'develop'
5 years ago
lain 5fddf988ea Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
Haelwenn e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5
5 years ago
Haelwenn (lanodan) Monnier 6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
5 years ago
Alexander Strizhakov e699861690
full update for some subkeys
5 years ago
Alexander Strizhakov 89e93fb33f
return db key on update requests
5 years ago
Maksim Pechnikov 108a39c876 updated error messages for authentication process
5 years ago
Alexander Strizhakov 60ba2339a2
saving to DB only added by user settings
5 years ago
Alexander Strizhakov 29155137fd
renaming
5 years ago
Maksim Pechnikov a5db044e57 Merge branch 'develop' into feature/tag_feed
5 years ago
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain aa9fe3a712 Merge branch 'develop' into 'feature/tag_feed'
5 years ago
Alexander Strizhakov 59ba5c80b9
little cleanup
5 years ago
Egor Kislitsyn 3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
Ivan Tashkinov 76c1948880 [#1478] Adjusted AdminAPIController admin subscope requirements.
5 years ago
Maksim Pechnikov c9f45edeac Merge branch 'develop' into feature/tag_feed
5 years ago
lain 2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov b7908844f2 Merge branch 'develop' into issue/1383
5 years ago
feld bb5862ea2f Merge branch 'issue/1354' into 'develop'
5 years ago
Mark Felder 2f5b8fbeb3 Merge branch 'develop' into issue/1354
5 years ago
feld ea4a462858 Merge branch 'issue/1487' into 'develop'
5 years ago
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov d933fd3d61
more renamings
5 years ago
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
5 years ago
Alexander Strizhakov 958d0452e4
fix for pleroma assets group update
5 years ago
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain 05ca420c09 Merge branch 'issue/1490' into 'develop'
5 years ago
Alexander Strizhakov 88a16bb9fc
deep merge in config update
5 years ago
Alexander c841174de8
flag for delete fix
5 years ago
Alexander 0b02040327
little fixes and typos fix
5 years ago
Alexander 9c1f3bfeff
fixes for logger backends
5 years ago
Alexander 063ab6d911
logger backends fix
5 years ago
Alexander 583cee4607
parsing proxy url setting
5 years ago
Alexander fea734ca70
errors on endpoints
5 years ago
Alexander 5cacb988b9
partially settings update
5 years ago
Alex S 2753285b77
config editing through database
5 years ago
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Maksim Pechnikov 70410dfafd fix create service actor
5 years ago
Maksim Pechnikov fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
Ivan Tashkinov badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Maksim Pechnikov 933dc12043 added code of mr#2067
5 years ago
Maksim Pechnikov 385356aad0 fix oauth scopes for AdminApi#reports_update
5 years ago
Maksim Pechnikov bdd71669da update test
5 years ago
Maksim 4c505bc615 Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
Maksim c9a44ec4a6 Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
5 years ago
Maksim Pechnikov 5b84156013 moved remote follow in separate controller
5 years ago
Maksim Pechnikov 54c9db38c8 Merge branch 'develop' into issue/1383
5 years ago
rinpatch c51e93978e Merge branch 'feature/custom-runtime-modules' into 'develop'
5 years ago
Mark Felder 06ae56a3ae Posts without media attachments should get the Summary TwitterCard
5 years ago
Maksim Pechnikov 7bd0bca2ab fixed remote follow
5 years ago
Ivan Tashkinov ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov 455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests.
5 years ago
Egor Kislitsyn 34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Egor Kislitsyn 432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
Maksim Pechnikov b53573a837 add tag feeds
5 years ago
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support
5 years ago
Egor Kislitsyn 6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
Egor Kislitsyn 8f79f433bc
Hide follower counter when hiding is activated
5 years ago
Maksim Pechnikov a879c396bb Merge branch 'develop' into feature/tag_feed
5 years ago
Egor Kislitsyn b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383
5 years ago
Phil Hagelberg 02c3031e99 Don't log when users or objects are deleted.
5 years ago
rinpatch bcd16676a7 Publisher: check out a connection for inserting publish_one jobs
5 years ago
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
5 years ago
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
5 years ago
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411
5 years ago
Maxim Filippov 82fae3e23f AdminAPI: Merge account views for list instance statuses
5 years ago
Egor Kislitsyn ee6805850c Set log level to debug for not important messages
5 years ago
rinpatch 72f3b22134 Merge branch 'domain-block-precedence' into 'develop'
5 years ago
Sadposter 1ad96d667a remove single-step pipe
5 years ago
feld 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop'
5 years ago
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
5 years ago
Sadposter 25f774f7c1 format activity_pub.ex
5 years ago
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities
5 years ago
Egor Kislitsyn 75b419d7c8 Do not apply http signature pipeline to the unsubscribe route
5 years ago
minibikini 43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules'
5 years ago
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Egor Kislitsyn a37bd5c255 Change log level
5 years ago
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
5 years ago
Egor Kislitsyn c098dec473 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Maksim Pechnikov 2b821036c4 Merge branch 'develop' into issue/1383
5 years ago
lain 0d2c13a119 Merge branch 'fix/otp-parsers' into 'develop'
5 years ago
lain e4ea0e20b3 Merge branch 'issue/1342' into 'develop'
5 years ago
Egor Kislitsyn 78299ab182 Set Plug.Logger to log at `:debug` level
5 years ago
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342
5 years ago
rinpatch 3c45ed4f47 OTP: Fix runtime upload limit config being ignored
5 years ago
rinpatch bd3aa8500c OAuth token cleanup: Get rid of compile-time configuration
5 years ago
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383
5 years ago
rinpatch af5fef1f22 Merge branch 'fix/clause-never-matches' into 'develop'
5 years ago
rinpatch a21340caa1 Fix never matching clause
5 years ago
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
5 years ago
rinpatch 29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
5 years ago
Maxim Filippov a7f77785c2 Implement report notes destruction
5 years ago
Ivan Tashkinov 40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests.
5 years ago
rinpatch 6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop'
5 years ago
lain e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
5 years ago
Maxim Filippov 08c89fd2b8 Fix incorrect report count
5 years ago
Maksim Pechnikov 22fc271e23 init tag feed
5 years ago
Ivan Tashkinov 13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov af42c00cff [#1427] Reworked admin scopes support.
5 years ago
rinpatch cdff5b8267 Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch 9f99640cfc ActivityPub: Fix deletes being exempt from MRF
5 years ago
lain 67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop'
5 years ago
feld d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop'
5 years ago
Maksim Pechnikov 3fe7a1fd35 Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov e21afdb7c7 Merge branch 'develop' into issue/1411
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain aa97fe8f17 ChatChannel: Ignore messages that are too long.
5 years ago
Maksim Pechnikov 29a98b86b7 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 652cc6ba4b updated ScheduledActivity
5 years ago
Maxim Filippov 4b60d41db9 Add report notes
5 years ago
Egor Kislitsyn 624e720aa4 Add `with_move` query param to the notifications API
5 years ago
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
Maksim Pechnikov 88f7cf51d4 Merge branch 'develop' into issue/1411
5 years ago
kPherox 0326683932
hide follower/following for friendica
5 years ago
Ivan Tashkinov 51111e286b [#1427] Initial support for OAuth admin scopes.
5 years ago
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maksim Pechnikov 04a8ffbe84 added privacy option to push notifications
5 years ago
Maksim Pechnikov b7c449118b Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov fcabcab443 Fetch account from report, not from status (it might be deleted)
5 years ago
Maxim Filippov 5135656f57 Handle reopened reports with deleted statuses
5 years ago
lain 50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
Egor Kislitsyn f595cfe623
Remove User.user_info/2
5 years ago
Egor Kislitsyn 1fc28a4b44
Add a view for the move notification
5 years ago
Egor Kislitsyn 4af69f047d
Remove `account` field from web push payload
5 years ago
Egor Kislitsyn 80ededc04f
Add `direct_conversation_id` to web push payload
5 years ago
Ivan Tashkinov c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maxim Filippov b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
lain dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
5 years ago
Maxim Filippov b3b4e5ca80 AdminAPI: Grouped reports old/new fix
5 years ago
Maxim Filippov 1364d303f8 AdminAPI: Fix grouped reports for closed/resolved reports
5 years ago
rinpatch 4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
rinpatch 02f7383891 ActivityPub controller: do not render remote users
5 years ago
feld 5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
5 years ago
feld 9374b52756 Merge branch 'fix/update-reports-old-format' into 'develop'
5 years ago
Maksim Pechnikov 0e9be6bafa moved OAuth.Token.CleanWorker to Oban Periodic jobs
5 years ago
Maxim Filippov 82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 40059c9b1e Typo
5 years ago
Maxim Filippov 2b341627da Admin API: Render whole status in grouped reports
5 years ago
lain bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
5 years ago
Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 8feb5dcb42 Merge branch 'issue/1348' into 'develop'
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Ivan Tashkinov 555edd01ab [#1335] User AP ID relations fetching performance optimizations.
5 years ago
Ivan Tashkinov ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
Maksim Pechnikov 708fd234bd fix order favorites activites
5 years ago
Maxim Filippov 46eb160135 AdminAPI: Confirm user account, resend confirmation email
5 years ago
Maksim Pechnikov 5cee51fac5 fix `order by` for fetch_favorites
5 years ago
Ivan Tashkinov 3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
Maksim Pechnikov 0937895182 updated fetch_favorites
5 years ago
Maksim Pechnikov 9da4c88b49 fix test
5 years ago
Maksim Pechnikov 4beb3ce5c5 /api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
Maxim Filippov c506cc48ef Admin API: Error when trying to update reports in the "old" format
5 years ago
kaniini 81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop'
5 years ago
Ivan Tashkinov 01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov c31ddce51e [#1335] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
rinpatch 22554ac5ca Merge branch 'bugfix/1395-email-activation' into 'develop'
5 years ago
lain f17e0f8e4f OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
5 years ago
kPherox 72d2557e11 Add fieldsLimit to metadata of nodeinfo
5 years ago
Ariadne Conill eecd64cc07 object age policy: remove debug logging
5 years ago
Ariadne Conill 5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
Maxim Filippov 114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 30af5da330 Admin API: list all statuses from a given instance
5 years ago
rinpatch 09b4f7269e Merge branch 'fix/conversations-rendering' into 'develop'
5 years ago
rinpatch 94f1cfced8 format the code
5 years ago
feld 1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
5 years ago
Egor Kislitsyn 3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
rinpatch 6085c71bd1 Merge branch 'reactions' into 'develop'
5 years ago
Phil Hagelberg 3c60adbc1f Support redirecting by activity UUID in static FE as well.
5 years ago
Phil Hagelberg 0867cb083e Support redirecting by object ID in static FE.
5 years ago
Phil Hagelberg 62f3a93049 For remote notices, redirect to the original instead of 404.
5 years ago
Egor Kislitsyn 768c1a5de1
Fix tests
5 years ago
Egor Kislitsyn 27cd1374e3
Add a notification for Move activities
5 years ago
Egor Kislitsyn e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
Mark Felder 7d101bc9c5 Fix rendering conversations when there's a malformed status
5 years ago
feld e27d78e768 Merge branch 'nodeinfo-federation-enabled' into 'develop'
5 years ago
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop'
5 years ago
href b39b49cc14 report federating status in nodeinfo
5 years ago
lain 1ca7b877a1 Merge branch 'iss-1376' into 'develop'
5 years ago
Steven Fuchs 94627baa5c New rate limiter
5 years ago
Maxim Filippov 46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Ivan Tashkinov 3db988250b [#1335] User: refactored :blocks field into :blocked_users relation.
5 years ago
lain a88e834dba Merge branch 'develop' into 'reactions'
5 years ago
lain 3a1aaadc18 Merge branch 'issue/1339' into 'develop'
5 years ago