lain [Wed, 6 May 2020 15:36:08 +0000 (17:36 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
lain [Wed, 6 May 2020 14:31:21 +0000 (16:31 +0200)]
Credo fixes.
lain [Wed, 6 May 2020 14:12:36 +0000 (16:12 +0200)]
ChatMessages: Add attachments.
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
lain [Wed, 6 May 2020 09:44:30 +0000 (11:44 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
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
lain [Tue, 5 May 2020 18:07:47 +0000 (20:07 +0200)]
Chat: Fix missing chat id on second 'get'
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
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
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: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 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 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
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
Egor Kislitsyn [Mon, 4 May 2020 18:35:28 +0000 (22:35 +0400)]
Enable strict validation mode in dev and test environments
Egor Kislitsyn [Mon, 4 May 2020 18:33:34 +0000 (22:33 +0400)]
Render better errors for ENUM validation
Egor Kislitsyn [Mon, 4 May 2020 18:33:05 +0000 (22:33 +0400)]
Add a config option to enable strict validation
Egor Kislitsyn [Mon, 4 May 2020 17:46:25 +0000 (21:46 +0400)]
Ignore unexpected ENUM values in query string
lain [Mon, 4 May 2020 17:24:04 +0000 (19:24 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
minibikini [Mon, 4 May 2020 16:38:23 +0000 (16:38 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/cast_and_validate.ex
Egor Kislitsyn [Mon, 4 May 2020 16:16:18 +0000 (20:16 +0400)]
Ignore unexpected query params
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.
lain [Mon, 4 May 2020 11:12:21 +0000 (13:12 +0200)]
Docs: Add Chat mark_as_read docs
lain [Mon, 4 May 2020 11:10:36 +0000 (13:10 +0200)]
ChatController: Add mark_as_read
lain [Mon, 4 May 2020 10:53:40 +0000 (12:53 +0200)]
CommonAPI: Refactor for readability
lain [Mon, 4 May 2020 10:47:23 +0000 (12:47 +0200)]
ChatOperation: Make simple schema into inline schema
lain [Mon, 4 May 2020 10:22:31 +0000 (12:22 +0200)]
Update changelog
lain [Mon, 4 May 2020 09:32:11 +0000 (11:32 +0200)]
Credo fixes.
lain [Mon, 4 May 2020 09:08:00 +0000 (11:08 +0200)]
Schemas: Refactor to our naming scheme.
lain [Mon, 4 May 2020 08:43:20 +0000 (10:43 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Sun, 3 May 2020 13:28:24 +0000 (15:28 +0200)]
Types.Recipients: Simplify reducer.
lain [Sun, 3 May 2020 12:58:24 +0000 (14:58 +0200)]
Credo fixes.
lain [Sun, 3 May 2020 11:48:01 +0000 (13:48 +0200)]
Webfinger: Request account info with the acct scheme
lain [Sun, 3 May 2020 11:02:57 +0000 (13:02 +0200)]
DeleteValidator: The deleted activity id is an object id
lain [Sun, 3 May 2020 11:01:19 +0000 (13:01 +0200)]
Various testing fixes in relation to user deletion.
lain [Sun, 3 May 2020 10:55:29 +0000 (12:55 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
lain [Sun, 3 May 2020 10:51:28 +0000 (12:51 +0200)]
Transmogrifier: Don't fetch actor that's guaranteed to be there.
Lain Soykaf [Sun, 3 May 2020 10:19:01 +0000 (12:19 +0200)]
DeleteValidator: Improve code readability
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
projects / akkoma / log