Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								433c01b370 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/notification_settings  
							
							
							
						 
						
							2020-06-25 14:26:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								35f6770436 
								
							 
						 
						
							
							
								
								StatusView: Add pleroma.parent_visible  
							
							
							
						 
						
							2020-06-24 13:29:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								46f7e51b27 
								
							 
						 
						
							
							
								
								Merge branch 'add-muted-to-notifications' into 'develop'  
							
							... 
							
							
							
							Add `pleroma.is_muted` property to notifications
Closes  #1812 
See merge request pleroma/pleroma!2670  
							
						 
						
							2020-06-22 15:40:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e6f43c0d7 
								
							 
						 
						
							
							
								
								Add is_muted to notifications  
							
							
							
						 
						
							2020-06-22 19:03:04 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c75ba63bef 
								
							 
						 
						
							
							
								
								Merge branch '1865-media-only' into 'develop'  
							
							... 
							
							
							
							Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes  #1865 
See merge request pleroma/pleroma!2650  
							
						 
						
							2020-06-22 11:34:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d542450b1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into '1865-media-only'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-06-20 09:33:18 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1eb6cedaad 
								
							 
						 
						
							
							
								
								ActivityPub: When restricting to media posts, only show 'Creates'.  
							
							
							
						 
						
							2020-06-16 13:08:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b7df7436c8 
								
							 
						 
						
							
							
								
								Conversations: Return last dm for conversation, not last message.  
							
							
							
						 
						
							2020-06-15 12:27:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								b15cfc3d36 
								
							 
						 
						
							
							
								
								Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page  
							
							
							
						 
						
							2020-06-14 18:27:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								271ea5068f 
								
							 
						 
						
							
							
								
								Merge branch '1851-favorites-pagination' into 'develop'  
							
							... 
							
							
							
							StatusController: Correctly paginate favorites.
Closes  #1851 
See merge request pleroma/pleroma!2636  
							
						 
						
							2020-06-13 17:20:43 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								063e6b9841 
								
							 
						 
						
							
							
								
								StatusController: Correctly paginate favorites.  
							
							... 
							
							
							
							Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this. 
							
						 
						
							2020-06-09 10:53:40 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ca0e6e702b 
								
							 
						 
						
							
							
								
								ChatMessageReference -> Chat.MessageReference  
							
							
							
						 
						
							2020-06-06 11:51:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a8ca030d85 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-05 16:53:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d44da91bbf 
								
							 
						 
						
							
							
								
								SubscriptionOperation: Let chat mentions through.  
							
							
							
						 
						
							2020-06-04 20:28:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3ccd50a33 
								
							 
						 
						
							
							
								
								ChatMessageReferences: Adjust views  
							
							
							
						 
						
							2020-06-03 12:49:53 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								879304dcd9 
								
							 
						 
						
							
							
								
								Merge branch 'replies-domain-block' into 'develop'  
							
							... 
							
							
							
							Replies domain block
Closes  #1650 
See merge request pleroma/pleroma!2622  
							
						 
						
							2020-06-02 14:14:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								127ccc4e1c 
								
							 
						 
						
							
							
								
								NotificationController: Don't return chat_mentions by default.  
							
							
							
						 
						
							2020-06-02 14:05:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8e1db6a835 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-02 10:43:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19f468c5bc 
								
							 
						 
						
							
							
								
								replies filtering for blocked domains  
							
							
							
						 
						
							2020-06-02 09:00:10 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e6ec778d9 
								
							 
						 
						
							
							
								
								exclude replies on blocked domains  
							
							
							
						 
						
							2020-06-01 21:17:32 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6ff079ca9f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-30 12:31:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b004c427a0 
								
							 
						 
						
							
							
								
								Merge branch 'conversation-pagination' into 'develop'  
							
							... 
							
							
							
							Conversation pagination
