Alexander Strizhakov
|
aea781cbd8
|
credo fix
|
2020-05-01 16:31:05 +03:00 |
|
Alexander Strizhakov
|
ecf37b46d2
|
pagination fix for service users filters
|
2020-05-01 14:31:24 +03:00 |
|
rinpatch
|
0dd863f8f5
|
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
|
2020-04-30 22:33:56 +00:00 |
|
lain
|
da4b79a56d
|
Merge branch 'tests/more-apc2s' into 'develop'
Increase tests on AP C2S
See merge request pleroma/pleroma!2449
|
2020-04-30 22:19:26 +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 |
|
Haelwenn (lanodan) Monnier
|
f1523f9acd
|
Increase tests on AP C2S
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
|
2020-04-30 18:56:57 +02:00 |
|
Haelwenn
|
55a3a3c3e5
|
Merge branch 'emoji-upload' into 'develop'
Updated emoji API endpoints
Closes #1649, #1604, and #1545
See merge request pleroma/pleroma!2179
|
2020-04-30 16:09:51 +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
|
631e8c1feb
|
docs update
|
2020-04-30 16:09:23 +03:00 |
|
Alexander Strizhakov
|
1fd40532ae
|
docs fix
|
2020-04-30 16:09:23 +03:00 |
|
Alexander Strizhakov
|
1c1b7e22af
|
list of options for pack metadata
|
2020-04-30 16:09:22 +03:00 |
|
Alexander Strizhakov
|
36abeedf9f
|
error rename
|
2020-04-30 16:09:22 +03:00 |
|
Alexander Strizhakov
|
9855018425
|
changelog entry
|
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
|
f3070ddae5
|
removing entry from changelog
|
2020-04-30 15:45:57 +03:00 |
|
Alexander Strizhakov
|
95759310ab
|
docs update
|
2020-04-30 15:45:56 +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
|
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
|
2020-04-30 10:29:46 +00:00 |
|
rinpatch
|
dae9163060
|
Merge branch 'fix/add-exclude-replies-openapi' into 'develop'
Add exlude_replies to OpenAPI spec for account timelines
See merge request pleroma/pleroma!2443
|
2020-04-29 22:01:17 +00:00 |
|
rinpatch
|
8cf3a32463
|
Add exlude_replies to OpenAPI spec for account timelines
|
2020-04-30 00:49:59 +03:00 |
|
Mark Felder
|
3ead44a9aa
|
Update AdminFE build in preparation for the 2.0.3 release
|
2020-04-29 15:49:48 -05:00 |
|
lain
|
58fded9858
|
Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'
Automatic checks of authentication / authorization / instance publicity
See merge request pleroma/pleroma!2409
|
2020-04-29 11:09:30 +00: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 |
|
lain
|
699fc9569f
|
Merge branch 'docs/notification_destroy_multiple' into 'develop'
Document DELETE /api/v1/notifications/destroy_multiple
Closes #1711
See merge request pleroma/pleroma!2435
|
2020-04-28 15:40:18 +00:00 |
|
Mark Felder
|
4b3298133b
|
Document DELETE /api/v1/notifications/destroy_multiple
|
2020-04-28 10:13:58 -05:00 |
|
rinpatch
|
12bb7fc0dc
|
Merge branch 'openapi/account' into 'develop'
Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374
|
2020-04-28 11:57:16 +00:00 |
|
lain
|
9994768312
|
Merge branch 'mongoose-secure' into 'develop'
mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432
|
2020-04-28 09:18:59 +00:00 |
|
fence
|
5ff20793e7
|
formating
|
2020-04-28 01:29:31 +02:00 |
|
Egor Kislitsyn
|
dda65f7799
|
Move single used schemas to operation schema
|
2020-04-27 22:55:05 +04:00 |
|
fence
|
d607b4d840
|
mongooseim test: explicitly set password for the deactivated used
|
2020-04-27 19:32:58 +02:00 |
|
fence
|
935ca2c132
|
requested changes to mongoose test
|
2020-04-27 19:16:05 +02:00 |
|
fence
|
cc1e2e8d0f
|
requested changes to mongoose_im_controller.ex
|
2020-04-27 19:11:03 +02:00 |
|
Egor Kislitsyn
|
2efc00b3cf
|
Use json_response_and_validate_schema/2 in tests to validate OpenAPI schema
|
2020-04-27 20:46:52 +04:00 |
|
fence
|
5c7cc10917
|
add tests for deactivated users for mongoose auth
|
2020-04-27 18:31:00 +02:00 |
|
fence
|
a626cb682c
|
secure mongoose auth endpoint
|
2020-04-27 17:55:33 +02:00 |
|
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
2020-04-27 14:33:00 +04:00 |
|
rinpatch
|
01cc93b687
|
Merge branch 'img-src-blob' into 'develop'
Let blob: pass CSP
See merge request pleroma/pleroma!2427
|
2020-04-26 11:39:17 +00:00 |
|
Alex Gleason
|
1bd9749a8f
|
Let blob: pass CSP
|
2020-04-26 00:29:42 -05:00 |
|
lain
|
dbc4791d9d
|
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
|
2020-04-25 19:24:22 +00:00 |
|
Ivan Tashkinov
|
e16437ff19
|
[#1706] Formatting fix.
|
2020-04-25 18:42:08 +03:00 |
|
Ivan Tashkinov
|
0d05e1fe39
|
[#1706] Prevented error on unresolved activity actors for timeline actions.
|
2020-04-25 18:24:10 +03:00 |
|
Ivan Tashkinov
|
b4139cc547
|
[#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.
|
2020-04-24 22:25:27 +03:00 |
|
rinpatch
|
8addbd948c
|
Merge branch 'bugfix/announce-race-condition' into 'develop'
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
|
2020-04-24 16:58:24 +00:00 |
|
lain
|
c30b3b2dc5
|
Merge branch 'reply-filtering-refactor' into 'develop'
Reply filtering refactor
See merge request pleroma/pleroma!2424
|
2020-04-24 16:32:13 +00:00 |
|
lain
|
d89cd0a197
|
Reply Filtering: Refactor.
|
2020-04-24 18:25:26 +02:00 |
|
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
|
2020-04-24 16:10:43 +00:00 |
|
Ivan Tashkinov
|
00e62161f6
|
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
|
2020-04-24 16:52:38 +03:00 |
|