| 
								
								
									 lain | 805ab86933 | Notifications: Make notifications save their type. | 2020-06-02 13:24:34 +02:00 |  | 
				
					
						| 
								
								
									 lain | ee35bb5ac2 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-25 13:57:27 +02:00 |  | 
				
					
						| 
								
								
									 lain | ec470c4c77 | Merge branch 'openapi/admin/status' into 'develop' Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566 | 2020-05-25 11:40:54 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1fa7aa9fc5 | Merge branch 'emoji-react-better-errors' into 'develop' EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569 | 2020-05-22 14:36:08 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | ba106aa9c8 | Fix notifications mark as read API | 2020-05-22 18:15:36 +04:00 |  | 
				
					
						| 
								
								
									 lain | bcb549531f | EmojiReactionController: Return more appropriate error. | 2020-05-22 14:38:28 +02:00 |  | 
				
					
						| 
								
								
									 lain | 578ed3a37f | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-21 15:35:13 +02:00 |  | 
				
					
						| 
								
								
									 lain | f166316f50 | Merge branch 'openapi/pleroma-api/pleroma' into 'develop' Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564 | 2020-05-21 13:30:09 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 45d2c4157f | Add OpenAPI spec for AdminAPI.StatusController | 2020-05-21 17:23:12 +04:00 |  | 
				
					
						| 
								
								
									 lain | 814c3e5171 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-21 15:00:05 +02:00 |  | 
				
					
						| 
								
								
									 lain | 265746b21f | Merge branch 'openapi/pleroma-api/emojis' into 'develop' Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549 | 2020-05-20 12:08:28 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 26f01744bc | Add background_imagetoInstanceOperation | 2020-05-20 15:18:58 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5ba6e1c322 | Move notification actions to PleromaAPI.NotificationController | 2020-05-20 15:15:13 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f3fc8b22b1 | Move conversation actions to PleromaAPI.ConversationController | 2020-05-20 15:15:13 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 9a5de0f454 | Move reaction actions to EmojiReactionController | 2020-05-20 15:15:13 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 490a3a34b6 | Add OpenAPI spec for PleromaAPI.PleromaAPIController | 2020-05-20 15:15:13 +04:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 94ba5a7802 | Merge branch 'exposed-background-image' into 'develop' InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545 | 2020-05-20 10:53:54 +00:00 |  | 
				
					
						| 
								
								
									 lain | 8a6ddf26ac | InstanceOperation: Add background image to example | 2020-05-20 12:12:07 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 47ed9ee441 | Fix summary | 2020-05-19 17:29:58 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 524d04d921 | Add OpenAPI spec for PleromaAPI.ScrobbleController | 2020-05-19 16:26:06 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e4c720f14c | Fix typo | 2020-05-19 14:59:50 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | fe5d423b43 | Add OpenAPI spec for MascotController | 2020-05-18 22:01:18 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 45c3a72404 | [OpenAPI] Use BooleanLike in all request bodies | 2020-05-18 20:58:59 +04:00 |  | 
				
					
						| 
								
								
									 lain | 0d417e005d | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-18 18:38:32 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 5735b5c8be | Fixed missing support for with_mutedparam in direct timeline. | 2020-05-18 19:00:00 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | aef31c69df | Rename EmojiAPIController to EmojiPackController | 2020-05-18 19:43:25 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 6e4de715b3 | Add OpenAPI spec for PleromaAPI.EmojiAPIController | 2020-05-18 19:28:46 +04:00 |  | 
				
					
						| 
								
								
									 lain | 9c17109765 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-17 12:14:49 +02: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 |  | 
				
					
						| 
								
								
									 lain | d96f8f17e8 | Merge branch 'features/mastoapi_v2_media' into 'develop' MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439 | 2020-05-16 17:13:38 +00:00 |  | 
				
					
						| 
								
								
									 lain | f012c3a202 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-15 13:33:04 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1d18721a3c | Chats: Add updated_at to Schema and docs. | 2020-05-15 13:18:41 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e090191d03 | [OpenAPI] Mark all not required request fields as nullable | 2020-05-15 14:55:41 +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 |  | 
				
					
						| 
								
								
									 lain | 359d7b0a6d | Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex | 2020-05-14 09:09:11 +00:00 |  | 
				
					
						| 
								
								
									 lain | 1c2629328d | Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex | 2020-05-14 09:07:09 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 8062d590dd | [#2456] OpenAPI-related tweaks. Removed support for with_relationshipsparam inGET /api/v1/accounts/search. | 2020-05-13 18:56:45 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 6802dc28ba | Add OpenAPI spec for PleromaAPI.AccountController | 2020-05-13 19:06:46 +04:00 |  | 
				
					
						| 
								
								
									 lain | 0f0acc740d | Chat: Allow posting without content if an attachment is present. | 2020-05-13 15:31:28 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 59b6d5f2aa | [#2456] Changed embed_relationshipsparam towith_relationships. | 2020-05-13 15:08:07 +03:00 |  | 
				
					
						| 
								
								
									 lain | 3cff4e24cd | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-13 12:44:16 +02: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 | 79ad12064d | Fix format | 2020-05-13 01:59:17 +04:00 |  | 
				
					
						| 
								
								
									 minibikini | cb1a3e196c | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:23:43 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 5a2333925c | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:23:36 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 822e9c09aa | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:23:21 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 40646a7e0e | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:14:52 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 0bb164a3e1 | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:12:22 +00:00 |  |