| 
								
								
									 lain | c2a052a346 | Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop' MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690 | 2020-07-03 15:06:33 +00:00 |  | 
				
					
						| 
								
								
									 lain | d3efb50262 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text | 2020-07-03 16:44:31 +02:00 |  | 
				
					
						| 
								
								
									 lain | 945e75c8e8 | SearchController: Trim query. | 2020-07-03 16:36:55 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 244655e884 | MastoAPI: Show source field when deleting | 2020-06-26 19:52:20 +02:00 |  | 
				
					
						| 
								
								
									 lain | 8cfb58a8c0 | AccountController: Extract blocking to CommonAPI. | 2020-06-25 11:44:04 +02:00 |  | 
				
					
						| 
								
								
									 lain | 2c603f2009 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator | 2020-06-23 10:17:12 +02:00 |  | 
				
					
						| 
								
								
									 lain | 59bdef0c33 | Merge branch 'feature/1739-account-endpoints' into 'develop' account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488 | 2020-06-22 12:37:10 +00:00 |  | 
				
					
						| 
								
								
									 lain | b05f795326 | Credo fixes | 2020-06-22 14:02:29 +02:00 |  | 
				
					
						| 
								
								
									 lain | e785cd5cae | ActivityPub: Remove updateand switch to pipeline. | 2020-06-22 13:59:45 +02:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | b63646169d | Add support for bot field in update_credentials | 2020-06-19 21:18:07 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 5237a2df9f | [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search. | 2020-06-19 16:14:06 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 4ec2fb967e | Merge branch 'features/users-raw_bio' into 'develop' User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326 | 2020-06-17 10:34:23 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 4115701f71 | Merge branch 'recipients-experiments' into 'develop' ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637 | 2020-06-12 16:57:13 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 2188097066 | [#1794] Fixes URI query handling for hashtags extraction in search. | 2020-06-12 14:25:41 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b28cec4271 | [#1794] Fixes URI query handling for hashtags extraction in search. | 2020-06-11 16:05:14 +03:00 |  | 
				
					
						| 
								
								
									 lain | 9e411372d0 | ActivityPub: Don't show announces of your own objects in timeline. | 2020-06-10 12:10:09 +02:00 |  | 
				
					
						| 
								
								
									 lain | 3b5282bef2 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-06-08 11:19:18 +02:00 |  | 
				
					
						| 
								
								
									 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 Createin 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 descriptioninupdateaction | 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_relationshipsparam inGET /api/v1/accounts/search. | 2020-05-13 18:56:45 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 59b6d5f2aa | [#2456] Changed embed_relationshipsparam towith_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 |  |