lain 
								
							 
						 
						
							
							
							
							
								
							
							
								88ccade1cb 
								
							 
						 
						
							
							
								
								Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'  
							
							... 
							
							
							
							admin api status count per instance
See merge request pleroma/pleroma!2500  
							
						 
						
							2020-06-24 10:42:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1471b70ef1 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2020-06-23 20:56:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb96c82f70 
								
							 
						 
						
							
							
								
								moving to mrf namespace migration fix  
							
							
							
						 
						
							2020-06-23 20:28:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c7d69e9256 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'  
							
							... 
							
							
							
							Moving mrf settings from instance to separate mrf group
Closes  #1631 
See merge request pleroma/pleroma!2320  
							
						 
						
							2020-06-23 16:38:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4ec2fb967e 
								
							 
						 
						
							
							
								
								Merge branch 'features/users-raw_bio' into 'develop'  
							
							... 
							
							
							
							User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326  
							
						 
						
							2020-06-17 10:34:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3 
								
							 
						 
						
							
							
								
								moving mrf settings from instance to separate group  
							
							
							
						 
						
							2020-06-16 18:32:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								b15cfc3d36 
								
							 
						 
						
							
							
								
								Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page  
							
							
							
						 
						
							2020-06-14 18:27:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1bc37d118 
								
							 
						 
						
							
							
								
								MigrationHelper: Move notification backfilling to own module.  
							
							
							
						 
						
							2020-06-09 09:20:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								604a83ae3e 
								
							 
						 
						
							
							
								
								merge develop  
							
							
							
						 
						
							2020-06-08 19:21:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1a11f0e453 
								
							 
						 
						
							
							
								
								Chats: Change id to flake id.  
							
							
							
						 
						
							2020-06-07 14:25:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1b07402ab 
								
							 
						 
						
							
							
								
								User: Add raw_bio, storing unformatted bio  
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1643  
							
						 
						
							2020-06-06 16:23:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9189b489ee 
								
							 
						 
						
							
							
								
								Migrations: Move Notification migration code to helper  
							
							
							
						 
						
							2020-06-06 15:33:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9fa3f0b156 
								
							 
						 
						
							
							
								
								Notification: Change type of type to an enum.  
							
							
							
						 
						
							2020-06-06 13:08:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a8ca030d85 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-05 16:53:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00748e9650 
								
							 
						 
						
							
							
								
								ChatMessageReferences: Change seen -> unread  
							
							
							
						 
						
							2020-06-04 17:14:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7b79871e97 
								
							 
						 
						
							
							
								
								Migrations: Add chat_id, seen index to ChatMessageReferences  
							
							... 
							
							
							
							This ensures fast count of unseen messages 
							
						 
						
							2020-06-03 14:34:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1e9efcf7c3 
								
							 
						 
						
							
							
								
								Migrations: Fix migration module name  
							
							
							
						 
						
							2020-06-03 14:27:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7f5c5b11a5 
								
							 
						 
						
							
							
								
								Chats: Remove unread from the db, calculate from unseen messages.  
							
							
							
						 
						
							2020-06-03 14:26:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8edead7c1d 
								
							 
						 
						
							
							
								
								Migration: Remove superfluous imports  
							
							
							
						 
						
							2020-06-03 13:19:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6413e06a86 
								
							 
						 
						
							
							
								
								Migrations: Add unique index to ChatMessageReferences.  
							
							
							
						 
						
							2020-06-03 13:13:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aa22fce8f4 
								
							 
						 
						
							
							
								
								ChatMessageReference: Introduce and switch in chat controller.  
							
							
							
						 
						
							2020-06-03 12:30:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6cd2fa2a4c 
								
							 
						 
						
							
							
								
								Migrations: Add a migration to backfill notification types.  
							
							
							
						 
						
							2020-06-02 15:13:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								805ab86933 
								
							 
						 
						
							
							
								
								Notifications: Make notifications save their type.  
							
							
							
						 
						
							2020-06-02 13:24:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e6ec778d9 
								
							 
						 
						
							
							
								
								exclude replies on blocked domains  
							
							
							
						 
						
							2020-06-01 21:17:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								af6d01ec93 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-29 12:36:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								91f73a7592 
								
							 
						 
						
							
							
								
								Merge branch 'notification-fixes' into 'develop'  
							
							... 
							
							
							
							Notification performance fixes
See merge request pleroma/pleroma!2595  
							
						 
						
							2020-05-27 13:45:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								73f222d76a 
								
							 
						 
						
							
							
								
								Migrations: Make user_id index on notifications better for query.  
							
							
							
						 
						
							2020-05-27 12:56:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								acba7043be 
								
							 
						 
						
							
							
								
								Migrations: Add index on client_id and client_secret for apps.  
							
							... 
							
							
							
							Greatly speeds up app lookup. 
							
						 
						
							2020-05-26 16:46:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1be6b3056e 
								
							 
						 
						
							
							
								
								Use indexed split_part/3 to get a hostname rather than ts_ functions  
							
							
							
						 
						
							2020-05-18 12:38:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8a383707ae 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2020-05-13 19:56:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dcb5cda324 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-12 13:13:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f6aa0b4a07 
								
							 
						 
						
							
							
								
								Migration: Fix typo  
							
							
							
						 
						
							2020-05-11 22:03:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f71376e30e 
								
							 
						 
						
							
							
								
								Migration: Enum.chunk is deprecated.  
							
							
							
						 
						
							2020-05-11 22:00:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d8dd945a03 
								
							 
						 
						
							
							
								
								Markers migration: Fix migration for very large list of markers  
							
							
							
						 
						
							2020-05-11 21:52:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c272669909 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-10 12:32:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0ad89762a1 
								
							 
						 
						
							
							
								
								insert skeletons migration: fix for non-local locals  
							
							... 
							
							
							
							Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes  #1746  
							
						 
						
							2020-05-09 22:07:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								942093683a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-status-count-per-instance  
							
							
							
						 
						
							2020-05-09 11:31:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cbe383ae83 
								
							 
						 
						
							
							
								
								Update stats admin endpoint  
							
							
							
						 
						
							2020-05-09 11:30:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2b09a9ba 
								
							 
						 
						
							
							
								
								Add migration for counter_cache table update  
							
							
							
						 
						
							2020-05-08 22:08:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7637ef4203 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-08 13:13:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b078e0567d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276-2  
							
							
							
						 
						
							2020-05-08 08:51:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fb2d284d28 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-07 15:05:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								3d0c567fbc 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController  
							
							
							
						 
						
							2020-05-07 08:14:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								205313e541 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-06 11:44:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								fb38b7339c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276-2  
							
							
							
						 
						
							2020-05-06 05:55:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8bed6ea922 
								
							 
						 
						
							
							
								
								User, Webfinger: Remove OStatus vestiges  
							
							... 
							
							
							
							Mainly the `magic_key` field 
							
						 
						
							2020-05-05 09:25:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c40afe5ba0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-04 10:43:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								fe7a0d660e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276-2  
							
							
							
						 
						
							2020-05-04 06:08:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e55876409b 
								
							 
						 
						
							
							
								
								Deactivate local users on deletion instead of deleting the record  
							
							... 
							
							
							
							Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes  pleroma/pleroma#1687  
							
						 
						
							2020-05-02 19:05:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a92c713d9c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276-2  
							
							
							
						 
						
							2020-05-01 06:21:59 +03:00