Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2113428c0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into feature/account-export  
							
							 
							
							
							
						 
						
							2020-10-30 19:34:02 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								131f3219e6 
								
							 
						 
						
							
							
								
								Merge branch 'issue/2069' into 'develop'  
							
							 
							
							... 
							
							
							
							[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939  
							
						 
						
							2020-10-29 23:39:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9e54ef086b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/account-export  
							
							 
							
							
							
						 
						
							2020-10-27 12:51:31 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									shironeko 
								
							 
						 
						
							
							
							
							
								
							
							
								bd033aba48 
								
							 
						 
						
							
							
								
								Translated using Weblate (Chinese (Simplified))  
							
							 
							
							... 
							
							
							
							Currently translated at 45.2% (48 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/  
							
						 
						
							2020-10-22 20:34:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e87901c424 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into feature/account-export  
							
							 
							
							
							
						 
						
							2020-10-20 17:27:29 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fb056ce05b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/discoverable_user_field  
							
							 
							
							
							
						 
						
							2020-10-15 16:39:01 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1fb9452131 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/account-export  
							
							 
							
							
							
						 
						
							2020-10-14 15:27:15 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								409f694e4f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/locked_user_field  
							
							 
							
							
							
						 
						
							2020-10-13 09:54:29 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4ead0d564f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/discoverable_user_field  
							
							 
							
							
							
						 
						
							2020-10-13 09:54:11 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8bacdc3680 
								
							 
						 
						
							
							
								
								Change user.discoverable field to user.is_discoverable  
							
							 
							
							
							
						 
						
							2020-10-13 09:45:08 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9968b7efed 
								
							 
						 
						
							
							
								
								Change user.locked field to user.is_locked  
							
							 
							
							
							
						 
						
							2020-10-13 09:31:13 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3cb9c88837 
								
							 
						 
						
							
							
								
								migration and warning for RemoteIp plug rename  
							
							 
							
							
							
						 
						
							2020-10-13 16:44:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								eea879eb36 
								
							 
						 
						
							
							
								
								Update AdminFE build to latest develop  
							
							 
							
							
							
						 
						
							2020-10-13 07:51:48 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6c61ef14c3 
								
							 
						 
						
							
							
								
								Support enabling upload filters during instance gen  
							
							 
							
							
							
						 
						
							2020-10-12 11:19:48 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f3a633745 
								
							 
						 
						
							
							
								
								Add backups table  
							
							 
							
							
							
						 
						
							2020-10-07 18:34:28 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1ae39441e6 
								
							 
						 
						
							
							
								
								Migrations: Nullify old unique index on users.uri  
							
							 
							
							
							
						 
						
							2020-09-30 14:17:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								90fee49c52 
								
							 
						 
						
							
							
								
								User search: Once again, change uri handling.  
							
							 
							
							... 
							
							
							
							They can indeed be non-unique. 
							
						 
						
							2020-09-30 14:14:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7bc561127d 
								
							 
						 
						
							
							
								
								Revert citext user URI migration  
							
							 
							
							... 
							
							
							
							URI paths are not actually case-insesitive, which caused migration issues
 on a number of databases.
Closes  #2188  
							
						 
						
							2020-09-28 18:34:03 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1e0f3f8514 
								
							 
						 
						
							
							
								
								User search: Make uri matches case insensitive.  
							
							 
							
							
							
						 
						
							2020-09-25 08:56:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Kana 
								
							 
						 
						
							
							
							
							
								
							
							
								f3c62b246d 
								
							 
						 
						
							
							
								
								Translated using Weblate (Chinese (Simplified))  
							
							 
							
							... 
							
							
							
							Currently translated at 24.5% (26 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/  
							
						 
						
							2020-09-20 14:48:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Kana 
								
							 
						 
						
							
							
							
							
								
							
							
								d72970a1fc 
								
							 
						 
						
							
							
								
								Added translation using Weblate (Chinese (Simplified))  
							
							 
							
							
							
						 
						
							2020-09-20 13:18:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								065a4dddfd 
								
							 
						 
						
							
							
								
								Merge branch 'stable' into stable-sync/2.1.2  
							
							 
							
							
							
						 
						
							2020-09-17 22:19:49 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								34afc2b074 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d  
							
							 
							
							
							
						 
						
							2020-09-17 21:22:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6b088ed76a 
								
							 
						 
						
							
							
								
								Merge branch 'issue/2089' into 'develop'  
							
							 
							
							... 
							
							
							
							[#2089 ] fix notifications
See merge request pleroma/pleroma!3000  
							
						 
						
							2020-09-16 12:22:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c74fad9e06 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							 
							
							
							
						 
						
							2020-09-16 03:18:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0b5e72ecf0 
								
							 
						 
						
							
							
								
								Remove :managed_config option.  
							
							 
							
							... 
							
							
							
							In practice, it was already removed half a year ago, but the description
 and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
 to ConfigDB.
Closes  #2086  
							
						 
						
							2020-09-14 18:04:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e53ab4e98 
								
							 
						 
						
							
							
								
								added notification constraints  
							
							 
							
							
							
						 
						
							2020-09-14 14:08:12 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65f4e37ee1 
								
							 
						 
						
							
							
								
								remove old workers in oban migrations  
							
							 
							
							
							
						 
						
							2020-09-13 10:04:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tarteka 
								
							 
						 
						
							
							
							
							
								
							
							
								6877bad44c 
								
							 
						 
						
							
							
								
								Translated using Weblate (Spanish)  
							
							 
							
							... 
							
							
							
							Currently translated at 20.7% (22 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/  
							
						 
						
							2020-09-11 23:15:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e3ca0a7e2d 
								
							 
						 
						
							
							
								
								migration to remove old cron jobs  
							
							 
							
							
							
						 
						
							2020-09-11 09:09:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								15aece7238 
								
							 
						 
						
							
							
								
								remove validate_expires_at from enqueue method  
							
							 
							
							
							
						 
						
							2020-09-10 21:52:31 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								29c1178c2b 
								
							 
						 
						
							
							
								
								migration fix  
							
							 
							
							
							
						 
						
							2020-09-10 21:50:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f2d114518 
								
							 
						 
						
							
							
								
								use another stream function in migration  
							
							 
							
							
							
						 
						
							2020-09-10 21:50:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								5381d4b78b 
								
							 
						 
						
							
							
								
								drop activity_expirations table  
							
							 
							
							
							
						 
						
							2020-09-10 21:50:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								5ad0cc4c86 
								
							 
						 
						
							
							
								
								move old expirations into Oban  
							
							 
							
							
							
						 
						
							2020-09-10 21:50:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								629a8de9cb 
								
							 
						 
						
							
							
								
								deprecation warning  
							
							 
							
							... 
							
							
							
							changed namespace for activity expiration configuration 
							
						 
						
							2020-09-10 21:50:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eca42566ba 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2020-09-10 16:01:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e11fca88d4 
								
							 
						 
						
							
							
								
								migration to move tokens expiration into Oban  
							
							 
							
							
							
						 
						
							2020-09-10 16:01:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6647c08e1 
								
							 
						 
						
							
							
								
								migration and changelog  
							
							 
							
							
							
						 
						
							2020-09-10 16:01:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tarteka 
								
							 
						 
						
							
							
							
							
								
							
							
								6ec1a9ded1 
								
							 
						 
						
							
							
								
								Translated using Weblate (Spanish)  
							
							 
							
							... 
							
							
							
							Currently translated at 9.4% (10 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/  
							
						 
						
							2020-09-09 10:52:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tarteka 
								
							 
						 
						
							
							
							
							
								
							
							
								ace94bfcc8 
								
							 
						 
						
							
							
								
								Added translation using Weblate (Spanish)  
							
							 
							
							
							
						 
						
							2020-09-09 09:49:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5ef840ed9c 
								
							 
						 
						
							
							
								
								Merge branch 'stable' into stable-sync/2.1.1  
							
							 
							
							
							
						 
						
							2020-09-08 20:34:02 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7528a7e447 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679  
							
							 
							
							
							
						 
						
							2020-09-08 19:45:44 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8a3d43044a 
								
							 
						 
						
							
							
								
								migrations for renaming gun timeout options  
							
							 
							
							
							
						 
						
							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 
								
							 
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0d5088c2b8 
								
							 
						 
						
							
							
								
								remove unread_conversation_count from User  
							
							 
							
							
							
						 
						
							2020-09-01 09:37:08 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								82bf27172c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0  
							
							 
							
							
							
						 
						
							2020-08-27 15:38:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f1b9e3595d 
								
							 
						 
						
							
							
								
								Update AdminFE build in preparation for 2.1.0 release  
							
							 
							
							
							
						 
						
							2020-08-26 15:43:34 -05:00