sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
9,331 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

9331 Commits

Author SHA1 Message Date
Ivan Tashkinov d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). 
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
 2020-05-01 18:45:24 +03:00
lain ed4e9e6435 Merge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop' 
Notifications loading fix (PleromaFE)

See merge request pleroma/pleroma!2455
 2020-05-01 15:38:36 +00:00
Ivan Tashkinov 57b31e79c2 Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`). 2020-05-01 17:59:29 +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
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
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 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
Egor Kislitsyn 39a78998d0
Change Pleroma.CaptchaTest to be a regular module instead of GenServer 2020-04-29 21:26:07 +04: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
Egor Kislitsyn 8148d76ec5
Document `captcha_answer_data` parameter 2020-04-29 21:26:07 +04: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
Maksim Pechnikov 7bd187bc5e added test 2020-04-29 08:13:10 +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
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
Egor Kislitsyn 560f2c1979
Add OpenAPI spec for ReportController 2020-04-28 16:50:37 +04: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
Maksim Pechnikov ea5142b94b convert markdown content to html 2020-04-28 09:32:43 +03: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