| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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/2in 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 |  | 
				
					
						| 
								
								
									 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/favouritesauth-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 |  | 
				
					
						| 
								
								
									 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 | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 | bedf92e064 | Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement | 2020-04-15 19:20:34 +03: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 | 260cbddc94 | Add spec for AccountController.update_credentials | 2020-04-13 18:16:07 +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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 9172d719cc | profile emojis in User.emoji instead of source_data | 2020-04-10 06:20:02 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | d545b883eb | Add /api/v1/notifications/:id/dismissendpoint | 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 | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 185520d1b4 | Provide known-good user.uri, remove User.profile_url/1 | 2020-03-31 23:55:29 +02: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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 lain | 1d75d0ed7a | Merge branch 'admin-api-change-password' into 'develop' Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149 | 2020-03-24 17:34:13 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 3c78e5f327 | Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring. | 2020-03-23 12:01:11 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a6ee6784bc | creating trusted app from adminFE & mix task | 2020-03-23 10:44:47 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | c2e415143b | WIP: preloading of user relations for timeline/statuses rendering (performance improvement). | 2020-03-22 21:51:44 +03:00 |  |