Egor Kislitsyn
|
9c1adb35de
|
Merge branch 'develop' into openapi/notifications
|
2020-04-30 13:52:07 +04:00 |
|
rinpatch
|
8cf3a32463
|
Add exlude_replies to OpenAPI spec for account timelines
|
2020-04-30 00:49:59 +03: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 |
|
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
|
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 |
|
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 |
|
Alexander
|
6e625a427c
|
reply filtering
|
2020-04-24 15:43:49 +03:00 |
|
lain
|
cb12585098
|
Announcements: Prevent race condition.
|
2020-04-24 14:37:53 +02:00 |
|
lain
|
1df6af2a4c
|
Credo fixes.
|
2020-04-24 13:59:48 +02:00 |
|
lain
|
bbf8554c97
|
ActivitPub: Remove like function.
We don't need another way to build likes.
|
2020-04-24 13:48:13 +02:00 |
|
Egor Kislitsyn
|
f362836742
|
Support validation for inline OpenAPI schema and automatic tests for examples
|
2020-04-24 15:16:15 +04:00 |
|
Ivan Tashkinov
|
89f38d94c7
|
[#2409] Fixed before-action callback results persistence.
|
2020-04-23 21:47:33 +03:00 |
|
rinpatch
|
1b5f8d19ee
|
Merge branch 'bugfix/repeating-announce' into 'develop'
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
|
2020-04-23 12:40:38 +00:00 |
|
lain
|
7d38197894
|
CommonAPI: Don't make repeating announces possible
|
2020-04-23 13:33:30 +02:00 |
|
rinpatch
|
25eec6d72d
|
Merge branch 'bugfix/null-scheduled-at' into 'develop'
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
|
2020-04-23 11:22:30 +00:00 |
|
lain
|
850377a7b8
|
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
|
2020-04-22 19:26:32 +00:00 |
|
lain
|
1bcbdc7a9f
|
SideEffects: Use less cryptic syntax.
|
2020-04-22 21:21:21 +02:00 |
|
lain
|
e62173dfc8
|
SideEffects: Run in transaction.
This fixes race conditions.
|
2020-04-22 18:40:53 +02:00 |
|
Egor Kislitsyn
|
1b06a27746
|
Update Flake ID description
|
2020-04-22 20:20:19 +04:00 |
|
Egor Kislitsyn
|
6c26feed01
|
Merge branch 'develop' into openapi/account
|
2020-04-22 20:18:12 +04:00 |
|
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
|
2020-04-22 18:51:59 +03:00 |
|
Ivan Tashkinov
|
2958a7d246
|
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
|
2020-04-22 18:50:25 +03:00 |
|
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
|
2020-04-22 15:46:04 +00:00 |
|
Haelwenn
|
468cc977be
|
Merge branch 'bugfix/following-fix-status-code' into 'develop'
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
|
2020-04-22 15:33:04 +00:00 |
|
Haelwenn
|
238058ecae
|
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415
|
2020-04-22 15:31:51 +00:00 |
|
Egor Kislitsyn
|
e7771424a8
|
Fix blocks import
|
2020-04-22 19:27:28 +04:00 |
|
Egor Kislitsyn
|
88b82e5c3e
|
Fix follow import
|
2020-04-22 19:27:28 +04:00 |
|
lain
|
7a3a88a13e
|
Streamer: Stream boosts to the boosting user.
|
2020-04-22 17:21:13 +02:00 |
|
Haelwenn
|
1855c597c2
|
Merge branch 'feature/voters-count' into 'develop'
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
|
2020-04-22 15:12:19 +00:00 |
|
Haelwenn
|
2e73c19edc
|
Merge branch 'worker-messages' into 'develop'
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
|
2020-04-22 15:09:10 +00:00 |
|
Karol Kosek
|
452072ec95
|
static_fe: Add microformats2 classes
|
2020-04-22 16:02:40 +02:00 |
|
lain
|
5b39526198
|
AccountController: Use code 400 for self-follow.
|
2020-04-22 15:04:26 +02:00 |
|
lain
|
c10485db16
|
StatusController: Ignore nil scheduled_at parameters.
|
2020-04-22 14:26:19 +02:00 |
|
lain
|
5102468d0f
|
Polls: Persist and show voters' count
|
2020-04-22 14:06:39 +02:00 |
|