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
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
lain
3635a9c9c2
InstanceController: Add extensions to /api/v1/instance
2020-04-27 14:28:08 +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
lain
923513b641
Federator: Return proper values for jobs
2020-04-22 13:28:52 +02:00
lain
f719a5b23a
WebPush: Return proper values for jobs.
2020-04-22 13:28:34 +02:00
Egor Kislitsyn
11433cd38d
Add OpenAPI schema for FlakeID
2020-04-21 23:54:45 +04:00
Egor Kislitsyn
f0238d010a
Improve OpenAPI schema
...
- Removes unneeded wrapping in examples
- Adds `:format` attributes
2020-04-21 23:30:24 +04:00
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-21 16:29:19 +03:00
lain
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
2020-04-21 10:13:50 +00:00
rinpatch
e57c1b60e4
Merge branch 'accept-deletes' into 'develop'
...
Always accept deletions through SimplePolicy, add :reject_deletes group
See merge request pleroma/pleroma!2371
2020-04-20 18:30:01 +00:00
rinpatch
7e456ac7f6
Merge branch 'router-cleanup' into 'develop'
...
Cleanup and DRY the Router
See merge request pleroma/pleroma!2406
2020-04-20 18:29:03 +00:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
Egor Kislitsyn
ed3974af24
Add OpenAPI spec for AccountController.identity_proofs
operation
2020-04-20 18:40:02 +04:00
Egor Kislitsyn
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
lain
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
2020-04-20 13:01:17 +00:00
Ilja
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
2020-04-20 12:59:16 +00:00
Egor Kislitsyn
258d897579
Cleanup and DRY the Router
2020-04-20 16:39:20 +04:00
rinpatch
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
2020-04-19 21:45:20 +00:00
Haelwenn
79445ae5d2
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes #1697
See merge request pleroma/pleroma!2403
2020-04-18 06:59:23 +00:00
Haelwenn
24f760c2f7
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
2020-04-17 22:48:37 +00:00
Haelwenn (lanodan) Monnier
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
2020-04-17 23:57:22 +02:00
Ivan Tashkinov
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
2020-04-17 21:21:10 +03:00
Egor Kislitsyn
163341857a
Improve OpenAPI errors
2020-04-17 19:27:22 +04:00
rinpatch
e0d7847bc5
Merge branch 'sideeffects-test' into 'develop'
...
SideEffects: Test for notification creation.
See merge request pleroma/pleroma!2399
2020-04-17 14:03:04 +00:00
lain
26d9c83316
SideEffects: Test for notification creation.
2020-04-17 15:50:15 +02:00
rinpatch
6936854878
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
2020-04-17 13:40:25 +00:00
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
2020-04-17 16:23:58 +03:00
Haelwenn (lanodan) Monnier
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
2020-04-17 14:32:15 +02:00
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
Haelwenn
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
2020-04-17 08:55:46 +00:00
rinpatch
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
2020-04-16 21:58:57 +00:00
rinpatch
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
2020-04-16 18:38:58 +00:00
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
2020-04-16 21:28:52 +03:00
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities
2020-04-16 18:05:36 +03:00
rinpatch
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
2020-04-16 14:59:11 +00:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
2020-04-16 16:03:26 +03:00
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController
2020-04-15 23:14:47 +04:00
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
Ivan Tashkinov
bde1189c34
[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
2020-04-15 21:19:16 +03:00
Ivan Tashkinov
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
2020-04-15 19:20:34 +03:00
Egor Kislitsyn
65f04b7806
Fix credo warning
2020-04-15 17:16:32 +04:00
Egor Kislitsyn
16f4787bf7
Add a TODO note
2020-04-15 16:51:37 +04:00
Egor Kislitsyn
0e647ff55a
Abstract pagination params in OpenAPI spec
2020-04-15 16:45:45 +04:00
Egor Kislitsyn
8ed162b655
Fix formatting
2020-04-15 15:57:00 +04:00
minibikini
5a2e45a218
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 11:29:10 +00:00
minibikini
81a4c15816
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:48:52 +00:00
minibikini
a45bd91d4e
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:48:32 +00:00
minibikini
bfa26b0937
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:30:19 +00:00
minibikini
a794ba655f
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:27:01 +00:00
minibikini
a7feca1604
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:26:53 +00:00
minibikini
d3e876aeee
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:26:44 +00:00
rinpatch
96eae62995
Merge branch 'fix/openapi-form-mimetype' into 'develop'
...
openapi: add application/x-www-form-urlencoded to body types
Closes #1683
See merge request pleroma/pleroma!2387
2020-04-14 22:01:24 +00:00
rinpatch
cc4ff19e34
openapi: add application/x-www-form-urlencoded to body types
...
Closes #1683
2020-04-15 00:49:21 +03:00
Mark Felder
3bf78f2be7
Fix Oban not receiving :ok from RichMediaHelper job
2020-04-14 11:43:53 -05:00
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
Egor Kislitsyn
247e6fcb90
Merge branch 'develop' into openapi/account
2020-04-14 19:45:22 +04:00
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
2020-04-13 22:44:52 +04:00
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
2020-04-13 21:21:04 +04:00
Egor Kislitsyn
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
2020-04-13 18:17:09 +04:00
Egor Kislitsyn
ab185d3ea4
Add spec for AccountController.follows
2020-04-13 18:17:09 +04:00
Egor Kislitsyn
68a979b824
Add specs for AccountController.block and AccountController.unblock
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
aa958a6dda
Add spec for AccountController.unfollow
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
854780c72b
Add spec for AccountController.follow
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
1b680a98ae
Add spec for AccountController.lists
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
e105cc12b6
Add spec for AccountController.following
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
bd6e2b300f
Add spec for AccountController.followers
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
278b3fa0ad
Add spec for AccountController.show
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
d7d6a83233
Add spec for AccountController.relationships
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
ab400b2ddb
Add specs for ActorType and VisibilityScope
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
260cbddc94
Add spec for AccountController.update_credentials
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
f80116125f
Add spec for AccountController.verify_credentials
2020-04-13 17:38:59 +04:00
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create
2020-04-13 17:38:59 +04:00
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
Maksim Pechnikov
c5c09fc61b
fix mediaType of object
2020-04-13 07:02:57 +03:00
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy
2020-04-12 20:26:35 -05:00
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
rinpatch
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
2020-04-11 22:31:46 +03:00
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
Haelwenn
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
2020-04-10 04:31:13 +00:00
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier
3420dec494
Remove User.fields/1
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
b6bed1a284
Types.URI: New
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
Egor Kislitsyn
d545b883eb
Add /api/v1/notifications/:id/dismiss
endpoint
2020-04-09 17:08:43 +04:00
Ivan Tashkinov
ac672a9d6b
[ #1559 ] Addressed code review requests.
2020-04-09 15:13:37 +03:00
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
2020-04-09 10:42:43 +00:00
Alexander Strizhakov
f20a19de85
typo fix
2020-04-09 13:28:54 +03:00
Alexander Strizhakov
1cf0d5ab0d
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:36 +00:00
Alexander Strizhakov
4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:31 +00:00
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
Haelwenn (lanodan) Monnier
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
2020-04-09 04:36:39 +02:00
Ivan Tashkinov
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
Egor Kislitsyn
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
2020-04-06 17:11:00 +04:00
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00
lain
772bc258cd
ObjectID Validator: Refactor.
2020-04-06 13:53:24 +02:00
lain
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
2020-04-06 13:46:34 +02:00
Ivan Tashkinov
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-06 10:20:44 +03:00
Ivan Tashkinov
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
Egor Kislitsyn
0aa24a150b
Add oAuth
2020-04-02 17:33:23 +04:00
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
Egor Kislitsyn
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint
2020-04-01 20:26:33 +03:00
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
lain
037b49c415
Validators: Correct ObjectID filename
2020-04-01 16:10:17 +02:00
rinpatch
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
2020-04-01 12:55:52 +00:00
Alexander Strizhakov
94ddbe4098
restrict remote users from indexing
2020-04-01 09:57:12 +03:00
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
lain
c982093cc2
Transmogrifier: Fix BAD code by RINPATCH
2020-03-31 19:33:41 +02:00
lain
1b323ce1c6
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:28:18 +00:00
lain
ecac57732a
Transmogrifier: Only add context if it really is onne.
2020-03-31 19:16:45 +02:00
lain
51fc504705
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-31 19:06:08 +02:00
lain
288f2b5a7c
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:55 +00:00
lain
0be1fa0a86
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:48 +00:00
lain
057438a657
CommonAPI: DRY up a bit.
2020-03-31 17:56:05 +02:00
lain
643f15e77b
Validators: ObjectID is an http uri.
2020-03-31 16:11:38 +02:00
lain
f6835333be
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 12:55:25 +00:00
Ivan Tashkinov
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
2020-03-30 19:08:37 +03:00
Alexander Strizhakov
b607ae1a1c
removing grouped reports admin api endpoint
2020-03-30 13:51:45 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned ecto_enum
-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (ThreadMute.exists?/2
).
2020-03-27 08:01:03 +03:00
Ivan Tashkinov
6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
2020-03-26 21:54:01 +03:00
lain
29ab1d9f8d
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 17:24:10 +01:00
lain
69fc1dd69f
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-26 14:45:28 +00:00
lain
0c60c0a76a
Validators: Use correct type for IDs.
2020-03-26 15:44:14 +01:00
lain
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
lain
eaacc64839
Refactors.
2020-03-26 15:33:10 +01:00
lain
ee979dd6d7
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 15:24:06 +01:00
lain
d7aa0b645b
Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
2020-03-26 14:23:19 +00:00
lain
4cf1007a7d
ActivityPub: Small refactor.
2020-03-26 15:16:54 +01:00
Ivan Tashkinov
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
2020-03-26 09:43:58 +03:00
rinpatch
af820f8cf1
Merge branch 'benchmark_timeline' into 'develop'
...
Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325
2020-03-25 18:06:00 +00:00
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
Ivan Tashkinov
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
2020-03-25 17:01:45 +03:00
Ivan Tashkinov
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
Ivan Tashkinov
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
Haelwenn (lanodan) Monnier
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
2020-03-24 20:32:49 +01:00
Ivan Tashkinov
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-24 22:15:37 +03:00
Ivan Tashkinov
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24 22:14:26 +03:00
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-24 19:10:32 +00:00
rinpatch
f316882464
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
2020-03-24 18:37:53 +00:00
lain
aaf00f1ff5
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-24 18:24:09 +00:00