Commit Graph

9521 Commits

Author SHA1 Message Date
lain 07e7c80bc9 Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
Refactoring of :if_func / :unless_func plug options

See merge request pleroma/pleroma!2446
2020-05-06 09:14:05 +00:00
lain a716543267 Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController

See merge request pleroma/pleroma!2444
2020-05-06 09:10:17 +00:00
lain 61ea8f1f5a Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController

See merge request pleroma/pleroma!2386
2020-05-06 09:06:50 +00:00
lain df846eda71 Merge branch 'bugfix/sensitive_object' into 'develop'
Transmogrifier.set_sensitive/1: Keep sensitive set to true

Closes #954

See merge request pleroma/pleroma!2470
2020-05-06 09:04:13 +00:00
lain c3f1ce80eb 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
2020-05-06 09:01:42 +00:00
lain 0a88bf6a9d Merge branch 'openapi/follow_requests' into 'develop'
Add OpenAPI spec for FollowRequestController

See merge request pleroma/pleroma!2448
2020-05-06 09:00:39 +00:00
lain 957172a307 Merge branch 'openapi/filters' into 'develop'
Add OpenAPI spec for FilterController

See merge request pleroma/pleroma!2382
2020-05-06 08:51:10 +00:00
lain f84c8f2f0d 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
2020-05-06 08:46:45 +00:00
lain 1ee34d4acb Merge branch 'openapi/instance' into 'develop'
Add OpenAPI spec for InstanceController

See merge request pleroma/pleroma!2450
2020-05-06 08:46:14 +00:00
lain 7fdc7078ae Merge branch 'openapi/lists' into 'develop'
Add OpenAPI spec for ListController

See merge request pleroma/pleroma!2453
2020-05-06 08:43:21 +00:00
lain 76c1a7a34b Merge branch 'openapi/conversations' into 'develop'
Add OpenAPI spec for ConversationController

See merge request pleroma/pleroma!2445
2020-05-06 08:40:04 +00:00
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2 2020-05-06 05:55:39 +03:00
Haelwenn 7612d9403d Merge branch 'openapi/scheduled_activities' into 'develop'
Add OpenAPI spec for ScheduledActivityController

See merge request pleroma/pleroma!2477
2020-05-06 01:04:50 +00:00
Egor Kislitsyn 332e016bcd
Add OpenAPI spec for ScheduledActivityController 2020-05-05 23:42:24 +04:00
Egor Kislitsyn 6ba25d1197
Add Attachment schema 2020-05-05 23:42:24 +04:00
Egor Kislitsyn 0a1394cc1a
Add OpenAPI spec for PollController 2020-05-05 20:14:22 +04:00
lain 92caae5923 Undoing: Move undoing blocks to the pipeline everywhere. 2020-05-05 18:02:24 +02:00
lain a3bb2e5474 Undoing: Move undoing announcements to the pipeline everywhere. 2020-05-05 16:42:34 +02:00
lain b34debe615 Undoing: Move undoing reactions to the pipeline everywhere. 2020-05-05 16:17:09 +02:00
Egor Kislitsyn 3a45952a3a
Add OpenAPI spec for ConversationController 2020-05-05 17:44:46 +04:00
Egor Kislitsyn 32ca9f2c59
Render mastodon-like errors in FilterController 2020-05-05 17:41:16 +04:00
Egor Kislitsyn 46aae346f8
Move single used schemas to Filter operation schema 2020-05-05 17:41:01 +04:00
Egor Kislitsyn 7e7a3e1544
Add OpenAPI spec for FilterController 2020-05-05 17:41:01 +04:00
lain 42a2acac46 Merge branch 'feature/1720-status-view' into 'develop'
Admin API fetch status by id

Closes #1720

See merge request pleroma/pleroma!2475
2020-05-05 13:40:12 +00:00
Egor Kislitsyn ec1e4b4f1a
Add OpenAPI spec for FollowRequestController 2020-05-05 17:40:00 +04:00
minibikini 42a4a863f1
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex 2020-05-05 17:24:40 +04:00
minibikini 3817f179d7
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex 2020-05-05 17:24:40 +04:00
minibikini b5189d2c50
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex 2020-05-05 17:24:40 +04:00
Egor Kislitsyn 88a14da817
Add OpenAPI spec for InstanceController 2020-05-05 17:24:16 +04:00
Alexander Strizhakov e7d8ab8303
admin_api fetch status by id 2020-05-05 16:18:56 +03:00
lain a3071f0231 Undoing: Move undoing likes to the pipeline everywhere. 2020-05-05 15:08:41 +02:00
Egor Kislitsyn f2bf4390f4
Fix descriptions for List API spec 2020-05-05 17:05:35 +04:00
Egor Kislitsyn 5ec6aad567
Add OpenAPI spec for ListController 2020-05-05 17:05:34 +04:00
Egor Kislitsyn babcae7130
Move single used schemas to Marker operation schema 2020-05-05 16:45:34 +04:00
Egor Kislitsyn 8096565653
Add OpenAPI spec for MarkerController 2020-05-05 16:44:16 +04:00
Egor Kislitsyn d861b0790a
Add OpenAPI spec for SubscriptionController 2020-05-05 16:43:00 +04:00
lain f1da8882f9 UndoValidator: Add UndoValidator. 2020-05-05 14:17:47 +02:00
rinpatch 33f2976020 Merge branch 'feature/1737-magic-key-field' into 'develop'
User, Webfinger: Remove OStatus vestiges

Closes #1737

See merge request pleroma/pleroma!2471
2020-05-05 12:10:10 +00:00
rinpatch 5482a1f6ef Merge branch 'openapi/validation-plug' into 'develop'
Ignore unexpected query params and ENUM values

Closes #1719

See merge request pleroma/pleroma!2468
2020-05-05 12:08:58 +00:00
lain 8b2457bdbf Transmogrifier tests: Extract Undo handling 2020-05-05 13:25:34 +02:00
lain d201527004 Apply suggestion to lib/pleroma/web/web_finger/web_finger.ex 2020-05-05 11:17:44 +00:00
Egor Kislitsyn cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate 2020-05-05 15:01:33 +04:00
lain db55dc9445 ActivityPub: Remove `react_with_emoji`. 2020-05-05 12:28:28 +02:00
lain ad771546d8 Transmogrifier: Move emoji reactions to common pipeline. 2020-05-05 12:11:46 +02:00
lain 142bf0957c Transmogrifier: Extract EmojiReact tests. 2020-05-05 11:20:53 +02:00
lain f21f538293 LikeValidator: Add defaults for recipients back in. 2020-05-05 10:38:59 +02:00
lain c297667f16 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
2020-05-05 08:21:39 +00:00
lain 2cb3f8a8cf Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator 2020-05-05 10:19:01 +02:00
lain 6400998820 AP C2S: Restrict creation to `Note`s for now. 2020-05-05 10:12:37 +02:00
lain 6a2905ccf0 WebFinger Test: Add back test. 2020-05-05 09:55:33 +02:00