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.
lain [Tue, 5 May 2020 13:08:41 +0000 (15:08 +0200)]
Undoing: Move undoing likes to the pipeline everywhere.
lain [Tue, 5 May 2020 12:17:47 +0000 (14:17 +0200)]
UndoValidator: Add UndoValidator.
lain [Tue, 5 May 2020 11:25:34 +0000 (13:25 +0200)]
Transmogrifier tests: Extract Undo handling
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
feld [Mon, 4 May 2020 20:24:08 +0000 (20:24 +0000)]
Merge branch 'feature/update-labels-for-activating-settings' into 'develop'
Fix inconsistency in language for activating settings in description.exs
Closes admin-fe#108
See merge request pleroma/pleroma!2469
Angelina Filippova [Mon, 4 May 2020 19:41:14 +0000 (22:41 +0300)]
Fix inconsistency in language for activating settings
rinpatch [Mon, 4 May 2020 15:47:04 +0000 (15:47 +0000)]
Merge branch 'feature/favorite-refactor' into 'develop'
Like activities: Move fixes to validator.
See merge request pleroma/pleroma!2467
lain [Mon, 4 May 2020 15:18:38 +0000 (17:18 +0200)]
Transmogrifier: Rely on LikeValidator.
lain [Mon, 4 May 2020 15:18:17 +0000 (17:18 +0200)]
LikeValidator: Fix up context.
lain [Mon, 4 May 2020 15:08:31 +0000 (17:08 +0200)]
LikeValidator: Fix up missing recipients.
lain [Mon, 4 May 2020 12:45:28 +0000 (14:45 +0200)]
Transmogrifier tests: Extract like tests.
lain [Mon, 4 May 2020 12:34:19 +0000 (14:34 +0200)]
Pipeline: Move transctioning to common pipeline.
lain [Mon, 4 May 2020 12:22:54 +0000 (14:22 +0200)]
ActivityPub: Don't fetch `Application` follower counts.
Mark Felder [Sat, 2 May 2020 18:28:10 +0000 (13:28 -0500)]
Only update follower/following stats for actor types of users and bots.
lain [Sat, 2 May 2020 18:10:50 +0000 (18:10 +0000)]
Replace deprecated Roma by Fedi.
rinpatch [Sat, 2 May 2020 16:44:55 +0000 (16:44 +0000)]
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
rinpatch [Thu, 30 Apr 2020 21:33:04 +0000 (00:33 +0300)]
CHANGELOG.md: Add entry for re-registration ban
rinpatch [Thu, 30 Apr 2020 21:28:28 +0000 (00:28 +0300)]
Reword changelog entry for follow relationship bug
eugenijm [Mon, 27 Apr 2020 14:41:38 +0000 (17:41 +0300)]
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
rinpatch [Wed, 29 Apr 2020 11:26:31 +0000 (14:26 +0300)]
Deactivate local users on deletion instead of deleting the record
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
rinpatch [Sat, 2 May 2020 15:39:31 +0000 (15:39 +0000)]
Merge branch 'fix/1732-authless-following-followers' into 'develop'
[FIX] [#1732] Made AP C2S :followers and :following endpoints serve on no auth
Closes #1732
See merge request pleroma/pleroma!2463
Ivan Tashkinov [Sat, 2 May 2020 15:28:04 +0000 (18:28 +0300)]
[#1732] Made AP C2S :followers and :following endpoints serve on no auth
(as for related :api pipeline endpoints).
rinpatch [Sat, 2 May 2020 12:24:49 +0000 (12:24 +0000)]
Merge branch 'follow-request-notifications' into 'develop'
Follow request notifications enforcement
See merge request pleroma/pleroma!2451
rinpatch [Sat, 2 May 2020 12:24:22 +0000 (12:24 +0000)]
Merge branch 'pleroma-fe-2020-05-02-
5f90b6a3' into 'develop'
PleromaFE bundle supporting follow request notifications
See merge request pleroma/pleroma!2462
Ivan Tashkinov [Sat, 2 May 2020 11:37:40 +0000 (14:37 +0300)]
PleromaFE bundle supporting follow request notifications.
https://git.pleroma.social/pleroma/pleroma-fe/-/commit/
5f90b6a384583a00769eeca3a6c6e2deec8bdd24
Haelwenn [Sat, 2 May 2020 06:37:33 +0000 (06:37 +0000)]
Merge branch 'bugfix/static-fe.css' into 'develop'
static-fe.css: Restore and move to /priv/static/static-fe
See merge request pleroma/pleroma!2458
Haelwenn (lanodan) Monnier [Fri, 1 May 2020 19:15:43 +0000 (21:15 +0200)]
static-fe.css: Restore and move to /priv/static/static-fe
Ivan Tashkinov [Sat, 2 May 2020 04:39:19 +0000 (07:39 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
rinpatch [Fri, 1 May 2020 22:01:35 +0000 (22:01 +0000)]
Merge branch 'fix/sporadic-test-failure-alias' into 'develop'
Fix sporadic test compilation failure caused by unused alias
See merge request pleroma/pleroma!2460
rinpatch [Fri, 1 May 2020 20:22:37 +0000 (20:22 +0000)]
Merge branch 'fix/notificatons-follow-request-validation' into 'develop'
OpenAPI: Add `follow_request` to notification types
Closes #1731
See merge request pleroma/pleroma!2459
rinpatch [Fri, 1 May 2020 19:48:30 +0000 (22:48 +0300)]
OpenAPI: Add `follow_request` to notification types
Closes #1731
rinpatch [Fri, 1 May 2020 19:50:40 +0000 (22:50 +0300)]
Fix sporadic test compilation failure caused by unused alias
lain [Fri, 1 May 2020 18:46:18 +0000 (18:46 +0000)]
Merge branch 'fix/openapi-limit' into 'develop'
OpenAPI: Remove max pagination limit from the spec
See merge request pleroma/pleroma!2457
rinpatch [Fri, 1 May 2020 18:33:34 +0000 (21:33 +0300)]
OpenAPI: Remove max pagination limit from the spec
In an ideal world clients wouldn't try to request more than the max
hardcoded limit, but SubwayTooter does.
rinpatch [Fri, 1 May 2020 16:48:31 +0000 (16:48 +0000)]
Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'
Bugfix/1727 fix signature decoding
Closes #1727
See merge request pleroma/pleroma!2454
lain [Fri, 1 May 2020 15:38:36 +0000 (15:38 +0000)]
Merge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop'
Notifications loading fix (PleromaFE)
See merge request pleroma/pleroma!2455
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:58:47 +0000 (15:58 +0200)]
MappedSignatureToIdentityPlug: Fix.
lain [Fri, 1 May 2020 13:54:38 +0000 (15:54 +0200)]
Signature: Handle non-ap ids in key ids.
Mastodon and Gab sometimes send the format `acct:name@server`.
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
Ivan Tashkinov [Fri, 1 May 2020 06:51:41 +0000 (09:51 +0300)]
Made follow request notifications non-optional (removed config switch).
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
lain [Mon, 27 Apr 2020 12:35:12 +0000 (14:35 +0200)]
Changelog: Add info about `/api/v1/instance` changes
lain [Mon, 27 Apr 2020 12:33:21 +0000 (14:33 +0200)]
Docs: Add `/api/v1/instance` information
lain [Mon, 27 Apr 2020 12:28:08 +0000 (14:28 +0200)]
InstanceController: Add extensions to `/api/v1/instance`
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.
projects / akkoma / log