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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								139b9d1338 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-20 12:37:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								79445ae5d2 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'  
							
							 
							
							... 
							
							
							
							migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes  #1697 
See merge request pleroma/pleroma!2403  
							
						 
						
							2020-04-18 06:59:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								d698ecef9b 
								
							 
						 
						
							
							
								
								Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs  
							
							 
							
							
							
						 
						
							2020-04-17 22:48:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eb61564005 
								
							 
						 
						
							
							
								
								migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo  
							
							 
							
							
							
						 
						
							2020-04-17 23:57:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8c2c325598 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-17 15:51:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6936854878 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'  
							
							 
							
							... 
							
							
							
							migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes  #1695 
See merge request pleroma/pleroma!2398  
							
						 
						
							2020-04-17 13:40:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46f051048f 
								
							 
						 
						
							
							
								
								migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering  
							
							 
							
							
							
						 
						
							2020-04-17 14:32:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								a17bfb5fab 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1584-client-captcha-options' into 'develop'  
							
							 
							
							... 
							
							
							
							Creating trusted app from adminFE & mix task
Closes  #1584 
See merge request pleroma/pleroma!2252  
							
						 
						
							2020-04-17 09:19:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								942d7467ca 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into features/remove-user-source_data  
							
							 
							
							
							
						 
						
							2020-04-16 21:28:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3b1fec4e 
								
							 
						 
						
							
							
								
								added an endpoint for getting unread notification count  
							
							 
							
							
							
						 
						
							2020-04-15 21:19:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								44bfb491ea 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-15 14:41:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4576520461 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'issue/1276' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !1877  
							
						 
						
							2020-04-14 16:32:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7c060432fc 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'marker-update-fix' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !2380  
							
						 
						
							2020-04-14 16:31:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d8b12ffd59 
								
							 
						 
						
							
							
								
								Marker update migration: Don't try to update virtual field.  
							
							 
							
							
							
						 
						
							2020-04-14 15:06:09 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a16b3dbcbf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							 
							
							
							
						 
						
							2020-04-13 21:19:27 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a21baf89d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							 
							
							
							
						 
						
							2020-04-13 09:16:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e365448f3 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							 
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-04-11 19:46:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ad92cef844 
								
							 
						 
						
							
							
								
								fix Oban migration  
							
							 
							
							
							
						 
						
							2020-04-10 21:27:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e89078ac2a 
								
							 
						 
						
							
							
								
								User: remove source_data  
							
							 
							
							
							
						 
						
							2020-04-10 06:20:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							 
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62656ab259 
								
							 
						 
						
							
							
								
								User: Move inbox & shared_inbox to own fields  
							
							 
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19eedb3d04 
								
							 
						 
						
							
							
								
								User: Move public_key from source_data to own field  
							
							 
							
							
							
						 
						
							2020-04-10 06:16:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fd97b0e634 
								
							 
						 
						
							
							
								
								Chats: Basic implementation.  
							
							 
							
							
							
						 
						
							2020-04-02 15:19:09 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								dbcfac11b4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							 
							
							
							
						 
						
							2020-04-02 14:47:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								591f7015d9 
								
							 
						 
						
							
							
								
								update Oban package  
							
							 
							
							
							
						 
						
							2020-04-02 09:34:11 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								98b96e45ab 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-01 20:08:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2f2bd7fe72 
								
							 
						 
						
							
							
								
								Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.  
							
							 
							
							... 
							
							
							
							See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param. 
							
						 
						
							2020-04-01 19:49:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ea9c57b26e 
								
							 
						 
						
							
							
								
								[ #2332 ] Misc. improvements per code change requests.  
							
							 
							
							
							
						 
						
							2020-03-31 09:21:42 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9c94b6a327 
								
							 
						 
						
							
							
								
								[ #2332 ] Misc. fixes per code change requests.  
							
							 
							
							
							
						 
						
							2020-03-30 19:08:37 +03:00