lain
c23cb8d37a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 19:24:04 +02:00
lain
3559dd1085
Transmogrifier: Rely on LikeValidator.
2020-05-04 17:18:38 +02:00
lain
0f9bed022f
LikeValidator: Fix up context.
2020-05-04 17:18:17 +02:00
lain
e03c301ebe
LikeValidator: Fix up missing recipients.
2020-05-04 17:08:31 +02:00
lain
13ab8defc0
Pipeline: Move transctioning to common pipeline.
2020-05-04 14:34:19 +02:00
lain
b04328c3de
ChatController: Add mark_as_read
2020-05-04 13:10:36 +02:00
lain
30590cf46b
CommonAPI: Refactor for readability
2020-05-04 12:53:40 +02:00
lain
57e6f2757a
ChatOperation: Make simple schema into inline schema
2020-05-04 12:47:23 +02:00
lain
dcf535fe77
Credo fixes.
2020-05-04 11:32:11 +02:00
lain
651935f137
Schemas: Refactor to our naming scheme.
2020-05-04 11:08:00 +02:00
lain
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 10:43:20 +02:00
lain
9249742f13
Types.Recipients: Simplify reducer.
2020-05-03 15:28:24 +02:00
lain
a35b76431c
Credo fixes.
2020-05-03 14:58:24 +02:00
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
eugenijm
66a8e1312d
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
2020-05-02 19:05:13 +03:00
rinpatch
e55876409b
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
2020-05-02 19:05:13 +03:00
Ivan Tashkinov
2d07ed7747
[ #1732 ] Made AP C2S :followers and :following endpoints serve on no auth
...
(as for related :api pipeline endpoints).
2020-05-02 18:28:04 +03:00
Haelwenn
0dfb5ad0ad
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
2020-05-02 06:37:33 +00:00
Haelwenn (lanodan) Monnier
c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
2020-05-02 08:28:42 +02:00
rinpatch
c18ef452b0
OpenAPI: Add follow_request to notification types
...
Closes #1731
2020-05-01 23:14:20 +03:00
rinpatch
85105f7aae
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.
2020-05-01 21:33:34 +03:00
lain
3370bb0e46
Merge branch 'openapi/notifications' into 'develop'
...
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
2020-05-01 13:09:36 +00:00
lain
607e06c245
Merge branch 'openapi/reports' into 'develop'
...
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
2020-05-01 12:48:56 +00:00
lain
44fbd09709
Merge branch 'issue/1577' into 'develop'
...
[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372
2020-05-01 12:38:46 +00:00
lain
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
2020-05-01 11:47:58 +00:00
lain
a81342a234
Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
...
Dismiss the follow request notification on rejection
See merge request pleroma/pleroma!2447
2020-04-30 18:38:52 +00:00
eugenijm
bef34568f0
Dismiss the follow request notification on rejection
2020-04-30 18:38:19 +03:00
Alexander Strizhakov
4a487e4d0b
fix for auth check
2020-04-30 17:50:57 +03:00
Alexander Strizhakov
36abeedf9f
error rename
2020-04-30 16:09:22 +03:00
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update
2020-04-30 16:09:18 +03:00
Alexander Strizhakov
342f55fb92
refactor emoji api with fixes
2020-04-30 15:45:52 +03:00
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
2020-04-30 15:24:02 +03:00
lain
ad2182bbd2
Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_create_request.ex
2020-04-30 11:38:26 +00:00
Egor Kislitsyn
9c1adb35de
Merge branch 'develop' into openapi/notifications
2020-04-30 13:52:07 +04:00
Egor Kislitsyn
1898054da4
Merge branch 'develop' into openapi/reports
2020-04-30 13:51:27 +04:00
rinpatch
8cf3a32463
Add exlude_replies to OpenAPI spec for account timelines
2020-04-30 00:49:59 +03:00
lain
b68d56c816
Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_response.ex
2020-04-29 19:49:13 +00:00
lain
145d35ff70
Apply suggestion to lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
2020-04-29 19:49:03 +00:00
lain
589ce1e96b
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-04-29 19:47:16 +00:00
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
2020-04-29 21:26:07 +04:00
Egor Kislitsyn
2f77842bd3
Fix account registration when captcha is enabled but not provided
2020-04-29 21:26:07 +04:00
lain
20587aa931
Chat message creation: Check actor.
2020-04-29 14:53:53 +02:00
lain
a88734a0a2
Transmogrifier: Fetch missing actors for chatmessages.
2020-04-29 14:25:33 +02:00
lain
53e3063bd0
Transmogrifier: Remove ChatMessageHandling module.
2020-04-29 13:52:23 +02:00
lain
e055b8d203
Pipeline: Always run common_pipeline in a transaction for now.
2020-04-29 13:45:50 +02:00
lain
67659afe48
ChatOperation: Refactor.
2020-04-29 13:34:43 +02:00
lain
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-29 13:19:04 +02:00
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController
2020-04-28 21:27:54 +04:00
Ivan Tashkinov
4c0e53367a
[ #2349 ] Post-merge fix.
2020-04-28 20:04:25 +03:00
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-28 19:56:20 +03:00
