Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								696bf09433 
								
							 
						 
						
							
							
								
								passing adapter options directly without adapter key  
							
							
							
						 
						
							2020-09-07 19:59:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee67c98e55 
								
							 
						 
						
							
							
								
								removing Stats worker from Oban cron jobs  
							
							
							
						 
						
							2020-09-07 19:16:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d5c286b802 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/favicon-too-long' into 'develop'  
							
							... 
							
							
							
							instance: Drop favicon URLs longer than 255 characters
Closes  #2116 
See merge request pleroma/pleroma!2949  
							
						 
						
							2020-09-07 11:12:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fdab01ab56 
								
							 
						 
						
							
							
								
								Merge branch 'fix/rich-media-fake-statuses' into 'develop'  
							
							... 
							
							
							
							Rich Media: Do not cache URLs for preview statuses
Closes  #1987 
See merge request pleroma/pleroma!2956  
							
						 
						
							2020-09-07 10:19:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								08aef7dd4e 
								
							 
						 
						
							
							
								
								instance: Log catch favicon errors as warnings  
							
							
							
						 
						
							2020-09-07 08:40:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								170599c390 
								
							 
						 
						
							
							
								
								RichMedia: do not log webpages missing metadata as errors  
							
							... 
							
							
							
							Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end 
							
						 
						
							2020-09-05 22:05:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e198ba492e 
								
							 
						 
						
							
							
								
								Rich Media: Do not cache URLs for preview statuses  
							
							... 
							
							
							
							Closes  #1987  
						
							2020-09-05 20:53:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9433311923 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/incoming-poll-emoji' into 'develop'  
							
							... 
							
							
							
							Fix emoji in Question, force generated context/context_id insertion
Closes  #1870 
See merge request pleroma/pleroma!2915  
							
						 
						
							2020-09-03 11:50:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5da3677607 
								
							 
						 
						
							
							
								
								Frontend mix task: Add tests.  
							
							
							
						 
						
							2020-09-03 11:40:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d1a6f67b1d 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2095-deactivated-account-reset' into 'develop'  
							
							... 
							
							
							
							Disallow password resets for deactivated accounts
Closes  #2095 
See merge request pleroma/pleroma!2935  
							
						 
						
							2020-09-02 17:11:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								119e11f455 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mastoapi-lists' into 'develop'  
							
							... 
							
							
							
							Fix removing an account from a list
Closes  #2103 
See merge request pleroma/pleroma!2940  
							
						 
						
							2020-09-02 17:03:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cbf7f0e029 
								
							 
						 
						
							
							
								
								Disallow password resets for deactivated accounts.  
							
							... 
							
							
							
							Ensure all responses to password reset events are identical. 
							
						 
						
							2020-09-02 09:09:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19691389b9 
								
							 
						 
						
							
							
								
								Rich media: Add failure tracking  
							
							
							
						 
						
							2020-09-02 14:59:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								47ff425cfd 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2047-rich-media-parser' into 'develop'  
							
							... 
							
							
							
							RichMedia parser fix
Closes  #2047 
See merge request pleroma/pleroma!2941  
							
						 
						
							2020-09-02 09:38:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b2d776d77d 
								
							 
						 
						
							
							
								
								Merge branch 'http-fixes' into 'develop'  
							
							... 
							
							
							
							Improvements and fixes for http requests
See merge request pleroma/pleroma!2904  
							
						 
						
							2020-09-02 09:36:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								79f65b4374 
								
							 
						 
						
							
							
								
								correct pool and uniform headers format  
							
							
							
						 
						
							2020-09-02 09:16:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karol Kosek 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								868057871a 
								
							 
						 
						
							
							
								
								search: fix 'following' query parameter  
							
							... 
							
							
							
							The parameter included the accounts that are following you (followers)
instead of those you are actually following.
Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me> 
							
						 
						
							2020-09-02 02:08:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03d06062ab 
								
							 
						 
						
							
							
								
								don't fail on url fetch  
							
							
							
						 
						
							2020-09-01 19:39:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d872858046 
								
							 
						 
						
							
							
								
								Fix removing an account from a list  
							
							... 
							
							
							
							Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose 
							
						 
						
							2020-09-01 12:49:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								126461942b 
								
							 
						 
						
							
							
								
								User table: ensure bio is always a string  
							
							... 
							
							
							
							Gets rid of '|| ""' in multiple places and fixes  #2067  
							
						 
						
							2020-09-01 10:45:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a142da3e4f 
								
							 
						 
						
							
							
								
								Add new Emoji Ecto.Type and fix emoji in Question  
							
							
							
						 
						
							2020-09-01 08:34:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								9d63b2c9db 
								
							 
						 
						
							
							
								
								Merge branch 'chat-relation-constraints' into 'develop'  
							
							... 
							
							
							
							Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934  
							
						 
						
							2020-08-31 20:55:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0b621a834a 
								
							 
						 
						
							
							
								
								Chats: Add cascading delete on both referenced users.  
							
							... 
							
							
							
							Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases. 
							
						 
						
							2020-08-31 16:48:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f0fefc4f5c 
								
							 
						 
						
							
							
								
								marks notifications as read after mute  
							
							
							
						 
						
							2020-08-28 18:17:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6b01a09a08 
								
							 
						 
						
							
							
								
								Merge branch '2078-list-fixes' into 'develop'  
							
							... 
							
							
							
							Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes  #2070  and #2078 
