Commit Graph

2648 Commits (30590cf46b88d0008c9a7163b8339aa9376f2378)

Author SHA1 Message Date
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 26d9c83316 SideEffects: Test for notification creation.
4 years ago
lain 372614cfd3 ChatView: Add a mastodon api representation of the recipient.
4 years ago
lain d45ae64858 ChatController: Use OAuth scopes.
4 years ago
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
4 years ago
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
4 years ago
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
4 years ago
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
4 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
4 years ago
lain f8c3ae7a62 ChatController: Handle pagination.
4 years ago
lain e983f70884 ChatMessagesHandling: Strip HTML of incoming messages.
4 years ago
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities
4 years ago
rinpatch 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
4 years ago
lain ca598e9c27 AccountView: Return user ap_id.
4 years ago
lain e2ced04917 ChatMessages: Better validation.
4 years ago
Alexander Strizhakov 72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
lain 3d4eca5dd4 CommonAPI: Escape HTML for chat messages.
4 years ago
Egor Kislitsyn cf4ebba774
Cleanup SubscriptionController
4 years ago
Ivan Tashkinov bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
4 years ago
lain 6ace22b56a Chat: Add views, don't return them in timeline queries.
5 years ago
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
5 years ago
lain 44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
5 years ago
Egor Kislitsyn 247e6fcb90
Merge branch 'develop' into openapi/account
5 years ago
feld bf3afbc1a1 Merge branch 'logger-configuration' into 'develop'
5 years ago
Haelwenn 60cc7d6c9a Merge branch 'issue/1276' into 'develop'
5 years ago
Egor Kislitsyn 4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Maksim Pechnikov a16b3dbcbf Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn c28aaf9d82
Add OpenAPI spec for CustomEmojiController
5 years ago
Egor Kislitsyn 7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
5 years ago
Egor Kislitsyn ab185d3ea4
Add spec for AccountController.follows
5 years ago
Egor Kislitsyn 68a979b824
Add specs for AccountController.block and AccountController.unblock
5 years ago
Egor Kislitsyn e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
5 years ago
Egor Kislitsyn aa958a6dda
Add spec for AccountController.unfollow
5 years ago
Egor Kislitsyn 854780c72b
Add spec for AccountController.follow
5 years ago
Egor Kislitsyn 1b680a98ae
Add spec for AccountController.lists
5 years ago
Egor Kislitsyn e105cc12b6
Add spec for AccountController.following
5 years ago
Egor Kislitsyn bd6e2b300f
Add spec for AccountController.followers
5 years ago
Egor Kislitsyn 03124c96cc
Add spec for AccountController.statuses
5 years ago
Egor Kislitsyn 278b3fa0ad
Add spec for AccountController.show
5 years ago
Egor Kislitsyn d7d6a83233
Add spec for AccountController.relationships
5 years ago
Egor Kislitsyn ab400b2ddb
Add specs for ActorType and VisibilityScope
5 years ago
Egor Kislitsyn 260cbddc94
Add spec for AccountController.update_credentials
5 years ago
Egor Kislitsyn f80116125f
Add spec for AccountController.verify_credentials
5 years ago
Egor Kislitsyn b08ded6c2f
Add spec for AccountController.create
5 years ago
Ivan Tashkinov a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
Alexander Strizhakov a050f3e015
fix for logger configuration through admin-fe
5 years ago
Maksim Pechnikov c5c09fc61b fix mediaType of object
5 years ago
Alex Gleason 9a3c74b244
Always accept deletions through SimplePolicy
5 years ago
rinpatch 5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop'
5 years ago
rinpatch c077ad0b33 Remove User.upgrade_changeset in favor of remote_user_creation
5 years ago
Egor Kislitsyn cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
Haelwenn 4d33e0bd50 Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier e89078ac2a
User: remove source_data
5 years ago
Haelwenn (lanodan) Monnier 3420dec494
Remove User.fields/1
5 years ago
Haelwenn (lanodan) Monnier 9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Haelwenn (lanodan) Monnier 62656ab259
User: Move inbox & shared_inbox to own fields
5 years ago
lain 2cc6841424 ChatController: Basic message posting.
5 years ago
lain e8fd0dd689 ChatController: Basic support for returning messages.
5 years ago
lain 68abea313d ChatController: Add creation and return of chats.
5 years ago
Egor Kislitsyn d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
lain d35e114acd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain 8e637ae1a7 CommonAPI: Basic ChatMessage support.
5 years ago
lain 4b04785071 SideEffects: Extend ChatMessage test.
5 years ago
lain 2e78686686 SideEffects: Handle ChatMessage creation.
5 years ago
lain b87b798ca1 Merge branch 'fix/1658-invite-send' into 'develop'
5 years ago
Alexander Strizhakov 9795ff5b01 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
5 years ago
Alexander Strizhakov 365c34a7a9 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
5 years ago
lain d2e21fbc96 Merge branch 'open-api' into 'develop'
5 years ago
rinpatch d067eaa7b3 formatter.ex: Use Phoenix.HTML for mention/hashtag generation
5 years ago
lain 3775683a04 ChatMessage: Basic incoming handling.
5 years ago
rinpatch dd4d10b275 Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
5 years ago
Maksim Pechnikov 2b7d7bbd2d Merge branch 'develop' into issue/1276
5 years ago
kPherox 06471940e0 Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
5 years ago
lain 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop'
5 years ago
lain 349b9d86dc Merge branch 'remake-remodel-2' into 'develop'
5 years ago
Ivan Tashkinov fc81e5a49c Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
5 years ago
Ivan Tashkinov aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Maksim Pechnikov dbcfac11b4 Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn 23219e6fb3
Add OpenAPI
5 years ago
Alexander Strizhakov 2d64500a9d
error improvement for email_invite endpoint
5 years ago
Ivan Tashkinov 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
feld ef7d2b0f11 Merge branch 'gun' into 'develop'
5 years ago
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
5 years ago
rinpatch bfec45bf74 Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
5 years ago
Alexander Strizhakov 94ddbe4098
restrict remote users from indexing
5 years ago
Haelwenn (lanodan) Monnier 185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn (lanodan) Monnier b30fb1f3bb
User: Fix use of source_data in profile_url/1
5 years ago
Haelwenn (lanodan) Monnier 2553400a66
Initial failing test statement against funkwhale channels
5 years ago
kPherox dbf9d719f9
split test for update profile fields
5 years ago
lain aebec1bac9 Validator Test: Small refactor.
5 years ago
Alexander Strizhakov df5f89c0d6
test for default features and changelog entry
5 years ago
lain 643f15e77b Validators: ObjectID is an http uri.
5 years ago
Alexander Strizhakov b607ae1a1c
removing grouped reports admin api endpoint
5 years ago
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Haelwenn e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop'
5 years ago
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov be9d18461a FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov dfbc05d496 Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
lain 0adaab8e75 Bump copyright dates.
5 years ago
Ivan Tashkinov ff1baae7e9 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov 460e41585c Further preloading (more endpoints), refactoring, tests.
5 years ago
Egor Kislitsyn 9081a071ee
Add a test for accounts/update_credentials
5 years ago
Haelwenn (lanodan) Monnier 03a18cf037
node_info_test: Bump default features list
5 years ago
Haelwenn (lanodan) Monnier 212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
5 years ago
Haelwenn (lanodan) Monnier 64165d1df9
node_info_test.exs: Add test on the default feature list
5 years ago
Ivan Tashkinov 8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov 13cbb9f6ad Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
feld 8eebc75c15 Merge branch 'fix/activity-deletion' into 'develop'
5 years ago
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop'
5 years ago
Egor Kislitsyn 4a2538967c
Support pagination in conversations
5 years ago
Egor Kislitsyn d1a9716a98
Fix activity deletion
5 years ago
lain eec1fcaf55 Home timeline tests: Add failing test for relationships
5 years ago
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Haelwenn (lanodan) Monnier 15be6ba9c2
AccountView: fix for other forms of <br> in bio
5 years ago
Alexander Strizhakov 9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
lain d74405fc1a Merge branch 'fix-feed-pagination' into 'develop'
5 years ago
Ivan Tashkinov 1c05f539aa Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
Ivan Tashkinov 0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
5 years ago
lain 6c1232b486 NotificationController: Fix test.
5 years ago
lain 1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
Alexander Strizhakov fe15f0ba15
restrict_unauthenticated setting
5 years ago
Alexander Strizhakov 98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
Haelwenn (lanodan) Monnier a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
5 years ago
Haelwenn (lanodan) Monnier c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
5 years ago
lain 3c2c32b460 Merge branch 'remake-remodel' into develop
5 years ago
Haelwenn (lanodan) Monnier f9d622d25a
WIP
5 years ago
Ivan Tashkinov ec3719f539 Improved in-test config management functions.
5 years ago
Alexander Strizhakov f9ecb513fa
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media
5 years ago
eugenijm 13cce9c0de Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
eugenijm d198e7fa2a Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
5 years ago
Alexander Strizhakov f3791add99
removing with_move parameter
5 years ago
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 89e4b3ebbd
fix for content-type header for tag feed
5 years ago
Alexander Strizhakov 91870c8995
adding rss for user feed
5 years ago
Alexander Strizhakov 26e2076659
fix for feed page pagination
5 years ago
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
5 years ago
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
5 years ago
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
5 years ago
Haelwenn 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
5 years ago
rinpatch e87a32bcd7 rip out fetch_initial_posts
5 years ago
Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch fc4496d4fa rate limiter: disable based on if remote ip was found, not on if the plug was enabled
5 years ago
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead
5 years ago
feld 802b991814 Merge branch 'exclude-posts-visible-to-admin' into 'develop'
5 years ago
Alexander Strizhakov 39ed608b13
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
feld 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop'
5 years ago