sergiotarxz
/
Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,105 Commits 1 Branch 0 Tags 184 MiB
Commit Graph

1141 Commits

Author SHA1 Message Date
lain 1307d6ca3c Merge branch 'openapi/timelines' into 'develop' 
Add OpenAPI spec for TimelineController

See merge request pleroma/pleroma!2506
 2020-05-13 09:33:37 +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
href e6d8cacf2d Expand and authorize streams in Streamer directly 2020-05-12 18:04:47 +02:00
lain dcb5cda324 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-12 13:13:43 +02:00
rinpatch f8190aea5e Merge branch 'fix/issue-1676' into 'develop' 
[#1676] fixed 'source' object in verify_credentials

See merge request pleroma/pleroma!2492
 2020-05-11 22:30:36 +00:00
href e2b15e8ad3 Fix streamer timeout (closes #1753). 
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
 2020-05-11 16:51:34 +02: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 ac4250a18c [#2456] Clarified `skip_relationships` option (and its default of `false`) for MastodonAPI.AccountView. 2020-05-09 19:03:07 +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
lain 7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-08 13:13:37 +02:00
Maksim Pechnikov 4d71c4b805 fixed 'source' object in verify_credentials 2020-05-08 12:35:34 +03:00
Maksim Pechnikov b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +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 516ff945ce Merge branch 'openapi/search' into 'develop' 
Add OpenAPI spec for SearchController

See merge request pleroma/pleroma!2484
 2020-05-07 13:38:34 +00:00
rinpatch eb1f2fcbc6 Streamer: Fix wrong argument order when rendering activities to authenticated user 
Closes #1747
 2020-05-07 16:13:24 +03:00
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02: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
href 9491ba3e49 Streamer rework 2020-05-07 09:13:32 +00:00
Maksim Pechnikov bd261309cc added `unread_notifications_count` for `/api/v1/accounts/verify_credentials` 2020-05-06 15:08:38 +03:00
Maksim Pechnikov 8b97b6f5ba Merge branch 'develop' into issue/1276-2 2020-05-06 14:47:50 +03:00
lain 205313e541 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 11:44:30 +02: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
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2 2020-05-06 05:55:39 +03: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
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 10:43:20 +02:00
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2 2020-05-04 06:08:49 +03:00
rinpatch 3126f8a334 Merge branch 'feature/1710-consolidate-instance-info' into 'develop' 
Feature/1710 consolidate instance info

Closes #1710

See merge request pleroma/pleroma!2430
 2020-05-02 16:44:55 +00: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
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03: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
lain 0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-29 13:19:04 +02: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
lain b5dc59c8fa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-28 14:16:21 +02: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
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
lain c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-27 12:07:08 +02: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
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
lain ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-23 15:47:08 +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
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 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
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
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 a185b5455f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-21 14:24:27 +02: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
lain 5165287ff4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-21 12:00:33 +02: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
lain 139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-20 12:37:17 +02:00
lain 970b74383b Credo fixes. 2020-04-20 12:29:19 +02:00
lain c845820911 Notifications: Create a chat notification. 2020-04-17 16:55:01 +02:00
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-17 15:51:24 +02: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 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
lain ca598e9c27 AccountView: Return user ap_id. 2020-04-16 15:27:35 +02:00