Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0b725f5d21 
								
							 
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							2021-01-14 16:00:32 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								12c8ce481c 
								
							 
						 
						
							
							
								
								Bump Copyright year  
							
							 
							
							
							
						 
						
							2021-01-14 13:58:52 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fb47e83adc 
								
							 
						 
						
							
							
								
								Add ConfigDB migration  
							
							 
							
							
							
						 
						
							2021-01-14 13:53:55 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								fd9a0ac329 
								
							 
						 
						
							
							
								
								BackupTest: Fix s3 test.  
							
							 
							
							
							
						 
						
							2021-01-14 20:18:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ba234d3c73 
								
							 
						 
						
							
							
								
								Unnecessary duplication here  
							
							 
							
							
							
						 
						
							2021-01-13 12:01:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								94e5180846 
								
							 
						 
						
							
							
								
								Consistent style  
							
							 
							
							
							
						 
						
							2021-01-13 12:00:48 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								67e888498c 
								
							 
						 
						
							
							
								
								Switch another test to Upload.base_url/0  
							
							 
							
							
							
						 
						
							2021-01-12 16:42:43 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e87cca97e6 
								
							 
						 
						
							
							
								
								Fix tests relying on old behavior. Use the Upload.base_url, Luke.  
							
							 
							
							
							
						 
						
							2021-01-12 16:35:10 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8b28dce82a 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Uploaders.S3, :public_endpoint  
							
							 
							
							
							
						 
						
							2021-01-12 16:31:35 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								5453038ce9 
								
							 
						 
						
							
							
								
								Merge branch 'fix/backup-url-on-s3' into 'develop'  
							
							 
							
							... 
							
							
							
							Standardize base url for uploads
See merge request pleroma/pleroma!3246  
							
						 
						
							2021-01-12 20:54:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1a547d7d3 
								
							 
						 
						
							
							
								
								ChatMessages: Fix pagination headers.  
							
							 
							
							... 
							
							
							
							They used to contain the path parameter `id` as query param,
which would break the link. 
							
						 
						
							2021-01-11 15:30:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3c936061d5 
								
							 
						 
						
							
							
								
								Apply Upload.base_url for S3  
							
							 
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5822338f3a 
								
							 
						 
						
							
							
								
								Merge branch 'guppe-example' into 'develop'  
							
							 
							
							... 
							
							
							
							ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243  
							
						 
						
							2021-01-08 15:55:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e73c7fa7e5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into confirm-users  
							
							 
							
							
							
						 
						
							2021-01-08 07:48:19 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b98cd8610 
								
							 
						 
						
							
							
								
								Remove ConfirmUserPlug  
							
							 
							
							
							
						 
						
							2021-01-08 07:47:55 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								80167e62dd 
								
							 
						 
						
							
							
								
								Merge branch 'fix/missing_emoji_steal_dir' into 'develop'  
							
							 
							
							... 
							
							
							
							Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218  
							
						 
						
							2021-01-08 13:10:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3342f6a7ef 
								
							 
						 
						
							
							
								
								Backups: render ID in API  
							
							 
							
							
							
						 
						
							2021-01-07 13:06:22 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bd788c0939 
								
							 
						 
						
							
							
								
								ActivtityPub Test: Add example for guppe actor  
							
							 
							
							
							
						 
						
							2021-01-07 16:20:30 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cf0eb0c1c5 
								
							 
						 
						
							
							
								
								Merge branch 'object-normalize-refactor' into 'develop'  
							
							 
							
							... 
							
							
							
							Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229  
							
						 
						
							2021-01-07 11:09:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4d56aca904 
								
							 
						 
						
							
							
								
								Merge branch 'adminapi-user-email' into 'develop'  
							
							 
							
							... 
							
							
							
							AdminAPI: return user email
See merge request pleroma/pleroma!3240  
							
						 
						
							2021-01-07 10:08:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f6fa5877f 
								
							 
						 
						
							
							
								
								Add AdminAPI.AccountViewTest  
							
							 
							
							
							
						 
						
							2021-01-06 11:43:07 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20af025c65 
								
							 
						 
						
							
							
								
								AdminAPI: return user email  
							
							 
							
							
							
						 
						
							2021-01-06 11:30:32 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								48cd336a72 
								
							 
						 
						
							
							
								
								allow external emoji  
							
							 
							
							
							
						 
						
							2021-01-06 10:13:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f9090e00e6 
								
							 
						 
						
							
							
								
								Add test to validate URLs to custom emojis are properly encoded  
							
							 
							
							
							
						 
						
							2021-01-05 13:58:49 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								20a269ed69 
								
							 
						 
						
							
							
								
								Merge branch 'fix/pagination-regression' into 'develop'  
							
							 
							
							... 
							
							
							
							Do not try to guess which pagination we need by the existence of an :offset param.