See merge request pleroma/pleroma!2923  
							
						 
						
							2020-08-27 17:05:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								78939c1d16 
								
							 
						 
						
							
							
								
								ChatController: Don't die if the recipient is gone.  
							
							
							
						 
						
							2020-08-27 12:13:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cfc99fe05c 
								
							 
						 
						
							
							
								
								TimelineController: Keys are atoms now.  
							
							... 
							
							
							
							Closes  #2078 
Closes  #2070  
						
							2020-08-26 15:37:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								fb33321fa2 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1952-read-muted-notifications' into 'develop'  
							
							... 
							
							
							
							Automatically mark notifications about statuses from muted users and threads as read
Closes  #1952 
See merge request pleroma/pleroma!2893  
							
						 
						
							2020-08-25 21:32:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								112bec5225 
								
							 
						 
						
							
							
								
								Webfinger: Handle bogus ids better.  
							
							
							
						 
						
							2020-08-25 17:35:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d51944c7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads  
							
							
							
						 
						
							2020-08-25 11:44:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d39abd02ac 
								
							 
						 
						
							
							
								
								Merge branch 'relay-fix-admin-fe' into 'develop'  
							
							... 
							
							
							
							Relay fix for admin-fe
See merge request pleroma/pleroma!2902  
							
						 
						
							2020-08-24 17:03:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1c8c599ff 
								
							 
						 
						
							
							
								
								Merge branch 'features/validators-event' into 'develop'  
							
							... 
							
							
							
							Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909  
							
						 
						
							2020-08-21 16:10:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f8c32b773 
								
							 
						 
						
							
							
								
								adding actor type in user show  
							
							
							
						 
						
							2020-08-21 10:38:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36c125a071 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Event  
							
							
							
						 
						
							2020-08-20 21:49:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c1277be041 
								
							 
						 
						
							
							
								
								AudioHandlingTest: Make mock explicit  
							
							
							
						 
						
							2020-08-19 14:36:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9aae342e7a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2  
							
							
							
						 
						
							2020-08-19 14:10:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c68bcae362 
								
							 
						 
						
							
							
								
								fix for sometimes failing tests  
							
							
							
						 
						
							2020-08-19 12:57:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dc275b69b 
								
							 
						 
						
							
							
								
								relay fix for admin-fe  
							
							
							
						 
						
							2020-08-19 08:41:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5316e231b0 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Audio (Part 2)  
							
							
							
						 
						
							2020-08-19 00:06:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3d5d8c05c9 
								
							 
						 
						
							
							
								
								Merge branch '2064-image-blanking' into 'develop'  
							
							... 
							
							
							
							Resolve "Make default image description blank"
