lain
|
3370bb0e46
|
Merge branch 'openapi/notifications' into 'develop'
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
|
4 years ago |
lain
|
607e06c245
|
Merge branch 'openapi/reports' into 'develop'
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
|
4 years ago |
lain
|
44fbd09709
|
Merge branch 'issue/1577' into 'develop'
[#1577] fix mediaType of object
See merge request pleroma/pleroma!2372
|
4 years ago |
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
|
4 years ago |
lain
|
da4b79a56d
|
Merge branch 'tests/more-apc2s' into 'develop'
Increase tests on AP C2S
See merge request pleroma/pleroma!2449
|
4 years ago |
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
|
4 years ago |
Haelwenn (lanodan) Monnier
|
f1523f9acd
|
Increase tests on AP C2S
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
|
4 years ago |
eugenijm
|
bef34568f0
|
Dismiss the follow request notification on rejection
|
4 years ago |
Alexander Strizhakov
|
ddb757f743
|
emoji api packs changes in routes with docs update
|
4 years ago |
Alexander Strizhakov
|
342f55fb92
|
refactor emoji api with fixes
|
4 years ago |
Alexander Strizhakov
|
5839e67eb8
|
return data only for updated emoji
|
4 years ago |
lain
|
4c4344b7b1
|
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
|
4 years ago |
Egor Kislitsyn
|
9c1adb35de
|
Merge branch 'develop' into openapi/notifications
|
4 years ago |
Egor Kislitsyn
|
1898054da4
|
Merge branch 'develop' into openapi/reports
|
4 years ago |
Egor Kislitsyn
|
7b0c8f0fde
|
Add tests for account registration with captcha enabled and improve errors
|
4 years ago |
Maksim Pechnikov
|
7bd187bc5e
|
added test
|
4 years ago |
Egor Kislitsyn
|
5238ae3dd3
|
Add OpenAPI spec for NotificationController
|
4 years ago |
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
|
4 years ago |
Egor Kislitsyn
|
560f2c1979
|
Add OpenAPI spec for ReportController
|
4 years ago |
rinpatch
|
12bb7fc0dc
|
Merge branch 'openapi/account' into 'develop'
Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374
|
4 years ago |
lain
|
9994768312
|
Merge branch 'mongoose-secure' into 'develop'
mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432
|
4 years ago |
Maksim Pechnikov
|
ea5142b94b
|
convert markdown content to html
|
4 years ago |
fence
|
5ff20793e7
|
formating
|
4 years ago |
Egor Kislitsyn
|
dda65f7799
|
Move single used schemas to operation schema
|
4 years ago |
fence
|
d607b4d840
|
mongooseim test: explicitly set password for the deactivated used
|
4 years ago |
fence
|
935ca2c132
|
requested changes to mongoose test
|
4 years ago |
Egor Kislitsyn
|
2efc00b3cf
|
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
|
4 years ago |
fence
|
5c7cc10917
|
add tests for deactivated users for mongoose auth
|
4 years ago |
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
4 years ago |
Ivan Tashkinov
|
b4139cc547
|
[#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
|
4 years ago |
rinpatch
|
8addbd948c
|
Merge branch 'bugfix/announce-race-condition' into 'develop'
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
|
4 years ago |
lain
|
c30b3b2dc5
|
Merge branch 'reply-filtering-refactor' into 'develop'
Reply filtering refactor
See merge request pleroma/pleroma!2424
|
4 years ago |
lain
|
d89cd0a197
|
Reply Filtering: Refactor.
|
4 years ago |
lain
|
d862c7156a
|
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
|
4 years ago |
Ivan Tashkinov
|
00e62161f6
|
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
|
4 years ago |
Alexander
|
6e625a427c
|
reply filtering
|
4 years ago |
lain
|
cb12585098
|
Announcements: Prevent race condition.
|
4 years ago |
lain
|
bbf8554c97
|
ActivitPub: Remove `like` function.
We don't need another way to build likes.
|
4 years ago |
Egor Kislitsyn
|
f362836742
|
Support validation for inline OpenAPI schema and automatic tests for examples
|
4 years ago |
rinpatch
|
1b5f8d19ee
|
Merge branch 'bugfix/repeating-announce' into 'develop'
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
|
4 years ago |
lain
|
7d38197894
|
CommonAPI: Don't make repeating announces possible
|
4 years ago |
rinpatch
|
25eec6d72d
|
Merge branch 'bugfix/null-scheduled-at' into 'develop'
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
|
4 years ago |
lain
|
850377a7b8
|
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
|
4 years ago |
Haelwenn
|
af27e4dffd
|
Merge branch 'bugfix/1670-user-count' into 'develop'
Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414
|
4 years ago |
lain
|
f5bda09de6
|
Stats: Use `invisible` property for filtering.
|
4 years ago |
Ivan Tashkinov
|
e7fb593d13
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
|
4 years ago |
lain
|
e62173dfc8
|
SideEffects: Run in transaction.
This fixes race conditions.
|
4 years ago |
Egor Kislitsyn
|
6c26feed01
|
Merge branch 'develop' into openapi/account
|
4 years ago |
Ivan Tashkinov
|
0062116e07
|
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
|
4 years ago |
Haelwenn
|
28f8fcf8b0
|
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
|
4 years ago |