Commit Graph

2198 Commits (35ef470d000c53e21c6f867d53ca3a83260d93b8)

Author SHA1 Message Date
kaniini 0369a5db16 Merge branch 'idempotency-plug' into 'develop'
5 years ago
Alexander Strizhakov c6705144a2 don't delete config settings on admin update
5 years ago
Egor Kislitsyn 889a9c3a3f Polish IdempotencyPlug
5 years ago
Egor Kislitsyn 825077a5b0 Add Idempotency plug
5 years ago
Sergey Suprunenko d53fb55bb7 Return correct response when reply to a direct message is not direct itself
5 years ago
Maksim Pechnikov 4ad15ad2a9 add ignore hosts and TLDs for rich_media
5 years ago
Maksim Pechnikov 0cb8e710fb add test
5 years ago
Maksim a0c4ebb4d7 [#184] small refactoring reset password
5 years ago
Sergey Suprunenko 2c63c67512 Rework user deletion
5 years ago
Eugenij f2c03425b0 Broadcast conversation update when DM is deleted
5 years ago
kaniini 27b9605de0 Merge branch 'rich_media_titles_two' into 'develop'
5 years ago
Alex S b37ede5df3 log capturing
5 years ago
Alex S 982cad0268 support for config groups
5 years ago
Sachin Joshi a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header'
5 years ago
Alex S 410add1c30 support for tuples with more than 2 values
5 years ago
lain 0e415921cd Rich Media Parser: Do not return just a title if nothing else is there.
5 years ago
lain 58c4d5312b Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
5 years ago
Alex S f0fccb7578 fix for int and modules
5 years ago
kaniini 55742d978d Merge branch 'feature/mrf-anti-link-spam' into 'develop'
5 years ago
kaniini e3534f5b3c Merge branch 'oauth_secure_redirect' into 'develop'
5 years ago
kaniini 720412bf24 Merge branch 'revert-6f5a0cc1' into 'develop'
5 years ago
feld b6af80f769 Revert "Merge branch 'fix/ogp-title' into 'develop'"
5 years ago
Egor Kislitsyn fc6e661672 Fix rate limiter tests
5 years ago
Alexander Strizhakov 32320c1ee9 Fixes for dynamic configuration
5 years ago
William Pitcock 21dacd4b15 unbreak polls
5 years ago
William Pitcock 736d8ad6be implement anti link spam MRF
5 years ago
Alexander Strizhakov e4fa6b99ac aliases for mix tasks
5 years ago
lain 5c6c4ce634 Merge branch 'fix/rich-media-hashtags-again' into 'develop'
5 years ago
rinpatch 035368d363 Rich Media: Skip Microformats hashtags
5 years ago
Ivan Tashkinov 9f45f93949 Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
5 years ago
rinpatch c7acca2abb Mastodon API: Sanitize display names
5 years ago
rinpatch 49a49d3763 Merge branch 'removing-test-errors' into 'develop'
5 years ago
Haelwenn c34327b22e Merge branch 'fix/sanitize-report-content' into 'develop'
5 years ago
Alex S 2e2edcb461 capturing errors
5 years ago
Alex S 0f59265a50 salmon fix
5 years ago
Maksim a04bf131e0 [#570] add user:notification stream
5 years ago
rinpatch bf6aa6f1a8 Fix report content stopping to be nullable
5 years ago
rinpatch 44de34d170 Credo fixes
5 years ago
rinpatch e943905bd7 Add tests for report view
5 years ago
kaniini 52b1b0e45d Merge branch '963_oob_oauth_redirect_fix' into 'develop'
5 years ago
lain a440cf856d Mastodon API: Return the token needed for the chat.
5 years ago
rinpatch 62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
5 years ago
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
5 years ago
lain 7f48b90bfb Merge branch 'fix/hashtag-rich-media' into 'develop'
5 years ago
Maksim ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
rinpatch d0ebc0edf3 Fix hashtags being picked up by rich media parser
5 years ago
lain eac298083f MastodonAPI: Add a way to update the background image.
5 years ago
lain 5965efb216 AccountView: Add user background.
5 years ago
lain 6f5a0cc14e Merge branch 'fix/ogp-title' into 'develop'
5 years ago
Egor Kislitsyn 30e54fd7e2 Handle HTTP 404 response
5 years ago
Egor Kislitsyn afae3ada22 Handle HTTP "410 Gone" response
5 years ago
Egor Kislitsyn a12f8e13c8 Improve <title> fallback; Add a test
5 years ago
Ivan Tashkinov 4b2c29016c [#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
5 years ago
Egor Kislitsyn 6f29865d43 Add option to restrict all users to local content
5 years ago
lain 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
5 years ago
Egor Kislitsyn ad04d12de6 Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn 2e5affce61 Add RateLimiter
5 years ago
kaniini f2d72b1fe4 Merge branch 'preload-changes' into 'develop'
5 years ago
Sergey Suprunenko 365268d522 Add more tests for using media_proxy and whitelists
5 years ago
rinpatch dffc9f060a replace missing mock with a 404
5 years ago
rinpatch d020f68e87 Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
5 years ago
lain 970f71e222 Conversations: Fetch users in one query.
5 years ago
Roman Chvanikov 01fe5abad1 Resolve conflicts
5 years ago
lain cb2bcee842 User Search: Boost friends more strongly.
5 years ago
lain 7e9f7ea0c2 MastodonAPI: Add test for user search.
5 years ago
Egor f82382de22 [#943] Make the unauthenticated users limitation optional
5 years ago
kaniini 3f6da9c45a Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
5 years ago
kaniini a511d2f900 Merge branch 'improve-search' into 'develop'
5 years ago
lain ad19bfc7fe Utils: Split update_follow_state and update_follow_state_for_all.
5 years ago
lain 827a51e777 CommonAPI: Add test for accept_follow_request.
5 years ago
lain 076c9ae40e User: Remove superfluous `maybe_follow`.
5 years ago
lain 3115b64cfe Transmogrifier: Add tests for incoming follows to locked accounts.
5 years ago
Egor Kislitsyn cfa5572d28 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain 024dfdc39c Typo + Linting.
5 years ago
lain 8b9a0dd4a7 User: Don't error out when following a user that's already followed.
5 years ago
Egor Kislitsyn 5b04f07a1e Limit search for unauthenticated users to local users only
5 years ago
Egor Kislitsyn 17a6f81f7b Fix tests with enabled RUM
5 years ago
Egor Kislitsyn 93397fce3d Contain search for unauthenticated users
5 years ago
kaniini e4babb1c9f Merge branch 'explicit-addressing' into 'develop'
5 years ago
Egor Kislitsyn 6ba9055b51 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Roman Chvanikov b1b1a270e8 Fix conflict
5 years ago
Haelwenn ab4915edcb Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
5 years ago
Maksim Pechnikov d3d1704e84 Merge branch 'develop' into issue/941
5 years ago
lain a3a7178b60 Participations: Filter out participations without activities.
5 years ago
rinpatch bbff7554de Add tests for get_existing_votes
5 years ago
Egor Kislitsyn 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain 4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941
5 years ago
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
5 years ago
Sergey Suprunenko 84cc131b59 Add missing HTTP Request mocks
5 years ago
kaniini 9d2563a3de Merge branch 'generic-fe-settings' into 'develop'
5 years ago
Roman Chvanikov f6036ce3b9 Fix tests
5 years ago
Roman Chvanikov bd325132ca Fix tests
5 years ago
Roman Chvanikov 3e17610587 Add task to test emails
5 years ago
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov 64ada7f960 fix tests
5 years ago
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment
5 years ago
lain 804b6a4d8f CommonAPI.Utils: Add tests.
5 years ago
lain 80d4d83aac CommonAPI: Add explicit addressing.
5 years ago
lain 2b664b048e User: Add function to get AP ids from nicknames.
5 years ago
Maksim Pechnikov 080e1aa70e add option skip_thread_containment
5 years ago
rinpatch dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda 314758c25b Merge branch 'align-mastodon-conversations' into 'develop'
5 years ago
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch 2fe3a20638 Make error message about author's inability to vote more sensible
5 years ago
rinpatch c47da0e65d Add tests for poll view
5 years ago
William Pitcock 38a275b31f test: add tests for subchain policy
5 years ago
kaniini 5402d04e3c Merge branch 'feature/notification-control-part-2' into 'develop'
5 years ago
Sachin Joshi e394fc2eef fix the flaky test for users creation by admin
5 years ago
rinpatch cfa588e357 Fix Credo issues
5 years ago
rinpatch 65db5e9f52 Resolve merge conflicts
5 years ago
rinpatch 300d94c628 Add poll votes
5 years ago
Sachin Joshi ad5263c647 Merge remote-tracking branch 'upstream/develop' into admin-create-users
5 years ago
Sachin Joshi 5534d4c676 make bulk user creation from admin works as a transaction
5 years ago
kaniini e706b42f51 Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
5 years ago
Sergey Suprunenko 2bbc2a801f Remove all follower collections but actor's from "cc"
5 years ago
kaniini d46cc7896e Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
5 years ago
William Pitcock f2efe24cf8 visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
5 years ago
Sachin Joshi d4304a3945 add the missing mock file
5 years ago
Haelwenn (lanodan) Monnier 5d3ece2861
Remove now useless flavours switching
5 years ago
lambda 2993361075 Merge branch 'hotfix/leaking-lists' into 'develop'
5 years ago
lain 7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store.
5 years ago
lain aaad85c4d9 AccountView: settings -> settings_store
5 years ago
lain eb2963bc43 User: Add settings store to Info, AccountView
5 years ago
rinpatch d9c0650ff9 Mastodon API: Fix lists leaking private posts
5 years ago
rinpatch a9eaa55885 Fix fix_explicit_addressing moving follower collection to cc and add tests for it
5 years ago
lain 97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'.
5 years ago
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings
5 years ago
lambda 91ac8b075b Merge branch 'use-pleroma-config' into 'develop'
5 years ago
Egor Kislitsyn 99f70c7e20 Use Pleroma.Config everywhere
5 years ago
Roman Chvanikov ce47017c89 Merge develop
5 years ago
Maksim db94294dfb [#936] fix tests
5 years ago
Sachin Joshi 1452a96ad6 ability to set and reset avatar, profile banner and backgroud in Mastodon API
5 years ago
lambda 5bb843ceec Merge branch 'refactor/die-httpoison-die' into 'develop'
5 years ago
William Pitcock 79503ce90f mrf: simple policy: fix matching imported activitypub and ostatus statuses
5 years ago
William Pitcock 45e4642a58 tests: chase remote/local removal
5 years ago
William Pitcock 59a703fcbe twitter api: user view: expose user notification settings under pleroma object
5 years ago
William Pitcock 0f7eeb0943 tests: add tests for non-follows/non-followers settings
5 years ago
William Pitcock 1542cccbbc tests: chase notification setting changes
5 years ago
William Pitcock 56fd7dbdd7 remove @websub and @ostatus module-level constants
5 years ago
William Pitcock 80d55d428f tests: websub: check only that signature validation succeeds or fails
5 years ago
Aaron Tinio 9415932af5 Keep nodeinfo available when not federating
5 years ago
Sergey Suprunenko bbea5691da Mention all people in the beginning of DM
5 years ago
feld f916e4cdd9 Move the Cache Control header test to its own file
5 years ago
Egor Kislitsyn a7affbdd6d Fix tests
5 years ago
Egor Kislitsyn f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Sachin Joshi 0c53d91f3b fix merge conflict
5 years ago
William Pitcock 8086c7aed6 tests: add tests for banner and avatar removal
5 years ago
rinpatch 19c90d47c4 Normalize poll votes to Answer objects
5 years ago
Maksim 620908a2db [#699] add worker to clean expired oauth tokens
5 years ago
lambda 714d8d4ef9 Merge branch 'feature/object-pruning' into 'develop'
5 years ago
lambda ff363f70b5 Merge branch 'refactor/keys' into 'develop'
5 years ago
rinpatch cdac5efd10 Merge branch 'bugfix/account_view_source.note' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
5 years ago
Sachin Joshi 17bfd000d7 Ability to reset avatar, profile banner and backgroud
5 years ago
kaniini 79c2cef2fb Merge branch 'mongooseim-support' into 'develop'
5 years ago
kaniini ab6e15622b Merge branch 'fix/api-fallback' into 'develop'
5 years ago
Sergey Suprunenko 9134848170 Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
5 years ago
William Pitcock 045803346d move key generation functions into Pleroma.Keys module
5 years ago
Aaron Tinio f76268135c Fix failing test
5 years ago
Aaron Tinio 3ab9255eda Respond with a 404 Not implemented JSON error message
5 years ago
Aaron Tinio a13d449b24 Add tests for fallback routes
5 years ago
William Pitcock 73df9d690d object: fetcher: add support for reinjecting pruned objects
5 years ago
rinpatch 63b0b7190c MastoAPI: Add GET /api/v1/polls/:id
5 years ago
rinpatch 0407ffe75f Change validation error status codes to be more appropriate
5 years ago
rinpatch aafe30d94e Handle poll votes
5 years ago
rinpatch 3f96b3e4b8 Enforce poll limits and add error handling for MastodonAPI's post endpoint
5 years ago
rinpatch 76a7429bef Add poll limits to /api/v1/instance and initial state
5 years ago
kaniini d4847b17ca Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
5 years ago
Aaron Tinio eb02edcad9 Add virtual :thread_muted? field
5 years ago
Sadposter dc916ba15f
Format mascot tests
5 years ago
Sadposter e81f0fc6d4
Add mascot get/set tests
5 years ago
Aaron Tinio 2375e9a95b Add report filtering to MRF.SimplePolicy
5 years ago
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects
5 years ago
rinpatch fd920c8973 Mastodon API: Add support for posting polls
5 years ago
William Pitcock dc08159538 also suppress link previews from posts marked #nsfw
5 years ago
William Pitcock 0da1233e8e rich media: suppress link previews if post is marked as sensitive
5 years ago
lain f959bf7aa6 MongooseIM: Add basic integration endpoints.
5 years ago
Egor Kislitsyn 557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn f2936e0a07 Add `ap_id` to List
5 years ago
lain 249b31ffe5 Fix specs.
5 years ago
Alexander Strizhakov 7ed682213f Fix/902 random compile failing
5 years ago
Sachin Joshi 5c028b8f92 user creation admin api will create multiple users
5 years ago
Aaron Tinio 443cd68a4c Add tests for MRF.SimplePolicy
5 years ago
kaniini bf84d50c76 Merge branch 'feature/890-add-report-uri' into 'develop'
5 years ago
Sergey Suprunenko 2c303afc8b Remove duplicated entries in users' following lists
5 years ago
Sergey Suprunenko e2b3a27204 Add Reports to Admin API
5 years ago
feld e190b3022b Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
5 years ago
Mark Felder ebb0482116 Merge branch 'develop' into conversations-import
5 years ago
lambda fde30aee43 Merge branch 'feature/sql-thread-sat' into 'develop'
5 years ago
Alexander Strizhakov 73ae58fdfa Feature/896 toggling confirmation
5 years ago
Egor Kislitsyn fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Alex S 4711d8151c try this
5 years ago
Alex S aa11fa4864 add report uri and report to
5 years ago
Aaron Tinio 2b6119dfbf Restrict reblogs of activities from blocked domains
5 years ago
Aaron Tinio 64495b96e9 Add test for blocked domains
5 years ago
rinpatch 62e42b03ab Handle incoming Question objects
5 years ago
William Pitcock f09c3afdf5 chase test failures
5 years ago
William Pitcock c7644313e7 test: update obsolete test
5 years ago
lain f168a1cbdc Merge remote-tracking branch 'origin/develop' into conversations-import
5 years ago
kaniini 62516be9c4 Merge branch 'fix/public-option-not-working' into 'develop'
5 years ago
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
5 years ago
William Pitcock 4429c1b7da tests: fixup
5 years ago
lain cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
Sachin Joshi ee22fff5ac remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn a7a8f3bc2c Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Aaron Tinio 70c81b95d0 Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
Aaron Tinio 7b8dc99ef1 Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
5 years ago
William Pitcock 071f78733a switch to pleroma/http_signatures library
5 years ago
kaniini dfd031c26a Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
5 years ago
Maksim 52297920e7 Refactoring oauth response.
5 years ago
Egor Kislitsyn d474995efa Add Tests
5 years ago
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Aaron Tinio a18b2c0b12 Fix Pleroma.Config.get!/1 raising an error when value is false
5 years ago
lambda b14a314ce7 Merge branch 'feature/federator-behaviours' into 'develop'
5 years ago
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
5 years ago
Sachin Joshi 7701a4c841 Make irreversible field default to false in filters
5 years ago
rinpatch 15cda998f3 Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
5 years ago
William Pitcock 582bd9d170 tests: fix AP test failures
5 years ago
William Pitcock d823eb921b tests: fix salmon tests
5 years ago
William Pitcock 2b847d4add tests: chase federator publish_single_foo removals
5 years ago
kaniini 131f883207 Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
5 years ago
Sachin Joshi f01f995816 make url uniform in admin api
5 years ago
Roman Chvanikov f1f7a11222 Merge develop
5 years ago
Francis Dinh 2a54e8c1f5 Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
5 years ago
rinpatch e4523c3010 Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
lain a33bec7d58 Conversations: Import order, import as read.
5 years ago
lain a4598b5e8b Visibility: Make it more resilient.
5 years ago
lain fcf2f38d20 Conversations: Add a function to 'import' old DMs.
5 years ago
Alexander Strizhakov bfeb33e951 Merge develop
5 years ago
Roman Chvanikov b6b5b16ba4 Merge develop
5 years ago
rinpatch 4c5125dedc Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch 3a7c14645e - Actually use preloaded bookmarks in views
5 years ago
rinpatch f841eb7cdb Preload bookmarks wherever the object is preloaded
5 years ago
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
5 years ago
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim 1040caf096 fix format
5 years ago
lambda aacac9da0b Merge branch 'feature/bbs' into 'develop'
5 years ago
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
lain eb0fb73ddb BBS: Credo fixes.
5 years ago
lain c58fd4c038 BBS: Fix tests.
5 years ago
lain 4c76f49e60 BBS: small fixes.
5 years ago
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
Haelwenn (lanodan) Monnier b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier 2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
Haelwenn (lanodan) Monnier 85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
lain 81d1aa424d Streamer: Stream out Conversations/Participations.
5 years ago
lambda 497d34b825 Merge branch 'iss-849' into 'develop'
5 years ago
AkiraFukushima a53a6c9d64 Add oauth plug tests for url and body parameters
5 years ago
Roman Chvanikov 8af55728e4 Fix tests
5 years ago
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Maksim c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator
5 years ago
lambda 0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop'
5 years ago
Alex S f11e7037c2 test fixes
5 years ago
Sachin Joshi cd6da3606b Merge branch 'develop' into bugfix/web-notification-special-char
5 years ago
Roman Chvanikov 0f0cc2703b Merge develop
5 years ago
lain b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
rinpatch 0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
5 years ago
kaniini 292c69481b Merge branch 'regression/rights-only-for-admin' into 'develop'
5 years ago
rinpatch 61ca2f7a4e Fix `rights` in TwitterAPI's user entity being present only for
5 years ago
rinpatch ce3789e39a Add default_scope to /api/v1/update_credentials
5 years ago
rinpatch c3e9fcf098 Fix bookmarks depending on embeded object and move checking if the
5 years ago
kaniini 002ea343f8 Merge branch 'feature/bbcode' into 'develop'
5 years ago
William Pitcock ef52aa0e66 tests: fix up for changed bbcode library output and verify html is properly escaped
5 years ago
William Pitcock 501af917b5 add support for bbcode
5 years ago
lambda 4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
5 years ago
kaniini 48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop'
5 years ago
Mark Felder 24c3e2db2c Add mediaproxy whitelist capability
5 years ago
rinpatch dfc8425659 Move settings to Source subentity
5 years ago
Alex S 85953c0836 fixes for tests
5 years ago
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account
5 years ago
Alex S 73d01857e3 bookmarks in separate table
5 years ago
William Pitcock 0fd0ffcd76 activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago
rinpatch 4baea6e6d9 Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
5 years ago
Sachin Joshi 963d5774af fix the status notification with special char
5 years ago
kaniini 030a7876b4 Merge branch 'security/fix-html-class-scrubbing' into 'develop'
5 years ago
William Pitcock f5535e5743 html: lock down allowed class attributes to only those related to microformats
5 years ago
Sergey Suprunenko 9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
5 years ago
rinpatch f60d072bbb Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
Egor b9cdf6d3b9 Use `User.get_cached*` everywhere
5 years ago
Alexander Strizhakov 88f0be9693 Feature/826 healthcheck endpoint
5 years ago
Egor Kislitsyn e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
kaniini 7fcbda702e Merge branch 'rework-emoji-management' into 'develop'
5 years ago
Roman Chvanikov 2662bea4e0 Add accounts and last_status to conversation read response
5 years ago
Ivan Tashkinov 9256d2d4b4 [#923] Refactored OAuthController#authorize definitions, added test.
5 years ago
eugenijm 375fd21055 Set correct values in the MastoAPI reblog status view
5 years ago
Roman Chvanikov 724311e151 Fix Credo warnings
6 years ago
Roman Chvanikov 60f213bb1a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Ekaterina Vaartis aef3a3ca46 Fix tests that used finmoji
6 years ago
Ekaterina Vaartis 52ed287e87 Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
eugenijm fa48532387 Handle `reblogs` on the first follow request in MastoAPI
6 years ago
kaniini 9da8b287f8 Merge branch 'feature/database-compaction' into 'develop'
6 years ago
Roman Chvanikov 73407f4eea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov bc7862106d Fix tests
6 years ago
Roman Chvanikov 8add119444 Add User.list_inactive_users_query/1
6 years ago
Roman Chvanikov aeafa0b2ef Add Notification.for_user_since/2
6 years ago
Alexander Strizhakov ada384207b typo fix
6 years ago
lambda 218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
6 years ago
rinpatch 4ef237f26a Fix my incorrect search test fix
6 years ago
rinpatch 83589ca6a5 Merge branch 'develop' into feature/database-compaction
6 years ago
rinpatch 6069d0fd36 Fix object search depending on embeded object
6 years ago
rinpatch 2abc09570f Use the preloaded object in tag queries
6 years ago
William Pitcock 36f78c6dcd activitypub: fix filtering of boosts from blocked users
6 years ago
William Pitcock 2140e164d7 activitypub: properly filter out transitive activities concerning blocked users
6 years ago
rinpatch 35ac672b8d Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
rinpatch d1eb578a57 Refactor tests that used ActivityPub.fetch_object_from_id
6 years ago
rinpatch 8e4d950f31 Remove updating reply count for embeded objects
6 years ago
rinpatch ff8d76c670 Refactor all tests that acessed the embeded object
6 years ago
rinpatch 54b82f236b Fix note count test
6 years ago
rinpatch ad681877df Make credo happy
6 years ago
rinpatch e7c3c36766 Update functions in object fetcher for tesla and set up a proper mock for tests
6 years ago
rinpatch b09ae02c04 Added some more normalization calls all in mastodon api controller
6 years ago
Roman Chvanikov 2f0203a4a1 Resolve conflicts
6 years ago
Roman Chvanikov 87013f8438 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
rinpatch dda4e0e2a8 Fix warnings in object tests
6 years ago
rinpatch 627e5a0a49 Merge branch 'develop' into feature/database-compaction
6 years ago
kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop'
6 years ago
Haelwenn cde7711b12 Merge branch 'bugfix/relax-spam-protection' into 'develop'
6 years ago
Normandy d4a749cfb2 Handle new-style mastodon follow lists
6 years ago
William Pitcock 750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
lain 76999c73a7 Conversation: Add accounts to output.
6 years ago
lain 0da985182f Conversation: Return full status object, id is a string.
6 years ago
lain c1ebb38d3a Conversation: Also create participations for remote users.
6 years ago
lambda 56956de6fa Merge branch 'fix/status-reblogged' into 'develop'
6 years ago
lambda f358295cbe Merge branch 'unfollow-oneself' into 'develop'
6 years ago
eugenijm 27d78dc526 Use User.get_cached_by*
6 years ago
rinpatch fd2e31af86 oops
6 years ago
rinpatch 5d73dca064 Remove inReplyToStatusId
6 years ago
eugenijm 507e7821e3 Handle follow/unfollow directed to themselves
6 years ago
Roman Chvanikov dc21181f65 Update updated_at field on notification read
6 years ago
eugenijm 679a8ef629 Assign reblogged in the Mastodon reblog status view
6 years ago
Roman Chvanikov 0cd4b6024d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov 371a4aed2c Add User.Info.email_notifications
6 years ago
Alex S c5d0fffeaf naming fix
6 years ago
Alex S c349573791 Merge develop to 788-separate-email-addresses
6 years ago
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop'
6 years ago
Egor Kislitsyn d0304b4f92 more tests
6 years ago
Egor Kislitsyn dd097a406b add tests
6 years ago
lambda 0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
6 years ago
Alexander Strizhakov 711ade961e adding destroy multiple for mastofe
6 years ago
Alexander Strizhakov e03d24af96 in_reply_to_id - null
6 years ago
lain 6f880b1627 Conversation: Fix tests.
6 years ago
lain 36ec8d9694 ActivityPub: Fix specs.
6 years ago
Ivan Tashkinov c3f12cf3c3 [#923] OAuth consumer params handling refactoring.
6 years ago
lain c352a0aba6 Conversations: Make tests run.
6 years ago
lain cf353514fe Participations: Add last activity.
6 years ago
lain 20d9b90760 Participation: Get for a user.
6 years ago
lain 280172f6f6 Conversations: Create or bump on inserting a dm.
6 years ago
lain 64c1c3a407 Participations: Add marking as read and unread.
6 years ago