lain
|
7d66dd180a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-08 10:18:10 +02:00 |
|
Haelwenn (lanodan) Monnier
|
e1b07402ab
|
User: Add raw_bio, storing unformatted bio
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
|
2020-06-06 16:23:16 +02:00 |
|
Egor Kislitsyn
|
b02df1803e
|
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
|
2020-06-05 23:15:10 +04:00 |
|
lain
|
a8ca030d85
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-05 16:53:56 +02:00 |
|
Haelwenn
|
d74985af23
|
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
|
2020-06-05 14:52:09 +00:00 |
|
Haelwenn
|
54bae06b4f
|
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
Unifies all the similar functions to one and simplify some blocks with it.
|
2020-06-05 14:48:02 +00:00 |
|
Egor Kislitsyn
|
317e2b8d61
|
Use atoms as keys in ActivityPub.fetch_* functions options
|
2020-06-04 21:36:26 +04:00 |
|
feld
|
6c1c2cddec
|
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
[#1794] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
|
2020-06-02 16:30:03 +00:00 |
|
lain
|
127ccc4e1c
|
NotificationController: Don't return chat_mentions by default.
|
2020-06-02 14:05:53 +02:00 |
|
rinpatch
|
6fb900a496
|
Merge branch 'user-updates' into 'develop'
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
|
2020-06-01 20:48:11 +00:00 |
|
lain
|
d4d4b92f75
|
TimelineController: Only return Create in public timelines.
|
2020-06-01 13:17:56 +02:00 |
|
lain
|
9460983032
|
AccountController: Federate user account changes.
Hotfixy commit, will be moved to the pipeline.
|
2020-06-01 13:03:22 +02:00 |
|
Steven Fuchs
|
6d4b80822b
|
Conversation pagination
|
2020-05-30 10:02:37 +00:00 |
|
Ivan Tashkinov
|
24f40b8a26
|
[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
|
2020-05-30 10:29:08 +03:00 |
|
Ivan Tashkinov
|
c181e555db
|
[#1794] Improvements to hashtags extraction from search query.
|
2020-05-29 22:03:14 +03:00 |
|
Haelwenn (lanodan) Monnier
|
b3b367b894
|
Bugfix: Reuse Controller.Helper pagination for APC2S
|
2020-05-29 16:14:45 +02:00 |
|
lain
|
51bc6674f6
|
Mastodon API Controllers: Use the correct params for rate limiting.
|
2020-05-26 13:45:54 +02:00 |
|
lain
|
23e248694d
|
Announcements: Fix all tests.
|
2020-05-21 13:16:21 +02:00 |
|
Maksim Pechnikov
|
41f8f17260
|
fix api/v1/accounts/update_credentials
|
2020-05-19 09:42:41 +03:00 |
|
lain
|
96f7b1b140
|
Merge branch 'show-media-endpoint-fixes' into 'develop'
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
|
2020-05-18 10:57:59 +00:00 |
|
Alexander Strizhakov
|
1671864d88
|
return :visible instead of boolean
|
2020-05-18 10:34:50 +03:00 |
|
Alexander Strizhakov
|
b1aa402229
|
removing 410 status
|
2020-05-18 10:34:50 +03:00 |
|
Alexander Strizhakov
|
e7bc2f980c
|
account visibility
|
2020-05-18 10:34:49 +03:00 |
|
Ivan Tashkinov
|
9b76565264
|
MediaController: enforced owner-only access in :show action.
Improved error response on denied access (now 403). Adjusted tests.
|
2020-05-18 09:51:53 +03:00 |
|
lain
|
4b28d812cf
|
Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
|
2020-05-17 07:26:51 +00:00 |
|
Ivan Tashkinov
|
af9dfdce6b
|
MediaController OAuth scope assignments fix.
Typo fix (`def get_media` instead of `def show`).
|
2020-05-17 08:46:43 +03:00 |
|
Egor Kislitsyn
|
bb03dfdb03
|
Do not require description in update action
|
2020-05-14 16:29:32 +04:00 |
|
Egor Kislitsyn
|
0f885b4b86
|
Fix OpenAPI spec
|
2020-05-14 16:18:30 +04:00 |
|
Haelwenn (lanodan) Monnier
|
099e314a1b
|
Add OpenAPISpex for MediaController
|
2020-05-14 12:13:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
cb363f0183
|
MastodonAPI: /api/v2/media endpoints
|
2020-05-14 10:14:28 +02:00 |
|
Ivan Tashkinov
|
8062d590dd
|
[#2456] OpenAPI-related tweaks. Removed support for with_relationships param in GET /api/v1/accounts/search.
|
2020-05-13 18:56:45 +03:00 |
|
Ivan Tashkinov
|
59b6d5f2aa
|
[#2456] Changed embed_relationships param to with_relationships.
|
2020-05-13 15:08:07 +03:00 |
|
Egor Kislitsyn
|
bcadbf964a
|
Add OpenAPI spec for SuggestionController
|
2020-05-13 14:15:24 +04:00 |
|
Ivan Tashkinov
|
33b798425f
|
[#2456] Post-merge fix.
|
2020-05-13 12:50:52 +03:00 |
|
Ivan Tashkinov
|
fd2fb2bb2e
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
|
2020-05-13 12:42:36 +03:00 |
|
lain
|
156c8a5088
|
Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
|
2020-05-13 09:34:30 +00:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
Ivan Tashkinov
|
63a1a82f38
|
[#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
|
2020-05-12 19:14:35 +03:00 |
|
Egor Kislitsyn
|
3bde0fa3f6
|
Add OpenAPI spec for TimelineController
|
2020-05-11 15:43:03 +04:00 |
|
Ivan Tashkinov
|
aee88d11be
|
[#2456] Removed support for embedded relationships in account view.
|
2020-05-10 09:16:48 +03:00 |
|
Ivan Tashkinov
|
14a49a0483
|
[#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications.
|
2020-05-09 18:05:44 +03:00 |
|
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
2020-05-08 21:37:55 +03:00 |
|
rinpatch
|
bef08b85e5
|
Merge branch 'feature/undo-validator-reduced' into 'develop'
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
|
2020-05-07 14:28:10 +00:00 |
|
lain
|
f0c22df226
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
|
2020-05-07 14:45:20 +02:00 |
|
Egor Kislitsyn
|
dc4a448f48
|
Add OpenAPI spec for SearchController
|
2020-05-07 14:04:48 +04:00 |
|
lain
|
4c92dfb73e
|
Merge branch 'openapi/polls' into 'develop'
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
|
2020-05-07 09:19:45 +00:00 |
|
lain
|
a716543267
|
Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
|
2020-05-06 09:10:17 +00:00 |
|
lain
|
61ea8f1f5a
|
Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
|
2020-05-06 09:06:50 +00:00 |
|
lain
|
0a88bf6a9d
|
Merge branch 'openapi/follow_requests' into 'develop'
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
|
2020-05-06 09:00:39 +00:00 |
|
lain
|
957172a307
|
Merge branch 'openapi/filters' into 'develop'
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
|
2020-05-06 08:51:10 +00:00 |
|
lain
|
1ee34d4acb
|
Merge branch 'openapi/instance' into 'develop'
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
|
2020-05-06 08:46:14 +00:00 |
|
lain
|
7fdc7078ae
|
Merge branch 'openapi/lists' into 'develop'
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
|
2020-05-06 08:43:21 +00:00 |
|
lain
|
76c1a7a34b
|
Merge branch 'openapi/conversations' into 'develop'
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
|
2020-05-06 08:40:04 +00:00 |
|
Egor Kislitsyn
|
332e016bcd
|
Add OpenAPI spec for ScheduledActivityController
|
2020-05-05 23:42:24 +04:00 |
|
Egor Kislitsyn
|
0a1394cc1a
|
Add OpenAPI spec for PollController
|
2020-05-05 20:14:22 +04:00 |
|
lain
|
92caae5923
|
Undoing: Move undoing blocks to the pipeline everywhere.
|
2020-05-05 18:02:24 +02:00 |
|
lain
|
a3bb2e5474
|
Undoing: Move undoing announcements to the pipeline everywhere.
|
2020-05-05 16:42:34 +02:00 |
|
Egor Kislitsyn
|
3a45952a3a
|
Add OpenAPI spec for ConversationController
|
2020-05-05 17:44:46 +04:00 |
|
Egor Kislitsyn
|
32ca9f2c59
|
Render mastodon-like errors in FilterController
|
2020-05-05 17:41:16 +04:00 |
|
Egor Kislitsyn
|
46aae346f8
|
Move single used schemas to Filter operation schema
|
2020-05-05 17:41:01 +04:00 |
|
Egor Kislitsyn
|
7e7a3e1544
|
Add OpenAPI spec for FilterController
|
2020-05-05 17:41:01 +04:00 |
|
Egor Kislitsyn
|
ec1e4b4f1a
|
Add OpenAPI spec for FollowRequestController
|
2020-05-05 17:40:00 +04:00 |
|
Egor Kislitsyn
|
88a14da817
|
Add OpenAPI spec for InstanceController
|
2020-05-05 17:24:16 +04:00 |
|
lain
|
a3071f0231
|
Undoing: Move undoing likes to the pipeline everywhere.
|
2020-05-05 15:08:41 +02:00 |
|
Egor Kislitsyn
|
5ec6aad567
|
Add OpenAPI spec for ListController
|
2020-05-05 17:05:34 +04:00 |
|
Egor Kislitsyn
|
babcae7130
|
Move single used schemas to Marker operation schema
|
2020-05-05 16:45:34 +04:00 |
|
Egor Kislitsyn
|
8096565653
|
Add OpenAPI spec for MarkerController
|
2020-05-05 16:44:16 +04:00 |
|
Egor Kislitsyn
|
d861b0790a
|
Add OpenAPI spec for SubscriptionController
|
2020-05-05 16:43:00 +04:00 |
|
Egor Kislitsyn
|
d08c63500b
|
Ignore unexpected query params
|
2020-05-04 20:16:44 +04:00 |
|
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
|
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 |
|
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 |
|
Egor Kislitsyn
|
7b0c8f0fde
|
Add tests for account registration with captcha enabled and improve errors
|
2020-04-29 21:26:07 +04:00 |
|
Egor Kislitsyn
|
5238ae3dd3
|
Add OpenAPI spec for NotificationController
|
2020-04-28 21:27:54 +04: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 |
|
Egor Kislitsyn
|
560f2c1979
|
Add OpenAPI spec for ReportController
|
2020-04-28 16:50:37 +04:00 |
|
Egor Kislitsyn
|
dda65f7799
|
Move single used schemas to operation schema
|
2020-04-27 22:55:05 +04: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 |
|
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
2020-04-27 14:33:00 +04:00 |
|
Ivan Tashkinov
|
b4139cc547
|
[#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.
|
2020-04-24 22:25:27 +03:00 |
|
lain
|
d89cd0a197
|
Reply Filtering: Refactor.
|
2020-04-24 18:25:26 +02: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
942d7467ca
|
Merge branch 'develop' into features/remove-user-source_data
|
2020-04-16 21:28:52 +03:00 |
|
Egor Kislitsyn
|
cf4ebba774
|
Cleanup SubscriptionController
|
2020-04-15 23:14:47 +04: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 |
|