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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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