Ivan Tashkinov [Sat, 9 May 2020 15:05:44 +0000 (18:05 +0300)]
[#2456] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
Ivan Tashkinov [Fri, 8 May 2020 18:37:55 +0000 (21:37 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
rinpatch [Fri, 8 May 2020 15:00:43 +0000 (15:00 +0000)]
Merge branch 'bugfix/fix-like-notifications' into 'develop'
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
lain [Fri, 8 May 2020 10:41:41 +0000 (10:41 +0000)]
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
lain [Fri, 8 May 2020 09:43:07 +0000 (11:43 +0200)]
Transmogrifier tests: Remove more double tests.
lain [Fri, 8 May 2020 09:41:13 +0000 (11:41 +0200)]
Transmogrifier tests: Remove double tests.
lain [Fri, 8 May 2020 09:30:31 +0000 (11:30 +0200)]
Builder: Extract common features of likes and reactions.
lain [Fri, 8 May 2020 09:23:01 +0000 (09:23 +0000)]
Merge branch 'issue/1276-2' into 'develop'
[#1276] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
Maksim Pechnikov [Fri, 8 May 2020 09:06:24 +0000 (12:06 +0300)]
revert mix.lock
lain [Fri, 8 May 2020 09:04:24 +0000 (09:04 +0000)]
Merge branch 'fix/privacy-notification' into 'develop'
Privacy option affects all push notifications, not just Direct Messages
Closes #1745
See merge request pleroma/pleroma!2485
Maksim Pechnikov [Fri, 8 May 2020 05:51:09 +0000 (08:51 +0300)]
Merge branch 'develop' into issue/1276-2
Haelwenn [Thu, 7 May 2020 22:29:16 +0000 (22:29 +0000)]
Merge branch 'feature/restrict-c2s' into 'develop'
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
lain [Thu, 7 May 2020 16:53:34 +0000 (18:53 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
rinpatch [Thu, 7 May 2020 14:28:10 +0000 (14:28 +0000)]
Merge branch 'feature/undo-validator-reduced' into 'develop'
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
Mark Felder [Thu, 7 May 2020 14:13:43 +0000 (09:13 -0500)]
Test Direct, Public, and Favorite notifications with privacy option
lain [Thu, 7 May 2020 13:38:34 +0000 (13:38 +0000)]
Merge branch 'openapi/search' into 'develop'
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
rinpatch [Thu, 7 May 2020 13:26:29 +0000 (13:26 +0000)]
Merge branch 'fix/streamer-wrong-arg-order' into 'develop'
Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
See merge request pleroma/pleroma!2490
rinpatch [Thu, 7 May 2020 13:13:24 +0000 (16:13 +0300)]
Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
lain [Thu, 7 May 2020 13:09:37 +0000 (15:09 +0200)]
Credo fixes
lain [Thu, 7 May 2020 13:03:12 +0000 (15:03 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
lain [Thu, 7 May 2020 12:52:37 +0000 (14:52 +0200)]
Merge fixes.
lain [Thu, 7 May 2020 12:45:35 +0000 (14:45 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
lain [Thu, 7 May 2020 12:45:20 +0000 (14:45 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
rinpatch [Thu, 7 May 2020 11:47:11 +0000 (11:47 +0000)]
Merge branch 'fix/downgraded-deps' into 'develop'
Restore mix.lock after 2FA merge
See merge request pleroma/pleroma!2487
rinpatch [Thu, 7 May 2020 11:35:29 +0000 (14:35 +0300)]
Restore mix.lock after 2FA merge
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
lain [Thu, 7 May 2020 11:01:52 +0000 (11:01 +0000)]
Apply suggestion to lib/pleroma/notification.ex
lain [Thu, 7 May 2020 10:48:09 +0000 (10:48 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex
lain [Thu, 7 May 2020 10:43:30 +0000 (12:43 +0200)]
Notifications: Simplify recipient calculation for some Activities.
Fixes the 'getting notfications for other people's posts' bug.
Egor Kislitsyn [Thu, 7 May 2020 10:04:48 +0000 (14:04 +0400)]
Add OpenAPI spec for SearchController
Egor Kislitsyn [Wed, 6 May 2020 15:20:26 +0000 (19:20 +0400)]
Add schema for Tag
lain [Thu, 7 May 2020 09:19:45 +0000 (09:19 +0000)]
Merge branch 'openapi/polls' into 'develop'
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
lain [Thu, 7 May 2020 09:13:32 +0000 (09:13 +0000)]
Merge branch 'streamer-worker-registry' into 'develop'
Streamer rework
See merge request pleroma/pleroma!2426
href [Thu, 7 May 2020 09:13:32 +0000 (09:13 +0000)]
Streamer rework
lain [Thu, 7 May 2020 08:14:54 +0000 (08:14 +0000)]
Merge branch 'issue/209' into 'develop'
[#209] 2FA/two_factor_authentication support
See merge request pleroma/pleroma!801
Maksim [Thu, 7 May 2020 08:14:54 +0000 (08:14 +0000)]
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
Mark Felder [Wed, 6 May 2020 21:42:27 +0000 (16:42 -0500)]
Hide the sender when privacy option is enabled
Mark Felder [Wed, 6 May 2020 21:30:05 +0000 (16:30 -0500)]
Privacy option affects all push notifications, not just Direct Messages
lain [Wed, 6 May 2020 15:44:21 +0000 (15:44 +0000)]
Merge branch 'fix/syslog-compile' into 'develop'
Fix for syslog compile with updated rebar3
See merge request pleroma/pleroma!2482
Alexander Strizhakov [Wed, 6 May 2020 15:04:16 +0000 (18:04 +0300)]
fix for syslog compile with updated rebar3
feld [Wed, 6 May 2020 14:42:55 +0000 (14:42 +0000)]
Merge branch 'docs/chat-in-cheatsheet' into 'develop'
Add :chat to cheatsheet
See merge request pleroma/pleroma!2480
rinpatch [Wed, 6 May 2020 14:32:58 +0000 (14:32 +0000)]
Merge branch 'feature/delete-validator' into 'develop'
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
Mark Felder [Wed, 6 May 2020 13:55:09 +0000 (08:55 -0500)]
Add :chat to cheatsheet
feld [Wed, 6 May 2020 13:33:24 +0000 (13:33 +0000)]
Merge branch 'fix/apache-cert-chain' into 'develop'
Apache chain issue fix
See merge request pleroma/pleroma!2478
Alexander Strizhakov [Wed, 6 May 2020 13:20:47 +0000 (16:20 +0300)]
apache chain issue fix
Maksim Pechnikov [Wed, 6 May 2020 12:08:38 +0000 (15:08 +0300)]
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
Maksim Pechnikov [Wed, 6 May 2020 11:47:50 +0000 (14:47 +0300)]
Merge branch 'develop' into issue/1276-2
Egor Kislitsyn [Wed, 6 May 2020 10:18:19 +0000 (14:18 +0400)]
Fix description
lain [Wed, 6 May 2020 09:14:05 +0000 (09:14 +0000)]
Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
Refactoring of :if_func / :unless_func plug options
See merge request pleroma/pleroma!2446
lain [Wed, 6 May 2020 09:10:17 +0000 (09:10 +0000)]
Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
lain [Wed, 6 May 2020 09:06:50 +0000 (09:06 +0000)]
Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
lain [Wed, 6 May 2020 09:04:13 +0000 (09:04 +0000)]
Merge branch 'bugfix/sensitive_object' into 'develop'
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
lain [Wed, 6 May 2020 09:01:42 +0000 (09:01 +0000)]
Merge branch 'fix/1726-user-pagination' into 'develop'
Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452
lain [Wed, 6 May 2020 09:00:39 +0000 (09:00 +0000)]
Merge branch 'openapi/follow_requests' into 'develop'
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
lain [Wed, 6 May 2020 08:51:10 +0000 (08:51 +0000)]
Merge branch 'openapi/filters' into 'develop'
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
lain [Wed, 6 May 2020 08:46:45 +0000 (08:46 +0000)]
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
lain [Wed, 6 May 2020 08:46:14 +0000 (08:46 +0000)]
Merge branch 'openapi/instance' into 'develop'
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
lain [Wed, 6 May 2020 08:43:21 +0000 (08:43 +0000)]
Merge branch 'openapi/lists' into 'develop'
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
lain [Wed, 6 May 2020 08:40:04 +0000 (08:40 +0000)]
Merge branch 'openapi/conversations' into 'develop'
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
Maksim Pechnikov [Wed, 6 May 2020 02:55:39 +0000 (05:55 +0300)]
Merge branch 'develop' into issue/1276-2
Haelwenn [Wed, 6 May 2020 01:04:50 +0000 (01:04 +0000)]
Merge branch 'openapi/scheduled_activities' into 'develop'
Add OpenAPI spec for ScheduledActivityController
See merge request pleroma/pleroma!2477
Egor Kislitsyn [Tue, 5 May 2020 19:42:18 +0000 (23:42 +0400)]
Add OpenAPI spec for ScheduledActivityController
Egor Kislitsyn [Tue, 5 May 2020 19:19:16 +0000 (23:19 +0400)]
Add Attachment schema
Egor Kislitsyn [Tue, 5 May 2020 16:14:22 +0000 (20:14 +0400)]
Add OpenAPI spec for PollController
lain [Tue, 5 May 2020 16:00:37 +0000 (18:00 +0200)]
Undoing: Move undoing blocks to the pipeline everywhere.
lain [Tue, 5 May 2020 14:42:34 +0000 (16:42 +0200)]
Undoing: Move undoing announcements to the pipeline everywhere.
lain [Tue, 5 May 2020 14:17:09 +0000 (16:17 +0200)]
Undoing: Move undoing reactions to the pipeline everywhere.
Egor Kislitsyn [Tue, 5 May 2020 13:44:46 +0000 (17:44 +0400)]
Add OpenAPI spec for ConversationController
Egor Kislitsyn [Tue, 28 Apr 2020 12:25:13 +0000 (16:25 +0400)]
Render mastodon-like errors in FilterController
Egor Kislitsyn [Mon, 27 Apr 2020 19:54:11 +0000 (23:54 +0400)]
Move single used schemas to Filter operation schema
Egor Kislitsyn [Tue, 14 Apr 2020 14:36:32 +0000 (18:36 +0400)]
Add OpenAPI spec for FilterController
lain [Tue, 5 May 2020 13:40:12 +0000 (13:40 +0000)]
Merge branch 'feature/1720-status-view' into 'develop'
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
Egor Kislitsyn [Tue, 5 May 2020 13:40:00 +0000 (17:40 +0400)]
Add OpenAPI spec for FollowRequestController
minibikini [Fri, 1 May 2020 12:46:56 +0000 (12:46 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
minibikini [Fri, 1 May 2020 12:46:53 +0000 (12:46 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
minibikini [Thu, 30 Apr 2020 17:45:48 +0000 (17:45 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
Egor Kislitsyn [Tue, 5 May 2020 13:24:16 +0000 (17:24 +0400)]
Add OpenAPI spec for InstanceController
Alexander Strizhakov [Tue, 5 May 2020 13:08:44 +0000 (16:08 +0300)]
admin_api fetch status by id
lain [Tue, 5 May 2020 13:08:41 +0000 (15:08 +0200)]
Undoing: Move undoing likes to the pipeline everywhere.
Egor Kislitsyn [Fri, 1 May 2020 15:53:00 +0000 (19:53 +0400)]
Fix descriptions for List API spec
Egor Kislitsyn [Tue, 5 May 2020 13:05:34 +0000 (17:05 +0400)]
Add OpenAPI spec for ListController
Egor Kislitsyn [Tue, 5 May 2020 12:45:34 +0000 (16:45 +0400)]
Move single used schemas to Marker operation schema
Egor Kislitsyn [Tue, 14 Apr 2020 18:50:29 +0000 (22:50 +0400)]
Add OpenAPI spec for MarkerController
Egor Kislitsyn [Tue, 5 May 2020 12:43:00 +0000 (16:43 +0400)]
Add OpenAPI spec for SubscriptionController
lain [Tue, 5 May 2020 12:17:47 +0000 (14:17 +0200)]
UndoValidator: Add UndoValidator.
rinpatch [Tue, 5 May 2020 12:10:10 +0000 (12:10 +0000)]
Merge branch 'feature/1737-magic-key-field' into 'develop'
User, Webfinger: Remove OStatus vestiges
Closes #1737
See merge request pleroma/pleroma!2471
rinpatch [Tue, 5 May 2020 12:08:58 +0000 (12:08 +0000)]
Merge branch 'openapi/validation-plug' into 'develop'
Ignore unexpected query params and ENUM values
Closes #1719
See merge request pleroma/pleroma!2468
lain [Tue, 5 May 2020 11:25:34 +0000 (13:25 +0200)]
Transmogrifier tests: Extract Undo handling
lain [Tue, 5 May 2020 11:17:44 +0000 (11:17 +0000)]
Apply suggestion to lib/pleroma/web/web_finger/web_finger.ex
Egor Kislitsyn [Tue, 5 May 2020 10:44:29 +0000 (14:44 +0400)]
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate
lain [Tue, 5 May 2020 10:28:28 +0000 (12:28 +0200)]
ActivityPub: Remove `react_with_emoji`.
lain [Tue, 5 May 2020 10:11:46 +0000 (12:11 +0200)]
Transmogrifier: Move emoji reactions to common pipeline.
lain [Tue, 5 May 2020 09:20:53 +0000 (11:20 +0200)]
Transmogrifier: Extract EmojiReact tests.
lain [Tue, 5 May 2020 08:38:59 +0000 (10:38 +0200)]
LikeValidator: Add defaults for recipients back in.
lain [Tue, 5 May 2020 08:21:39 +0000 (08:21 +0000)]
Merge branch 'fix/issue-1729' into 'develop'
Only update follower/following stats for actor types of users and bots.
Closes #1565 and #1729
See merge request pleroma/pleroma!2464
lain [Tue, 5 May 2020 08:19:01 +0000 (10:19 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
lain [Tue, 5 May 2020 08:12:37 +0000 (10:12 +0200)]
AP C2S: Restrict creation to `Note`s for now.
lain [Tue, 5 May 2020 07:55:33 +0000 (09:55 +0200)]
WebFinger Test: Add back test.
lain [Tue, 5 May 2020 07:36:38 +0000 (09:36 +0200)]
WebFinger: Add back in subscribe_address.
It's used for remote following.
lain [Tue, 5 May 2020 07:25:09 +0000 (09:25 +0200)]
User, Webfinger: Remove OStatus vestiges
Mainly the `magic_key` field
Haelwenn (lanodan) Monnier [Mon, 4 May 2020 21:32:53 +0000 (23:32 +0200)]
Transmogrifier.set_sensitive/1: Keep sensitive set to true
projects / akkoma / log