Ivan Tashkinov [Fri, 1 May 2020 14:59:29 +0000 (17:59 +0300)]
Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).
lain [Fri, 1 May 2020 13:09:36 +0000 (13:09 +0000)]
Merge branch 'openapi/notifications' into 'develop'
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
lain [Fri, 1 May 2020 12:48:56 +0000 (12:48 +0000)]
Merge branch 'openapi/reports' into 'develop'
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
lain [Fri, 1 May 2020 12:38:46 +0000 (12:38 +0000)]
Merge branch 'issue/1577' into 'develop'
[#1577] fix mediaType of object
See merge request pleroma/pleroma!2372
lain [Fri, 1 May 2020 11:47:58 +0000 (11:47 +0000)]
Merge branch 'fix/captcha' into 'develop'
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
rinpatch [Thu, 30 Apr 2020 22:33:56 +0000 (22:33 +0000)]
Merge branch 'update/admin-fe-
20200429' into 'develop'
Update AdminFE build in preparation for the 2.0.3 release
See merge request pleroma/pleroma!2442
lain [Thu, 30 Apr 2020 22:19:26 +0000 (22:19 +0000)]
Merge branch 'tests/more-apc2s' into 'develop'
Increase tests on AP C2S
See merge request pleroma/pleroma!2449
lain [Thu, 30 Apr 2020 18:38:52 +0000 (18:38 +0000)]
Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
Dismiss the follow request notification on rejection
See merge request pleroma/pleroma!2447
Haelwenn (lanodan) Monnier [Thu, 30 Apr 2020 16:55:25 +0000 (18:55 +0200)]
Increase tests on AP C2S
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
Haelwenn [Thu, 30 Apr 2020 16:09:51 +0000 (16:09 +0000)]
Merge branch 'emoji-upload' into 'develop'
Updated emoji API endpoints
Closes #1649, #1604, and #1545
See merge request pleroma/pleroma!2179
eugenijm [Thu, 30 Apr 2020 12:02:35 +0000 (15:02 +0300)]
Dismiss the follow request notification on rejection
Alexander Strizhakov [Thu, 30 Apr 2020 14:50:57 +0000 (17:50 +0300)]
fix for auth check
Alexander Strizhakov [Wed, 1 Apr 2020 10:57:27 +0000 (13:57 +0300)]
docs update
Alexander Strizhakov [Tue, 31 Mar 2020 08:38:37 +0000 (11:38 +0300)]
docs fix
Alexander Strizhakov [Mon, 30 Mar 2020 07:07:37 +0000 (10:07 +0300)]
list of options for pack metadata
Alexander Strizhakov [Mon, 30 Mar 2020 06:09:27 +0000 (09:09 +0300)]
error rename
Alexander Strizhakov [Sat, 28 Mar 2020 18:21:23 +0000 (21:21 +0300)]
changelog entry
Alexander Strizhakov [Sat, 28 Mar 2020 18:15:14 +0000 (21:15 +0300)]
emoji api packs changes in routes with docs update
Alexander Strizhakov [Sat, 28 Mar 2020 12:00:48 +0000 (15:00 +0300)]
removing entry from changelog
Alexander Strizhakov [Sat, 28 Mar 2020 10:55:17 +0000 (13:55 +0300)]
docs update
Alexander Strizhakov [Sat, 28 Mar 2020 10:34:32 +0000 (13:34 +0300)]
refactor emoji api with fixes
Alexander Strizhakov [Thu, 6 Feb 2020 15:01:12 +0000 (18:01 +0300)]
return data only for updated emoji
lain [Thu, 30 Apr 2020 10:29:46 +0000 (10:29 +0000)]
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
[#1364] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367
Egor Kislitsyn [Thu, 30 Apr 2020 09:52:07 +0000 (13:52 +0400)]
Merge branch 'develop' into openapi/notifications
Egor Kislitsyn [Thu, 30 Apr 2020 09:51:27 +0000 (13:51 +0400)]
Merge branch 'develop' into openapi/reports
rinpatch [Wed, 29 Apr 2020 22:01:17 +0000 (22:01 +0000)]
Merge branch 'fix/add-exclude-replies-openapi' into 'develop'
Add exlude_replies to OpenAPI spec for account timelines
See merge request pleroma/pleroma!2443
rinpatch [Wed, 29 Apr 2020 21:49:59 +0000 (00:49 +0300)]
Add exlude_replies to OpenAPI spec for account timelines
Mark Felder [Wed, 29 Apr 2020 20:49:48 +0000 (15:49 -0500)]
Update AdminFE build in preparation for the 2.0.3 release
Egor Kislitsyn [Wed, 29 Apr 2020 17:01:16 +0000 (21:01 +0400)]
Change Pleroma.CaptchaTest to be a regular module instead of GenServer
Egor Kislitsyn [Wed, 29 Apr 2020 16:48:08 +0000 (20:48 +0400)]
Add tests for account registration with captcha enabled and improve errors
Egor Kislitsyn [Wed, 29 Apr 2020 10:31:13 +0000 (14:31 +0400)]
Fix account registration when captcha is enabled but not provided
Egor Kislitsyn [Wed, 29 Apr 2020 10:30:07 +0000 (14:30 +0400)]
Document `captcha_answer_data` parameter
lain [Wed, 29 Apr 2020 11:09:30 +0000 (11:09 +0000)]
Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'
Automatic checks of authentication / authorization / instance publicity
See merge request pleroma/pleroma!2409
Maksim Pechnikov [Wed, 29 Apr 2020 05:13:10 +0000 (08:13 +0300)]
added test
Egor Kislitsyn [Tue, 28 Apr 2020 17:27:54 +0000 (21:27 +0400)]
Add OpenAPI spec for NotificationController
Ivan Tashkinov [Tue, 28 Apr 2020 17:04:25 +0000 (20:04 +0300)]
[#2349] Post-merge fix.
Ivan Tashkinov [Tue, 28 Apr 2020 16:56:20 +0000 (19:56 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lain [Tue, 28 Apr 2020 15:40:18 +0000 (15:40 +0000)]
Merge branch 'docs/notification_destroy_multiple' into 'develop'
Document DELETE /api/v1/notifications/destroy_multiple
Closes #1711
See merge request pleroma/pleroma!2435
Mark Felder [Tue, 28 Apr 2020 15:13:58 +0000 (10:13 -0500)]
Document DELETE /api/v1/notifications/destroy_multiple
Egor Kislitsyn [Tue, 28 Apr 2020 12:50:37 +0000 (16:50 +0400)]
Add OpenAPI spec for ReportController
rinpatch [Tue, 28 Apr 2020 11:57:16 +0000 (11:57 +0000)]
Merge branch 'openapi/account' into 'develop'
Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374
lain [Tue, 28 Apr 2020 09:18:59 +0000 (09:18 +0000)]
Merge branch 'mongoose-secure' into 'develop'
mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432
Maksim Pechnikov [Tue, 28 Apr 2020 06:32:43 +0000 (09:32 +0300)]
convert markdown content to html
fence [Mon, 27 Apr 2020 23:29:31 +0000 (01:29 +0200)]
formating
Egor Kislitsyn [Mon, 27 Apr 2020 18:55:05 +0000 (22:55 +0400)]
Move single used schemas to operation schema
fence [Mon, 27 Apr 2020 17:32:58 +0000 (19:32 +0200)]
mongooseim test: explicitly set password for the deactivated used
fence [Mon, 27 Apr 2020 17:16:05 +0000 (19:16 +0200)]
requested changes to mongoose test
fence [Mon, 27 Apr 2020 17:11:03 +0000 (19:11 +0200)]
requested changes to mongoose_im_controller.ex
Egor Kislitsyn [Mon, 27 Apr 2020 16:46:52 +0000 (20:46 +0400)]
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
fence [Mon, 27 Apr 2020 16:31:00 +0000 (18:31 +0200)]
add tests for deactivated users for mongoose auth
fence [Mon, 27 Apr 2020 15:55:33 +0000 (17:55 +0200)]
secure mongoose auth endpoint
Egor Kislitsyn [Mon, 27 Apr 2020 10:33:00 +0000 (14:33 +0400)]
Merge branch 'develop' into openapi/account
rinpatch [Sun, 26 Apr 2020 11:39:17 +0000 (11:39 +0000)]
Merge branch 'img-src-blob' into 'develop'
Let blob: pass CSP
See merge request pleroma/pleroma!2427
Alex Gleason [Sun, 26 Apr 2020 05:28:57 +0000 (00:28 -0500)]
Let blob: pass CSP
lain [Sat, 25 Apr 2020 19:24:22 +0000 (19:24 +0000)]
Merge branch '1706-dm-timeline-failure-fix' into 'develop'
[#1706] Prevented error on unresolved activity actors for timeline actions
Closes #1706
See merge request pleroma/pleroma!2425
Ivan Tashkinov [Sat, 25 Apr 2020 15:42:08 +0000 (18:42 +0300)]
[#1706] Formatting fix.
Ivan Tashkinov [Sat, 25 Apr 2020 15:24:10 +0000 (18:24 +0300)]
[#1706] Prevented error on unresolved activity actors for timeline actions.
Ivan Tashkinov [Fri, 24 Apr 2020 19:25:27 +0000 (22:25 +0300)]
[#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
rinpatch [Fri, 24 Apr 2020 16:58:24 +0000 (16:58 +0000)]
Merge branch 'bugfix/announce-race-condition' into 'develop'
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
lain [Fri, 24 Apr 2020 16:32:13 +0000 (16:32 +0000)]
Merge branch 'reply-filtering-refactor' into 'develop'
Reply filtering refactor
See merge request pleroma/pleroma!2424
lain [Fri, 24 Apr 2020 16:25:26 +0000 (18:25 +0200)]
Reply Filtering: Refactor.
lain [Fri, 24 Apr 2020 16:10:43 +0000 (16:10 +0000)]
Merge branch 'openapi-improvements' into 'develop'
Support validation for inline OpenAPI schema and automatic tests for examples
Closes #1696
See merge request pleroma/pleroma!2421
Ivan Tashkinov [Fri, 24 Apr 2020 13:52:38 +0000 (16:52 +0300)]
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
lain [Fri, 24 Apr 2020 10:27:51 +0000 (10:27 +0000)]
Apply suggestion to CHANGELOG.md
lain [Fri, 24 Apr 2020 10:26:54 +0000 (10:26 +0000)]
Update differences_in_mastoapi_responses.md
Alexander Strizhakov [Fri, 24 Apr 2020 06:57:30 +0000 (09:57 +0300)]
bench sync
Alexander Strizhakov [Fri, 24 Apr 2020 06:24:08 +0000 (09:24 +0300)]
updating benchmarks
Alexander [Wed, 4 Dec 2019 07:29:26 +0000 (10:29 +0300)]
formatting
Alexander [Wed, 4 Dec 2019 06:49:17 +0000 (09:49 +0300)]
reply filtering
lain [Fri, 24 Apr 2020 12:37:53 +0000 (14:37 +0200)]
Announcements: Prevent race condition.
lain [Fri, 24 Apr 2020 12:09:15 +0000 (12:09 +0000)]
Merge branch 'feature/remove-unused-like-code' into 'develop'
ActivitPub: Remove `like` function.
See merge request pleroma/pleroma!2422
lain [Fri, 24 Apr 2020 11:59:48 +0000 (13:59 +0200)]
Credo fixes.
lain [Fri, 24 Apr 2020 11:48:13 +0000 (13:48 +0200)]
ActivitPub: Remove `like` function.
We don't need another way to build likes.
Egor Kislitsyn [Fri, 24 Apr 2020 10:46:59 +0000 (14:46 +0400)]
Support validation for inline OpenAPI schema and automatic tests for examples
Ivan Tashkinov [Thu, 23 Apr 2020 18:47:33 +0000 (21:47 +0300)]
[#2409] Fixed before-action callback results persistence.
rinpatch [Thu, 23 Apr 2020 12:40:38 +0000 (12:40 +0000)]
Merge branch 'bugfix/repeating-announce' into 'develop'
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
lain [Thu, 23 Apr 2020 11:33:30 +0000 (13:33 +0200)]
CommonAPI: Don't make repeating announces possible
rinpatch [Thu, 23 Apr 2020 11:22:30 +0000 (11:22 +0000)]
Merge branch 'bugfix/null-scheduled-at' into 'develop'
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
lain [Wed, 22 Apr 2020 19:26:32 +0000 (19:26 +0000)]
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
lain [Wed, 22 Apr 2020 19:21:21 +0000 (21:21 +0200)]
SideEffects: Use less cryptic syntax.
Haelwenn [Wed, 22 Apr 2020 17:37:09 +0000 (17:37 +0000)]
Merge branch 'bugfix/1670-user-count' into 'develop'
Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414
lain [Wed, 22 Apr 2020 17:02:22 +0000 (19:02 +0200)]
Stats: Use `invisible` property for filtering.
Ivan Tashkinov [Wed, 22 Apr 2020 17:00:51 +0000 (20:00 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
lain [Wed, 22 Apr 2020 16:40:53 +0000 (18:40 +0200)]
SideEffects: Run in transaction.
This fixes race conditions.
Egor Kislitsyn [Wed, 22 Apr 2020 16:20:19 +0000 (20:20 +0400)]
Update Flake ID description
Egor Kislitsyn [Wed, 22 Apr 2020 16:18:12 +0000 (20:18 +0400)]
Merge branch 'develop' into openapi/account
Ivan Tashkinov [Wed, 22 Apr 2020 15:51:59 +0000 (18:51 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Ivan Tashkinov [Wed, 22 Apr 2020 15:50:25 +0000 (18:50 +0300)]
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
Haelwenn [Wed, 22 Apr 2020 15:46:04 +0000 (15:46 +0000)]
Merge branch 'fix/follow-and-blocks-import' into 'develop'
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
Haelwenn [Wed, 22 Apr 2020 15:33:04 +0000 (15:33 +0000)]
Merge branch 'bugfix/following-fix-status-code' into 'develop'
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
Haelwenn [Wed, 22 Apr 2020 15:31:51 +0000 (15:31 +0000)]
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415
Ivan Tashkinov [Wed, 22 Apr 2020 15:31:41 +0000 (15:31 +0000)]
Apply suggestion to lib/pleroma/notification.ex
Egor Kislitsyn [Wed, 22 Apr 2020 15:31:03 +0000 (19:31 +0400)]
Update CHANGELOG
Egor Kislitsyn [Wed, 22 Apr 2020 15:00:08 +0000 (19:00 +0400)]
Fix Oban warning
Warning example:
[warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.
Egor Kislitsyn [Wed, 22 Apr 2020 14:13:13 +0000 (18:13 +0400)]
Fix blocks import
Egor Kislitsyn [Tue, 21 Apr 2020 16:05:25 +0000 (20:05 +0400)]
Fix follow import
lain [Wed, 22 Apr 2020 15:21:13 +0000 (17:21 +0200)]
Streamer: Stream boosts to the boosting user.
Haelwenn [Wed, 22 Apr 2020 15:12:19 +0000 (15:12 +0000)]
Merge branch 'feature/voters-count' into 'develop'
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
Haelwenn [Wed, 22 Apr 2020 15:09:10 +0000 (15:09 +0000)]
Merge branch 'worker-messages' into 'develop'
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
lain [Wed, 22 Apr 2020 14:10:55 +0000 (14:10 +0000)]
Merge branch 'microformats' into 'develop'
static_fe: Add microformats2 classes
See merge request pleroma/pleroma!2215