See merge request pleroma/pleroma!2601  
							
						 
						
							2020-05-30 10:02:37 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								af6d01ec93 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-29 12:36:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9eea800026 
								
							 
						 
						
							
							
								
								Refactor notification settings  
							
							
							
						 
						
							2020-05-28 10:16:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8f6d428880 
								
							 
						 
						
							
							
								
								AccountView: Use mediaproxy URLs for emojis  
							
							... 
							
							
							
							Also use atom keys in emoji maps instead of binaries
Closes  #1810  
							
						 
						
							2020-05-27 19:44:02 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								814c3e5171 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-21 15:00:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								23e248694d 
								
							 
						 
						
							
							
								
								Announcements: Fix all tests.  
							
							
							
						 
						
							2020-05-21 13:16:21 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6609714d66 
								
							 
						 
						
							
							
								
								Move Scrobble views to ScrobbleView  
							
							
							
						 
						
							2020-05-19 16:26:06 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								41f8f17260 
								
							 
						 
						
							
							
								
								fix api/v1/accounts/update_credentials  
							
							
							
						 
						
							2020-05-19 09:42:41 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								188b32145e 
								
							 
						 
						
							
							
								
								InstanceView: Expose background image link.  
							
							... 
							
							
							
							This will make it easier for more clients to support this feature. 
							
						 
						
							2020-05-18 13:29:30 +02: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0321a3e078 
								
							 
						 
						
							
							
								
								test naming fix  
							
							
							
						 
						
							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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f012c3a202 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-15 13:33:04 +02: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb363f0183 
								
							 
						 
						
							
							
								
								MastodonAPI: /api/v2/media endpoints  
							
							
							
						 
						
							2020-05-14 10:14:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								da550be066 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1742-random-failing-tests' into 'develop'  
							
							... 
							
							
							
							Fix sporadically failing tests
See merge request pleroma/pleroma!2524  
							
						 
						
							2020-05-13 13:38:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3cff4e24cd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-13 12:44:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bcadbf964a 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for SuggestionController  
							
							
							
						 
						
							2020-05-13 14:15:24 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								12635bc156 
								
							 
						 
						
							
							
								
								don't use global mocks in setup callbacks  
							
							
							
						 
						
							2020-05-13 11:38:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7803a85d2c 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for StatusController  
							
							
							
						 
						
							2020-05-13 00:25:21 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dcb5cda324 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-12 13:13:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dfb90a1fd6 
								
							 
						 
						
							
							
								
								Transmogrifier: Add tests for certain announces  
							
							
							
						 
						
							2020-05-12 12:50:48 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7637ef4203 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-08 13:13:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fbcc53760e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/emojireactvalidator' into 'develop'  
							
							... 
							
							
							
							Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473  
							
						 
						
							2020-05-08 10:41:41 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ef55d24054 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator  
							
							
							
						 
						
							2020-05-07 18:53:34 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								7ac0cffb34 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator  
							
							
							
						 
						
							2020-05-07 15:03:12 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3a45952a3a 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for ConversationController  
							
							
							
						 
						
							2020-05-05 17:44:46 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								db55dc9445 
								
							 
						 
						
							
							
								
								ActivityPub: Remove react_with_emoji.  
							
							
							
						 
						
							2020-05-05 12:28:28 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e7b1df7252 
								
							 
						 
						
							
							
								
								Fix sporadic test compilation failure caused by unused alias  
							
							
							
						 
						
							2020-05-01 22:50:40 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								00e62161f6 
								
							 
						 
						
							
							
								
								[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.  
							
							
							
						 
						
							2020-04-24 16:52:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f362836742 
								
							 
						 
						
							
							
								
								Support validation for inline OpenAPI schema and automatic tests for examples  
							
							
							
						 
						
							2020-04-24 15:16:15 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								163341857a 
								
							 
						 
						
							
							
								
								Improve OpenAPI errors  
							
							
							
						 
						
							2020-04-17 19:27:22 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf4ebba774 
								
							 
						 
						
							
							
								
								Cleanup SubscriptionController  
							
							
							
						 
						
							2020-04-15 23:14:47 +04:00