Closes  #2399 
See merge request pleroma/pleroma!3230  
							
						 
						
							2021-01-05 12:40:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fee0c6a2cb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users  
							
							 
							
							
							
						 
						
							2021-01-05 13:33:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e802b48d55 
								
							 
						 
						
							
							
								
								User: Use ObjectID type to validate also-known-as field  
							
							 
							
							
							
						 
						
							2021-01-05 13:10:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0e6cff583 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases  
							
							 
							
							
							
						 
						
							2021-01-05 12:42:30 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bea69853a2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff  
							
							 
							
							
							
						 
						
							2021-01-05 12:19:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								95a0ae8a35 
								
							 
						 
						
							
							
								
								AccountControllerTest: Fix test logic  
							
							 
							
							
							
						 
						
							2021-01-05 11:48:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d44850d7a5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor  
							
							 
							
							
							
						 
						
							2021-01-05 10:48:32 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8e5904daa5 
								
							 
						 
						
							
							
								
								SideEffects.DeleteTest: asyncify.  
							
							 
							
							... 
							
							
							
							Replace Mock with Mox, mock out Logger. 
							
						 
						
							2021-01-04 18:40:59 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0e93775ed0 
								
							 
						 
						
							
							
								
								Add test to validate profile pagination works with keyset  
							
							 
							
							
							
						 
						
							2021-01-04 11:04:58 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1e7e4d379 
								
							 
						 
						
							
							
								
								Object: Rework how Object.normalize works  
							
							 
							
							... 
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 
						
							2021-01-04 13:38:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ec7e9b8e9 
								
							 
						 
						
							
							
								
								AdminAPI: return id for moderation log entries  
							
							 
							
							
							
						 
						
							2021-01-01 11:59:48 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7b44605cb8 
								
							 
						 
						
							
							
								
								Migration to confirm previously-logged-in users  
							
							 
							
							
							
						 
						
							2020-12-31 14:04:51 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								afe9c152ab 
								
							 
						 
						
							
							
								
								Merge branch 'fix/reports-ordering' into 'develop'  
							
							 
							
							... 
							
							
							
							Do not reverse order of reports. We want newest ones sorted to the top.
Closes  #2364 
See merge request pleroma/pleroma!3225  
							
						 
						
							2020-12-31 19:24:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e4791258d4 
								
							 
						 
						
							
							
								
								Ensure newest report is returned first in the list  
							
							 
							
							
							
						 
						
							2020-12-31 12:40:42 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								64f0e96ff6 
								
							 
						 
						
							
							
								
								Automatically confirm logged-in users  
							
							 
							
							
							
						 
						
							2020-12-31 12:13:08 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11d40e92b7 
								
							 
						 
						
							
							
								
								Render AKAs in Actor endpoints  
							
							 
							
							
							
						 
						
							2020-12-30 18:53:27 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cbce880076 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases  
							
							 
							
							
							
						 
						
							2020-12-30 17:10:02 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5f75f4e9 
								
							 
						 
						
							
							
								
								Support pagination in AdminAPI for user statuses  
							
							 
							
							
							
						 
						
							2020-12-30 15:18:54 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3966add048 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !2824  
							
						 
						
							2020-12-28 12:02:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								b122b6ffa3 
								
							 
						 
						
							
							
								
								Merge branch 'features/hashtag-column' into 'develop'  
							
							 
							
							... 
							
							
							
							Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824  
							
						 
						
							2020-12-28 10:14:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bfb041658 
								
							 
						 
						
							
							
								
								insreasing test coverage for StealEmojiPolicy  
							
							 
							
							
							
						 
						
							2020-12-27 21:53:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e4f1d8f48c 
								
							 
						 
						
							
							
								
								Merge branch 'cachex-test' into 'develop'  
							
							 
							
							... 
							
							
							
							Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209  
							
						 
						
							2020-12-26 10:26:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acb03d591b 
								
							 
						 
						
							
							
								
								Insert text representation of hashtags into object["hashtags"]  
							
							 
							
							... 
							
							
							
							Includes a new mix task: pleroma.database fill_old_hashtags 
							
						 
						
							2020-12-22 05:15:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ab633e51ab 
								
							 
						 
						
							
							
								
								Linting  
							
							 
							
							
							
						 
						
							2020-12-21 16:48:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5db1e6c8d3 
								
							 
						 
						
							
							
								
								Pipeline test: Switch from Mock to Mox.  
							
							 
							
							... 
							
							
							
							Speeds up the test and makes it possible to run async. 
							
						 
						
							2020-12-21 16:35:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0ef0aed205 
								
							 
						 
						
							
							
								
								Tests: Add a helper method to reduce sleeping times in test.  
							
							 
							
							... 
							
							
							
							This will 'time travel', i.e. change the inserted_at and update_at
fields of the object in question. This is used to backdate things
were we used sleeping before to ensure time differences. 
							
						 
						
							2020-12-21 16:31:23 +01:00