Closes  #2064 
See merge request pleroma/pleroma!2899  
							
						 
						
							2020-08-18 19:02:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0a8d723bb 
								
							 
						 
						
							
							
								
								Transmogrifier Test: Extract audio tests.  
							
							
							
						 
						
							2020-08-18 13:37:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aabc26a573 
								
							 
						 
						
							
							
								
								Pleroma.Upload: Set default upload name / description based on config.  
							
							
							
						 
						
							2020-08-18 13:21:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a0f5eb1a55 
								
							 
						 
						
							
							
								
								Test that POST /api/pleroma/delete_account purges the user  
							
							
							
						 
						
							2020-08-18 00:24:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dcc8926ff1 
								
							 
						 
						
							
							
								
								Test purging a user with User.delete/1  
							
							
							
						 
						
							2020-08-18 00:10:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c12c576ee2 
								
							 
						 
						
							
							
								
								Also purge bio and display name  
							
							
							
						 
						
							2020-08-17 22:11:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d55faa2f8f 
								
							 
						 
						
							
							
								
								Purge a local user upon deletion,  fixes   #2062  
							
							
							
						 
						
							2020-08-17 21:52:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								34b099fffa 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1936' into 'develop'  
							
							... 
							
							
							
							[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873  
							
						 
						
							2020-08-17 13:05:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								25c69e271a 
								
							 
						 
						
							
							
								
								Make notifications about new statuses from muted threads read  
							
							
							
						 
						
							2020-08-17 00:11:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f6da12f45d 
								
							 
						 
						
							
							
								
								fix search media proxy urls  
							
							
							
						 
						
							2020-08-16 06:54:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								60ac83a4c1 
								
							 
						 
						
							
							
								
								[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.  
							
							
							
						 
						
							2020-08-15 18:30:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0865f36965 
								
							 
						 
						
							
							
								
								Mark notifications about statuses from muted users as read automatically  
							
							
							
						 
						
							2020-08-15 15:27:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								95529ab709 
								
							 
						 
						
							
							
								
								[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).  
							
							
							
						 
						
							2020-08-14 20:55:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								14a06e63f6 
								
							 
						 
						
							
							
								
								Merge branch 'fix/activity-expirations-again' into 'develop'  
							
							... 
							
							
							
							Fix activity expirations again
See merge request pleroma/pleroma!2866  
							
						 
						
							2020-08-13 17:38:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								f99b8a25eb 
								
							 
						 
						
							
							
								
								Merge branch 'reject' into 'develop'  
							
							... 
							
							
							
							Move Accepts and Rejects to the Pipeline
See merge request pleroma/pleroma!2878  
							
						 
						
							2020-08-13 16:04:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5be25b3e38 
								
							 
						 
						
							
							
								
								Merge branch '1152-deletion' into 'develop'  
							
							... 
							
							
							
							User deletion issue exploration
See merge request pleroma/pleroma!2879  
							
						 
						
							2020-08-13 09:06:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								56470647de 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1936  
							
							
							
						 
						
							2020-08-13 09:00:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ab83f837e 
								
							 
						 
						
							
							
								
								don't load pinned activities in due_expirations  
							
							
							
						 
						
							2020-08-12 19:46:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc56de167 
								
							 
						 
						
							
							
								
								Merge branch 'feature/update-welcome-setting-in-description' into 'develop'  
							
							... 
							
							
							
							Update :welcome settings in description.exs
Closes  #2024 
See merge request pleroma/pleroma!2843  
							
						 
						
							2020-08-12 16:18:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								05ff666f99 
								
							 
						 
						
							
							
								
								AdminApiControllerTest: Add test that deleted users get deactivated.  
							
							
							
						 
						
							2020-08-12 16:31:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7224bf309e 
								
							 
						 
						
							
							
								
								Transmogrifier: Move Rejects to the Pipeline  
							
							
							
						 
						
							2020-08-12 14:48:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								62f7cca9a1 
								
							 
						 
						
							
							
								
								Transmogrifier Tests: Extract rejections.  
							
							
							
						 
						
							2020-08-12 13:39:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bb92ad44a6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject  
							
							
							
						 
						
							2020-08-12 12:53:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0589e9156a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again  
							
							
							
						 
						
							2020-08-11 17:49:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f988d82e46 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle accepts with the pipeline  
							
							
							
						 
						
							2020-08-11 17:26:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9dda13bfa1 
								
							 
						 
						
							
							
								
								Transmogrifier Test: Remove mastodon hack test.  
							
							
							
						 
						
							2020-08-11 16:22:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3f6d50111e 
								
							 
						 
						
							
							
								
								Linter fixes.  
							
							
							
						 
						
							2020-08-11 16:07:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								da3f9b9988 
								
							 
						 
						
							
							
								
								Transmogrifier: Remove handling of orphaned accepts  
							
							... 
							
							
							
							This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older. 
							
						 
						
							2020-08-11 15:41:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b1e8bec2f 
								
							 
						 
						
							
							
								
								AcceptValidation: Codify accept rules.  
							
							
							
						 
						
							2020-08-11 15:32:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f1a0c10b17 
								
							 
						 
						
							
							
								
								AcceptValidator: Add basic validator with tests.  
							
							
							
						 
						
							2020-08-11 15:13:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8f9fbc86c0 
								
							 
						 
						
							
							
								
								Transmogrifier: Small readability changes.  
							
							
							
						 
						
							2020-08-11 14:02:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								54a6855ddf 
								
							 
						 
						
							
							
								
								Transmogrifier Tests: Extract Accept handling  
							
							
							
						 
						
							2020-08-11 14:01:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								686002164a 
								
							 
						 
						
							
							
								
								Merge branch '204-fix' into 'develop'  
							
							... 
							
							
							
							Fix 500 errors when returning :no_content, fixes  #2029 
Closes  #2029 
See merge request pleroma/pleroma!2856  
							
						 
						
							2020-08-11 09:18:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9a9121805c 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-08-11 09:08:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								677abbf0ee 
								
							 
						 
						
							
							
								
								Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again  
							
							
							
						 
						
							2020-08-11 10:55:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e4932362b 
								
							 
						 
						
							
							
								
								SideEffects: Handle strange deletion case.  
							
							
							
						 
						
							2020-08-11 10:54:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								345ac512e4 
								
							 
						 
						
							
							
								
								added paginate+search for admin/MediaProxy URLs  
							
							
							
						 
						
							2020-08-11 10:30:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								78484fe0ef 
								
							 
						 
						
							
							
								
								Merge branch 'admin-active-filter' into 'develop'  
							
							... 
							
							
							
							Admin API: Filter out unapproved users when the `active` filter is on
Closes  #2037 
See merge request pleroma/pleroma!2872  
							
						 
						
							2020-08-10 17:16:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								249f21dcbb 
								
							 
						 
						
							
							
								
								Admin API: Filter out unapproved users when the active filter is on  
							
							
							
						 
						
							2020-08-10 18:27:39 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5c4548d5e7 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'issue/1023' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2763  
							
						 
						
							2020-08-10 13:05:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66122a11b5 
								
							 
						 
						
							
							
								
								AccountController: Build the correct update activity.  
							
							... 
							
							
							
							Will fix federation issues. 
							
						 
						
							2020-08-10 10:33:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0fc48ea67 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feat/floki-fast-html-2'  
							
							... 
							
							
							
							# Conflicts:
#   config/config.exs 
							
						 
						
							2020-08-09 10:53:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5557bf8ba 
								
							 
						 
						
							
							
								
								Add mix task to add expiration to all local statuses  
							
							
							
						 
						
							2020-08-08 16:29:40 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								54e2af8293 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/ldap-auth-issues  
							
							
							
						 
						
							2020-08-07 14:55:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								673e8e3ac1 
								
							 
						 
						
							
							
								
								Force 204 responses to be empty,  fixes   #2029  
							
							
							
						 
						
							2020-08-07 13:02:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								50d5bdfd31 
								
							 
						 
						
							
							
								
								Mix Task Frontend test: Expand.  
							
							
							
						 
						
							2020-08-07 16:03:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7e23a48d38 
								
							 
						 
						
							
							
								
								rel me test: fix HTML so broken browsers (and therefore  
							
							... 
							
							
							
							lexbor) refuse to parse it like mochiweb does 
							
						 
						
							2020-08-07 16:45:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								325c7c924b 
								
							 
						 
						
							
							
								
								Make Floki use fast_html  
							
							
							
						 
						
							2020-08-07 16:45:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								de00a4c0f1 
								
							 
						 
						
							
							
								
								Mix Task Frontend Test: Capture IO.  
							
							
							
						 
						
							2020-08-07 15:27:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d97b76104e 
								
							 
						 
						
							
							
								
								Mix Task Frontend: Add tests.  
							
							
							
						 
						
							2020-08-07 15:10:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								34cbe9f44a 
								
							 
						 
						
							
							
								
								Merge branch 'features/poll-validation' into 'develop'  
							
							... 
							
							
							
							Poll and votes pipeline ingestion
Closes  #1362  and #1852 
See merge request pleroma/pleroma!2635  
							
						 
						
							2020-08-07 10:44:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8e90cc58e7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/update-welcome-setting-in-description  
							
							
							
						 
						
							2020-08-07 09:48:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6e6276b4f8 
								
							 
						 
						
							
							
								
								added test  
							
							
							
						 
						
							2020-08-07 09:47:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bf95dfb240 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads  
							
							
							
						 
						
							2020-08-06 15:22:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								10b0e55acf 
								
							 
						 
						
							
							
								
								Merge branch 'whole-word-filter-hotfix' into 'develop'  
							
							... 
							
							
							
							Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851  
							
						 
						
							2020-08-06 08:35:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mary Kate 
								
							 
						 
						
							
							
							
							
								
							
							
								f785dba09b 
								
							 
						 
						
							
							
								
								changelog for filter whole_word fix  
							
							
							
						 
						
							2020-08-05 15:41:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mary Kate 
								
							 
						 
						
							
							
							
							
								
							
							
								d6ab9f2132 
								
							 
						 
						
							
							
								
								update test for whole_word in filter  
							
							
							
						 
						
							2020-08-05 15:36:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4672b61106 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into command-available-check  
							
							
							
						 
						
							2020-08-05 19:16:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7755f49e28 
								
							 
						 
						
							
							
								
								Merge branch 'migrate-legacy-tags' into 'develop'  
							
							... 
							
							
							
							Migrate legacy tags set by AdminFE to match TagPolicy, #2010 
See merge request pleroma/pleroma!2836  
							
						 
						
							2020-08-05 16:03:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9c96fc052a 
								
							 
						 
						
							
							
								
								CommonValidations: Extract modification right checker  
							
							
							
						 
						
							2020-08-05 17:26:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2173945f90 
								
							 
						 
						
							
							
								
								MailerTest: Give it some time.  
							
							
							
						 
						
							2020-08-05 17:26:03 +02:00