Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf72b7649e 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:54:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a4cf664385 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:53:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								776c31267f 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:52:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c0b0fb19c8 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:50:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5fece5f8bc 
								
							 
						 
						
							
							
								
								Put correct migration  
							
							
							
						 
						
							2019-10-26 22:49:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d58cca5f0a 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:46:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf0fa124a2 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:45:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								13cc52dc60 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:44:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								55203c198b 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:43:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b85bee32da 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:42:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b33aacc4fb 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:40:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								382e83fab5 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:39:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0223dc4e02 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:38:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d12555a69e 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:37:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ac42fefe3 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:36:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c1ff8472fd 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:33:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5cb03fe801 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:32:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cd0218c205 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:31:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6e7fd364a4 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:28:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								12ab7b3280 
								
							 
						 
						
							
							
								
								User info migration improvements  
							
							... 
							
							
							
							- Move column additions into a separate migration, so postgres doesn't
need an exclusive lock on the table for the main part
- Fill in columns by using one big update statement instead of a bunch
of small ones because it's much faster (the migration took 140s on
patch.cx database) 
							
						 
						
							2019-10-26 03:45:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b777083f3f 
								
							 
						 
						
							
							
								
								Add also_known_as field to Pleroma.User  
							
							
							
						 
						
							2019-10-25 19:14:18 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4c1dd55c48 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships  
							
							
							
						 
						
							2019-10-24 14:55:36 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								99cf1ef9be 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2019-10-24 09:23:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d3fb9e02cc 
								
							 
						 
						
							
							
								
								add tests  
							
							
							
						 
						
							2019-10-23 22:48:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								aa64b3108b 
								
							 
						 
						
							
							
								
								fix migrate  
							
							
							
						 
						
							2019-10-23 22:02:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8cc809e44e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/notification.ex 
							
						 
						
							2019-10-23 17:22:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								11cd994425 
								
							 
						 
						
							
							
								
								[ #1304 ] Fixed null::jsonb handling in User.Info migration.  
							
							
							
						 
						
							2019-10-23 17:15:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d4270397dc 
								
							 
						 
						
							
							
								
								Marker: added unread_count field  
							
							
							
						 
						
							2019-10-22 14:51:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7c7f90bc4f 
								
							 
						 
						
							
							
								
								[ #1304 ] Merged develop, handled User.Info.invisible.  
							
							
							
						 
						
							2019-10-21 11:58:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								243719a965 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/masto_api_markers  
							
							
							
						 
						
							2019-10-21 11:32:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f726d953d5 
								
							 
						 
						
							
							
								
								Fix typos  
							
							
							
						 
						
							2019-10-21 14:56:39 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e37d4b2ddf 
								
							 
						 
						
							
							
								
								Revert "Skip deactivated users in followers import"  
							
							... 
							
							
							
							This reverts commit 8ad015ef64 
							
						 
						
							2019-10-21 14:52:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								75da202ab7 
								
							 
						 
						
							
							
								
								[ #1304 ] Typo fix.  
							
							
							
						 
						
							2019-10-21 10:20:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ea1a61b00 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/following-relationships  
							
							
							
						 
						
							2019-10-21 14:19:15 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ee04fbc35a 
								
							 
						 
						
							
							
								
								[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs 
							
						 
						
							2019-10-20 22:29:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c6fdfbc4f1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs 
							
						 
						
							2019-10-20 20:43:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e8843974cb 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved remaining fields from User.Info to User.  
							
							... 
							
							
							
							Misc. fixes / improvements. 
							
						 
						
							2019-10-20 13:42:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								34754938ba 
								
							 
						 
						
							
							
								
								add missing migration to drop websub table  
							
							
							
						 
						
							2019-10-20 10:39:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								39e996528c 
								
							 
						 
						
							
							
								
								Fix a migration wiping user info of users that don't have any mutes  
							
							... 
							
							
							
							And introduce safe_jsonb_set 
							
						 
						
							2019-10-18 15:22:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								66b5d0ff55 
								
							 
						 
						
							
							
								
								add Markers /api/v1/markers  
							
							
							
						 
						
							2019-10-17 15:26:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8ad015ef64 
								
							 
						 
						
							
							
								
								Skip deactivated users in followers import  
							
							
							
						 
						
							2019-10-14 14:16:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82 
								
							 
						 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship  
							
							
							
						 
						
							2019-10-11 02:35:32 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c7ff32e5b 
								
							 
						 
						
							
							
								
								Add thread_visibility to migrations  
							
							
							
						 
						
							2019-10-10 21:11:34 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								761ad0b48e 
								
							 
						 
						
							
							
								
								Split CreateFollowingRelationships to multiple migrations  
							
							
							
						 
						
							2019-10-08 20:27:42 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6291eaa590 
								
							 
						 
						
							
							
								
								Update CreateFollowingRelationships  
							
							
							
						 
						
							2019-10-08 20:19:38 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								32808208be 
								
							 
						 
						
							
							
								
								Enable mix format for migrations  
							
							
							
						 
						
							2019-10-08 15:16:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								12ebeef130 
								
							 
						 
						
							
							
								
								Add CreateFollowingRelationships migration  
							
							
							
						 
						
							2019-10-08 18:05:23 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ee88afb2e2 
								
							 
						 
						
							
							
								
								Fix muted notification migration only working with a schema  
							
							... 
							
							
							
							Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do 
							
						 
						
							2019-10-06 18:06:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								125f96e706 
								
							 
						 
						
							
							
								
								Fix the use of queries with a schema in a migration  
							
							
							
						 
						
							2019-10-06 17:23:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fefbd31c6e 
								
							 
						 
						
							
							
								
								Move local keys out of user.info  
							
							
							
						 
						
							2019-10-06 16:56:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								8249924485 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							
							
						 
						
							2019-10-05 20:12:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1fba66178d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into cleanup/drop-subscription-table-if-exists  
							
							
							
						 
						
							2019-09-30 00:26:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								81b4243173 
								
							 
						 
						
							
							
								
								Remove subscription_notifications table if it existed  
							
							... 
							
							
							
							Followup to !1741  
							
						 
						
							2019-09-29 23:52:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e9d1aa75d5 
								
							 
						 
						
							
							
								
								Revert subscription refactoring.  
							
							... 
							
							
							
							As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984 
							
						 
						
							2019-09-29 18:43:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b4b147000c 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-09-26 10:38:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a21584556f 
								
							 
						 
						
							
							
								
								Update oban to 0.8.1  
							
							... 
							
							
							
							This version uses a different locking mechanism, which gets rid of
`WARNING:  you don't own a lock of type ShareLock` log spam 
							
						 
						
							2019-09-17 13:04:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								76c3e290fc 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-09-16 20:30:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								17142a3720 
								
							 
						 
						
							
							
								
								Merge branch 'feature/delivery-tracking' into 'develop'  
							
							... 
							
							
							
							Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661  
							
						 
						
							2019-09-16 07:39:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ac4a748fad 
								
							 
						 
						
							
							
								
								Disallow NULLs in deliveries  
							
							
							
						 
						
							2019-09-13 19:28:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0bd2b85edb 
								
							 
						 
						
							
							
								
								Separate Subscription Notifications from regular Notifications  
							
							
							
						 
						
							2019-09-13 18:25:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								769fb778d4 
								
							 
						 
						
							
							
								
								Track object/create activity fetches  
							
							
							
						 
						
							2019-09-12 21:37:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e890ea7e82 
								
							 
						 
						
							
							
								
								[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2019-08-31 14:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								37dd3867bb 
								
							 
						 
						
							
							
								
								Log admin/moderator actions  
							
							
							
						 
						
							2019-08-25 19:39:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6c0b4ba6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration  
							
							
							
						 
						
							2019-08-24 15:48:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c34126f89c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							
							
						 
						
							2019-08-24 09:29:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								05e7d0a438 
								
							 
						 
						
							
							
								
								Add an index on object likes  
							
							... 
							
							
							
							In !1538  favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added. 
							
						 
						
							2019-08-23 03:17:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								256ff09aa8 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 
						
							2019-08-22 20:59:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								560dbad538 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pleroma-conversations  
							
							
							
						 
						
							2019-08-14 15:30:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								267262491e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							
							
						 
						
							2019-08-09 20:09:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f88560accd 
								
							 
						 
						
							
							
								
								Conversations: Add recipient list to conversation participation.  
							
							... 
							
							
							
							This enables to address the same group of people every time. 
							
						 
						
							2019-08-02 11:55:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								23d279e03e 
								
							 
						 
						
							
							
								
								[ #1149 ] Replaced RetryQueue with oban-based retries.  
							
							
							
						 
						
							2019-08-01 17:28:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								666514194a 
								
							 
						 
						
							
							
								
								Add activity expirations table  
							
							... 
							
							
							
							Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted. 
							
						 
						
							2019-07-24 13:14:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9bca70b10a 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-16 16:19:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c729883936 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-07-14 21:43:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eae991b06a 
								
							 
						 
						
							
							
								
								merge develop  
							
							
							
						 
						
							2019-07-12 18:08:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								182f7bbb11 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-11 13:26:59 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								936050257d 
								
							 
						 
						
							
							
								
								saving following_address for existing users  
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f8786fa6f2 
								
							 
						 
						
							
							
								
								adding following_address field to user  
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-09 21:21:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								efefee8241 
								
							 
						 
						
							
							
								
								Split alters rather than work with indexes  
							
							
							
						 
						
							2019-07-03 14:56:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								291d95dcc3 
								
							 
						 
						
							
							
								
								Fix migration  
							
							
							
						 
						
							2019-07-03 01:14:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								85c7916c94 
								
							 
						 
						
							
							
								
								[ #1033 ] Fix database migrations  
							
							
							
						 
						
							2019-07-01 01:08:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								982cad0268 
								
							 
						 
						
							
							
								
								support for config groups  
							
							
							
						 
						
							2019-06-23 08:16:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								c2ca1f22a2 
								
							 
						 
						
							
							
								
								it is changed in compile time  
							
							... 
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 
						
							2019-06-14 15:45:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								a7d956d383 
								
							 
						 
						
							
							
								
								Remove unused imports and aliases from migration  
							
							
							
						 
						
							2019-06-10 13:20:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								01fe5abad1 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-07 01:20:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								17004a0f1a 
								
							 
						 
						
							
							
								
								Create index on activities.local  
							
							
							
						 
						
							2019-06-05 16:37:43 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b1b1a270e8 
								
							 
						 
						
							
							
								
								Fix conflict  
							
							
							
						 
						
							2019-06-05 02:45:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9ce928d823 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-04 16:28:23 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								94d12a79c4 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix/add-in_reply_to_index' into 'develop'  
							
							... 
							
							
							
							Add index on inReplyTo for objects
See merge request pleroma/pleroma!1240  
							
						 
						
							2019-06-04 05:38:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef145b4fc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-06-03 15:29:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cfc3c62b2f 
								
							 
						 
						
							
							
								
								Add missing tag index on objects  
							
							... 
							
							
							
							The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried. 
							
						 
						
							2019-06-03 20:42:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								be56801dda 
								
							 
						 
						
							
							
								
								Add index on inReplyTo for objects  
							
							... 
							
							
							
							Fixes the performance of `get_existing_votes` 
							
						 
						
							2019-06-03 19:26:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ce47017c89 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-05-29 18:18:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5fbbc57c1b 
								
							 
						 
						
							
							
								
								add migration to add notification settings to user accounts  
							
							
							
						 
						
							2019-05-25 07:25:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								557f0e33a7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-17 19:57:14 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f2936e0a07 
								
							 
						 
						
							
							
								
								Add ap_id to List  
							
							
							
						 
						
							2019-05-17 19:56:37 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e2b3a27204 
								
							 
						 
						
							
							
								
								Add Reports to Admin API  
							
							
							
						 
						
							2019-05-16 19:09:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f3971cbde3 
								
							 
						 
						
							
							
								
								thread visibility function: fix use of no longer used author variable  
							
							
							
						 
						
							2019-05-15 17:02:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								71fa7eeb6f 
								
							 
						 
						
							
							
								
								thread visibility function: significantly improve efficiency  
							
							
							
						 
						
							2019-05-15 16:54:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								12f45e2a89 
								
							 
						 
						
							
							
								
								update migration  
							
							
							
						 
						
							2019-05-15 16:22:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								75ce6adcff 
								
							 
						 
						
							
							
								
								migration: only care about Create activities  
							
							
							
						 
						
							2019-05-15 15:54:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								958b4cfde9 
								
							 
						 
						
							
							
								
								migrations: add function to see if a thread can be satisfied  
							
							
							
						 
						
							2019-05-15 15:53:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5e2b491276 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-14 18:15:56 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								7701a4c841 
								
							 
						 
						
							
							
								
								Make irreversible field default to false in filters  
							
							
							
						 
						
							2019-05-14 00:13:15 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b6b5b16ba4 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-05-08 17:08:06 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								238dd72fad 
								
							 
						 
						
							
							
								
								Merge branch 'conversations_three' into 'develop'  
							
							... 
							
							
							
							Conversations once more.
See merge request pleroma/pleroma!1119  
							
						 
						
							2019-05-07 14:43:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1557b99beb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-07 16:51:11 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								1040caf096 
								
							 
						 
						
							
							
								
								fix format  
							
							... 
							
							
							
							Modified-by: Maksim Pechnikov <parallel588@gmail.com> 
							
						 
						
							2019-05-06 17:51:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0e37fddd5a 
								
							 
						 
						
							
							
								
								Search: Add fts index on objects table.  
							
							
							
						 
						
							2019-05-03 19:21:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								45f790becc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into conversations_three  
							
							
							
						 
						
							2019-05-01 18:40:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0f0cc2703b 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-04-30 20:17:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f8f6af4cc1 
								
							 
						 
						
							
							
								
								Fix MigrateOldBookmarks migration crashing on deleted activities  
							
							
							
						 
						
							2019-04-29 21:25:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								229ce6abbc 
								
							 
						 
						
							
							
								
								migration without using old field name  
							
							... 
							
							
							
							removing old field from db, after bookmarks migration 
							
						 
						
							2019-04-25 13:42:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								58711a79d0 
								
							 
						 
						
							
							
								
								removing useless transaction  
							
							
							
						 
						
							2019-04-25 13:40:12 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								6322c1e123 
								
							 
						 
						
							
							
								
								migration optimization  
							
							... 
							
							
							
							changelog wording 
							
						 
						
							2019-04-25 13:40:12 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								324c9c8ab5 
								
							 
						 
						
							
							
								
								migrate user.bookmarks to separate table  
							
							
							
						 
						
							2019-04-25 13:38:24 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								73d01857e3 
								
							 
						 
						
							
							
								
								bookmarks in separate table  
							
							
							
						 
						
							2019-04-25 13:38:24 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2359ee38b3 
								
							 
						 
						
							
							
								
								Set digest emails to false by default  
							
							
							
						 
						
							2019-04-21 16:36:25 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8add119444 
								
							 
						 
						
							
							
								
								Add User.list_inactive_users_query/1  
							
							
							
						 
						
							2019-04-19 22:19:00 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371a4aed2c 
								
							 
						 
						
							
							
								
								Add User.Info.email_notifications  
							
							
							
						 
						
							2019-04-13 17:40:42 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								db4badc6aa 
								
							 
						 
						
							
							
								
								move user disable into deactivation  
							
							
							
						 
						
							2019-04-11 17:22:42 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0f2f7d2cec 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-04-11 15:51:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								de57094fca 
								
							 
						 
						
							
							
								
								Participations: Add sort index.  
							
							
							
						 
						
							2019-04-10 17:30:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								280172f6f6 
								
							 
						 
						
							
							
								
								Conversations: Create or bump on inserting a dm.  
							
							
							
						 
						
							2019-04-10 16:33:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d1da6b155a 
								
							 
						 
						
							
							
								
								Conversation: Add Conversations and Participations.  
							
							
							
						 
						
							2019-04-10 15:01:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								e5d553aa45 
								
							 
						 
						
							
							
								
								Merge branch 'feature/767-multiple-use-invite-token' into 'develop'  
							
							... 
							
							
							
							Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032  
							
						 
						
							2019-04-10 10:10:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be8350baa2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/user-status-subscriptions  
							
							
							
						 
						
							2019-04-10 10:44:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bffddf5e31 
								
							 
						 
						
							
							
								
								[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth  
							
							... 
							
							
							
							# Conflicts:
#	docs/config.md
#	test/support/factory.ex 
							
						 
						
							2019-04-08 12:20:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								012bb5dcc9 
								
							 
						 
						
							
							
								
								renaming expire_at -> expires_at  
							
							... 
							
							
							
							keyword style change 
							
						 
						
							2019-04-08 16:01:28 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								fc92a0fd8d 
								
							 
						 
						
							
							
								
								Added limits and media attachments for scheduled activities.  
							
							
							
						 
						
							2019-04-06 23:55:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7bf622ce73 
								
							 
						 
						
							
							
								
								Add scheduled activities  
							
							
							
						 
						
							2019-04-06 23:55:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								47b07cec49 
								
							 
						 
						
							
							
								
								token -> invite renaming  
							
							
							
						 
						
							2019-04-06 20:24:22 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								0484f3a8b1 
								
							 
						 
						
							
							
								
								generating tokens with mix  
							
							
							
						 
						
							2019-04-06 16:58:22 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ffac2593ea 
								
							 
						 
						
							
							
								
								Add index on subscribers  
							
							
							
						 
						
							2019-04-05 17:30:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								45765918c3 
								
							 
						 
						
							
							
								
								[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth  
							
							... 
							
							
							
							# Conflicts:
#	mix.exs 
							
						 
						
							2019-04-04 23:43:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								86f90c0a54 
								
							 
						 
						
							
							
								
								adding indexes to oauth_tokens table  
							
							
							
						 
						
							2019-04-03 20:51:09 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b2f3a40e53 
								
							 
						 
						
							
							
								
								Revert awfully long migration from  568e34858 
							
							
							
						 
						
							2019-03-29 01:57:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								642075b1a9 
								
							 
						 
						
							
							
								
								[ #923 ] Enabled binding of multiple OAuth provider accounts to single user.  
							
							
							
						 
						
							2019-03-27 16:20:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								20e0f36605 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth  
							
							
							
						 
						
							2019-03-27 15:41:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								21ff78cd40 
								
							 
						 
						
							
							
								
								Merge branch 'replies-count' into 'develop'  
							
							... 
							
							
							
							Increment replies_count (MastoAPI)
Closes  #756 
See merge request pleroma/pleroma!974  
							
						 
						
							2019-03-26 14:49:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								568e348588 
								
							 
						 
						
							
							
								
								Increment replies_count on replies (MastoAPI)  
							
							
							
						 
						
							2019-03-26 15:27:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9725c93cea 
								
							 
						 
						
							
							
								
								Add an id index to notifications  
							
							
							
						 
						
							2019-03-25 21:59:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e59cfa7cac 
								
							 
						 
						
							
							
								
								modify the migrations to use naive_datetime_usec  
							
							
							
						 
						
							2019-03-20 16:16:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cbc4a76b43 
								
							 
						 
						
							
							
								
								Fix filter migration  
							
							
							
						 
						
							2019-03-20 16:13:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e17a9a1f66 
								
							 
						 
						
							
							
								
								[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.  
							
							
							
						 
						
							2019-03-20 10:35:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								40e9a04c31 
								
							 
						 
						
							
							
								
								[ #923 ] Registration validations & unique index on [:user_id, :provider].  
							
							
							
						 
						
							2019-03-18 20:31:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								26b6354095 
								
							 
						 
						
							
							
								
								[ #923 ] Support for multiple (external) registrations per user via Registration.  
							
							
							
						 
						
							2019-03-18 17:23:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aacbf0f570 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth: prototype of sign in / sign up with Twitter.  
							
							
							
						 
						
							2019-03-15 17:08:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								eb84de0143 
								
							 
						 
						
							
							
								
								allow users to disable their own account  
							
							
							
						 
						
							2019-03-04 19:55:11 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								8a1e0c9bee 
								
							 
						 
						
							
							
								
								Added migration to update existing user note counters  
							
							
							
						 
						
							2019-03-03 15:35:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								85734c0d49 
								
							 
						 
						
							
							
								
								Added migration for setting default tags in existing users records  
							
							
							
						 
						
							2019-03-01 14:02:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b227ccab82 
								
							 
						 
						
							
							
								
								Fixed scopes of apps / authorizations / tokens from apps initially created with space-delimited scope.  
							
							
							
						 
						
							2019-02-22 14:00:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								bff9eb5ef7 
								
							 
						 
						
							
							
								
								Reports  
							
							
							
						 
						
							2019-02-20 16:51:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bc4f77b10b 
								
							 
						 
						
							
							
								
								[ #468 ] Merged upstream/develop, resolved conflicts.  
							
							
							
						 
						
							2019-02-17 14:07:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								949e35e26d 
								
							 
						 
						
							
							
								
								[ #468 ] OAuth scopes-related data migration simplification.  
							
							
							
						 
						
							2019-02-14 14:28:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								063baca5e4 
								
							 
						 
						
							
							
								
								[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.  
							
							
							
						 
						
							2019-02-14 00:29:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								ac72b578da 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/thread-muting  
							
							
							
						 
						
							2019-02-11 12:10:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								6a150de3bd 
								
							 
						 
						
							
							
								
								Add unique index and unique constraint check, uniqueness test fails  
							
							
							
						 
						
							2019-02-09 20:52:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad843fb9d 
								
							 
						 
						
							
							
								
								[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.  
							
							
							
						 
						
							2019-02-09 17:09:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								98ec578f4d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/thread-muting  
							
							
							
						 
						
							2019-02-08 12:44:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c43f414a79 
								
							 
						 
						
							
							
								
								Somehow fixed the repo insert [skip-ci]  
							
							
							
						 
						
							2019-02-07 23:44:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								77448de492 
								
							 
						 
						
							
							
								
								ugghhhh  
							
							
							
						 
						
							2019-02-07 22:25:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								f4ff4ffba2 
								
							 
						 
						
							
							
								
								Migration and some boilerplate stuff  
							
							
							
						 
						
							2019-02-07 17:36:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f1b72bfb70 
								
							 
						 
						
							
							
								
								Split hide_networ only for local users  
							
							
							
						 
						
							2019-02-06 13:41:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d120aa63f0 
								
							 
						 
						
							
							
								
								Merge branch 'fix-dm-index' into 'develop'  
							
							... 
							
							
							
							Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772  
							
						 
						
							2019-02-05 20:27:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								c48aba3c2a 
								
							 
						 
						
							
							
								
								Fix SQL  
							
							
							
						 
						
							2019-02-05 10:22:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3c8b02d65 
								
							 
						 
						
							
							
								
								Massage index until it actually does the stuff we want.  
							
							... 
							
							
							
							Also makes the index a lot smoler. 
							
						 
						
							2019-02-04 23:47:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								cd6606b7f6 
								
							 
						 
						
							
							
								
								Initialize hide_network with false  
							
							
							
						 
						
							2019-02-04 22:23:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								16ce129e38 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings (fixed)  
							
							
							
						 
						
							2019-02-03 21:55:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								486749064f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/split-hide-network' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !733  
							
						 
						
							2019-02-01 20:22:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0a82a7e6d6 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network' into 'develop'  
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733  
							
						 
						
							2019-02-01 17:05:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b0855456 
								
							 
						 
						
							
							
								
								Merge branch '534_federation_targets_reachability' into 'develop'  
							
							... 
							
							
							
							[#534 ] Unreachable federation targets retirement
Closes  #534 
See merge request pleroma/pleroma!703  
							
						 
						
							2019-02-01 09:14:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								a43a1c6d4e 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'spc-fix-3' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !682  
							
						 
						
							2019-01-31 12:16:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4d3655c479 
								
							 
						 
						
							
							
								
								Merge branch 'spc-fix-3' into 'develop'  
							
							... 
							
							
							
							Spc fix 3
See merge request pleroma/pleroma!682  
							
						 
						
							2019-01-31 11:29:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								50d6183893 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings  
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d3f9e6f6fe 
								
							 
						 
						
							
							
								
								[ #534 ] Merged upstream/develop.  
							
							
							
						 
						
							2019-01-28 15:39:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9560abea10 
								
							 
						 
						
							
							
								
								[ #534 ] Refactoring / tweaks per MR review.  
							
							
							
						 
						
							2019-01-28 11:03:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cda1470e02 
								
							 
						 
						
							
							
								
								[MastoAPI][GlitchAPI] Add bookmarks  
							
							
							
						 
						
							2019-01-28 04:47:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								15d12a69a4 
								
							 
						 
						
							
							
								
								add activities likes index, fixes favorites API call  
							
							
							
						 
						
							2019-01-27 15:15:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a13bb75bd 
								
							 
						 
						
							
							
								
								Change webpush endpoint to unlimited varchar  
							
							... 
							
							
							
							Fixes  #552  
						
							2019-01-26 17:18:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4df71cd88b 
								
							 
						 
						
							
							
								
								Merge branch 'classic-flakeids' into 'develop'  
							
							... 
							
							
							
							Flake Ids for Users and Activities
Closes  #450 
See merge request pleroma/pleroma!645  
							
						 
						
							2019-01-25 04:59:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3ba72d978 
								
							 
						 
						
							
							
								
								Fix clippy with one/five lines  
							
							
							
						 
						
							2019-01-24 16:53:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e02b19d1d7 
								
							 
						 
						
							
							
								
								Fix postgres activity_visibility when running in autovacuum  
							
							
							
						 
						
							2019-01-24 14:13:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f161a92cb1 
								
							 
						 
						
							
							
								
								[ #534 ] Initial implementation of unreachable federation targets retirement.  
							
							
							
						 
						
							2019-01-23 18:37:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ab03f81219 
								
							 
						 
						
							
							
								
								Fix info ids.  
							
							... 
							
							
							
							The previous migration actually created values for the key "id", including the
quotes. This one should fill out all missing ids.
Closes  #511  
							
						 
						
							2019-01-23 14:01:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9ba6e1fabe 
								
							 
						 
						
							
							
								
								FlakeId: chain alter statements  
							
							
							
						 
						
							2019-01-23 12:09:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e67bd93d90 
								
							 
						 
						
							
							
								
								Flake: migrate pinned_activities in jsonb  
							
							
							
						 
						
							2019-01-23 11:26:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a92c43bc4b 
								
							 
						 
						
							
							
								
								Clippy!  
							
							
							
						 
						
							2019-01-23 11:26:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								465fb4327d 
								
							 
						 
						
							
							
								
								Lock activities/users table during flake migration.  
							
							
							
						 
						
							2019-01-23 11:26:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28d77e373c 
								
							 
						 
						
							
							
								
								Flake Ids for Users and Activities  
							
							
							
						 
						
							2019-01-23 11:26:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Loftis 
								
							 
						 
						
							
							
							
							
								
							
							
								98cbeae49c 
								
							 
						 
						
							
							
								
								slightly changes definition so that autovacuum works paralell safe too  
							
							
							
						 
						
							2019-01-22 15:35:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b108aeee08 
								
							 
						 
						
							
							
								
								Make use of the indices.  
							
							... 
							
							
							
							Indices in postgresql rely on operators, so they won't be used if you use only functions. 
							
						 
						
							2019-01-20 00:31:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bd6c12592e 
								
							 
						 
						
							
							
								
								Add migration to fix spc users.  
							
							
							
						 
						
							2019-01-18 19:35:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								79e44042bc 
								
							 
						 
						
							
							
								
								[ #477 ] User trigram index adjustment.  
							
							
							
						 
						
							2019-01-18 10:57:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								fc965f982c 
								
							 
						 
						
							
							
								
								[ #477 ] Added FTS index for users. Fixed failing test.  
							
							
							
						 
						
							2019-01-15 12:04:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								04735db193 
								
							 
						 
						
							
							
								
								Build the index concurrently.  
							
							
							
						 
						
							2019-01-09 16:55:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5027f82cde 
								
							 
						 
						
							
							
								
								Add activity visibility index.  
							
							
							
						 
						
							2019-01-09 16:45:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								94d8f1ab30 
								
							 
						 
						
							
							
								
								Merge branch '394_user_tags' into 'develop'  
							
							... 
							
							
							
							[#394 ] User tags
Closes  #394 
See merge request pleroma/pleroma!508  
							
						 
						
							2018-12-07 18:25:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7b19487389 
								
							 
						 
						
							
							
								
								[ #394 ] Added users.tags and admin routes to tag and untag users. Added tests.  
							
							
							
						 
						
							2018-12-06 20:06:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4944498133 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/compat/push-subscriptions  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex 
							
						 
						
							2018-12-06 20:15:16 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4996fb07d8 
								
							 
						 
						
							
							
								
								Genereate uuids for existing info fields.  
							
							
							
						 
						
							2018-12-01 12:00:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								d94ee5cd50 
								
							 
						 
						
							
							
								
								Mastodon API: Support push subscription CRUD  
							
							
							
						 
						
							2018-09-22 07:04:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c9f6eb9a41 
								
							 
						 
						
							
							
								
								user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)  
							
							
							
						 
						
							2018-09-20 23:50:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								76c67a41c1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/staff-discovery-api'  
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 
							
						 
						
							2018-09-03 14:55:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1c9e539b47 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mastodon_api_2.4.x' into 'develop'  
							
							... 
							
							
							
							Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266  
							
						 
						
							2018-09-03 12:33:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cf5d1302aa 
								
							 
						 
						
							
							
								
								migrations: add is_moderator index for users table  
							
							
							
						 
						
							2018-09-03 11:55:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1a70d41f8e 
								
							 
						 
						
							
							
								
								migrations: add index creation migration and recipients_to/cc removal migration  
							
							
							
						 
						
							2018-08-29 18:41:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								038139d641 
								
							 
						 
						
							
							
								
								migrations: drop filler migration  
							
							
							
						 
						
							2018-08-29 18:41:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								40ea07cd2f 
								
							 
						 
						
							
							
								
								migrations: add migration to fill in recipients_to/recipients_cc fields  
							
							
							
						 
						
							2018-08-29 08:43:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								81673b8136 
								
							 
						 
						
							
							
								
								activity: add recipients_to and recipients_cc fields  
							
							
							
						 
						
							2018-08-29 08:42:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e030129fb 
								
							 
						 
						
							
							
								
								[MastodonAPI] Add filters  
							
							
							
						 
						
							2018-08-27 15:09:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								13440a80e1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/invites' into 'develop'  
							
							... 
							
							
							
							Invites
Closes  #108 
See merge request pleroma/pleroma!208  
							
						 
						
							2018-08-12 12:04:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4f589998ee 
								
							 
						 
						
							
							
								
								activitypub: support filtering activities by whether or not they are a reply ( closes   #109 )  
							
							
							
						 
						
							2018-06-18 03:21:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								f42ffbe9a8 
								
							 
						 
						
							
							
								
								Initial invites support + tests.  
							
							
							
						 
						
							2018-06-12 14:55:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								564c73ab24 
								
							 
						 
						
							
							
								
								Merge branch 'feature/list-streaming' into 'develop'  
							
							... 
							
							
							
							MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183  
							
						 
						
							2018-06-12 07:19:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								29c9c8d93b 
								
							 
						 
						
							
							
								
								Extract host from ap_id, add index  
							
							
							
						 
						
							2018-06-06 21:13:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								5d3fdbc082 
								
							 
						 
						
							
							
								
								MastoAPI: Add streaming for lists.  
							
							
							
						 
						
							2018-05-30 16:48:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f3a71f2986 
								
							 
						 
						
							
							
								
								Merge branch 'feature/lists' into 'develop'  
							
							... 
							
							
							
							Mastodon List API
See merge request pleroma/pleroma!138  
							
						 
						
							2018-05-24 20:22:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								a8369db4f2 
								
							 
						 
						
							
							
								
								MastoAPI: add lists.  
							
							
							
						 
						
							2018-05-24 13:18:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4bbec6b3 
								
							 
						 
						
							
							
								
								Fix User search.  
							
							... 
							
							
							
							Now uses a trigram based search. This is a lot faster and gives better
results. Closes  #185 . 
							
						 
						
							2018-05-16 17:55:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								94c1f28ba4 
								
							 
						 
						
							
							
								
								Modify sort index for activities.  
							
							... 
							
							
							
							This prevents a problem that made the local timeline very slow when
there were few posts. 
							
						 
						
							2018-05-13 12:54:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0abd8a6bad 
								
							 
						 
						
							
							
								
								Fix migration.  
							
							
							
						 
						
							2018-03-27 19:59:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b56bb88c02 
								
							 
						 
						
							
							
								
								Drop index for 'local', it confuses the query planner.  
							
							
							
						 
						
							2018-03-27 19:48:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bd4926288e 
								
							 
						 
						
							
							
								
								Speed up follower query.  
							
							
							
						 
						
							2018-03-26 10:31:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d1271ca1e 
								
							 
						 
						
							
							
								
								Add index for user follower address.  
							
							
							
						 
						
							2018-03-26 09:53:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f48bc5c3e1 
								
							 
						 
						
							
							
								
								Make User.following a postgres array.  
							
							
							
						 
						
							2018-02-21 22:20:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Iwakura 
								
							 
						 
						
							
							
							
							
								
							
							
								4a13b84887 
								
							 
						 
						
							
							
								
								Add recipients field to activities.  
							
							... 
							
							
							
							Also do some very basic checks for AP message insertion. 
							
						 
						
							2017-12-12 18:07:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Iwakura 
								
							 
						 
						
							
							
							
							
								
							
							
								50dca016f2 
								
							 
						 
						
							
							
								
								Add count index for local users.  
							
							
							
						 
						
							2017-11-30 15:00:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								ccde03285d 
								
							 
						 
						
							
							
								
								add sort index for activities  
							
							
							
						 
						
							2017-11-09 15:16:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								9e60de695d 
								
							 
						 
						
							
							
								
								Fix migration for empty db.  
							
							
							
						 
						
							2017-11-09 13:45:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6bf261589f 
								
							 
						 
						
							
							
								
								Update activities in own migration.  
							
							
							
						 
						
							2017-11-09 13:32:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								20b8b87743 
								
							 
						 
						
							
							
								
								Update in chunks.  
							
							
							
						 
						
							2017-11-09 12:33:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								f1d27a5fbb 
								
							 
						 
						
							
							
								
								Add actor column to activities.  
							
							
							
						 
						
							2017-11-09 10:41:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								9af560083f 
								
							 
						 
						
							
							
								
								Use more efficient user note count update query.  
							
							
							
						 
						
							2017-10-24 14:16:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								29c261e75b 
								
							 
						 
						
							
							
								
								Drop superflous index.  
							
							
							
						 
						
							2017-10-24 11:07:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								9f417fd5e9 
								
							 
						 
						
							
							
								
								Speed up deletion and related queries.  
							
							
							
						 
						
							2017-10-23 18:30:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6af164f27b 
								
							 
						 
						
							
							
								
								Add password reset.  
							
							
							
						 
						
							2017-10-19 17:37:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								62ca2617cd 
								
							 
						 
						
							
							
								
								Add tag index.  
							
							... 
							
							
							
							This still isn't optimal, but at least it isn't super slow. 
							
						 
						
							2017-09-17 14:05:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								78485e24ac 
								
							 
						 
						
							
							
								
								Fixup old migrations.  
							
							
							
						 
						
							2017-09-17 00:01:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								f0257c7516 
								
							 
						 
						
							
							
								
								Add fts search index.  
							
							
							
						 
						
							2017-09-16 11:06:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								07b694814e 
								
							 
						 
						
							
							
								
								Optimize conversation fetching.  
							
							
							
						 
						
							2017-09-12 13:48:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								61adf676d5 
								
							 
						 
						
							
							
								
								Add basic mastodon notification support.  
							
							
							
						 
						
							2017-09-11 18:53:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								2a298d70f9 
								
							 
						 
						
							
							
								
								Add very basic oauth and mastodon api support.  
							
							
							
						 
						
							2017-09-06 19:06:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								396c32a6da 
								
							 
						 
						
							
							
								
								Add follower_address to users, add on generation.  
							
							
							
						 
						
							2017-07-19 18:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								5e17e04144 
								
							 
						 
						
							
							
								
								Make user timelines faster for users with few statuses.  
							
							
							
						 
						
							2017-07-01 16:43:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								07cee92cd4 
								
							 
						 
						
							
							
								
								Add correct index.  
							
							
							
						 
						
							2017-06-20 16:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								9cf38d6796 
								
							 
						 
						
							
							
								
								Use more efficient queries.  
							
							
							
						 
						
							2017-06-20 16:18:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								3d714f85a8 
								
							 
						 
						
							
							
								
								Drop the general index on activities.  
							
							... 
							
							
							
							Indices should be more specific as the general index can lead to
slower queries because postgres can't estimate the specificity of
jsonb indexes very well. 
							
						 
						
							2017-06-20 12:00:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								fb78773112 
								
							 
						 
						
							
							
								
								Make longer bios possible.  
							
							
							
						 
						
							2017-05-29 11:33:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								47684c2a2c 
								
							 
						 
						
							
							
								
								Make email and nickname case insensitive.  
							
							
							
						 
						
							2017-05-22 18:10:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								ff2945dfdc 
								
							 
						 
						
							
							
								
								Index users by ap_id.  
							
							
							
						 
						
							2017-05-07 00:21:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								56bacc90d1 
								
							 
						 
						
							
							
								
								Fix specs, add local marker to actitivies.  
							
							
							
						 
						
							2017-05-02 10:43:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								b9d1fc05b2 
								
							 
						 
						
							
							
								
								Actually make index unique.  
							
							
							
						 
						
							2017-05-01 15:42:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								2f093db051 
								
							 
						 
						
							
							
								
								Ensure we have no duplicate ap ids.  
							
							
							
						 
						
							2017-05-01 14:54:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								e8a311ecff 
								
							 
						 
						
							
							
								
								Add user and hub to websub client subscriptions.  
							
							
							
						 
						
							2017-04-27 09:44:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								c5fa682c31 
								
							 
						 
						
							
							
								
								Refactor, add beginnings of websub client subscriptions.  
							
							
							
						 
						
							2017-04-26 18:33:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								43d7a4b2cf 
								
							 
						 
						
							
							
								
								Add basic fields to support remote users.  
							
							
							
						 
						
							2017-04-24 08:49:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								cc330421fd 
								
							 
						 
						
							
							
								
								Better activities in ostatus.  
							
							
							
						 
						
							2017-04-20 10:16:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d7e3b72c6a 
								
							 
						 
						
							
							
								
								Add avatar objects to user, fix specs.  
							
							
							
						 
						
							2017-04-16 15:28:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								03c6148bb3 
								
							 
						 
						
							
							
								
								Add user registration changeset.  
							
							
							
						 
						
							2017-04-15 16:40:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								40eb0e4c24 
								
							 
						 
						
							
							
								
								Add index to objects.  
							
							
							
						 
						
							2017-03-30 18:06:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								9a8850eb9e 
								
							 
						 
						
							
							
								
								Basic status creation and retrieval.  
							
							
							
						 
						
							2017-03-21 17:53:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								8de523c8ae 
								
							 
						 
						
							
							
								
								Basic AP objects.  
							
							
							
						 
						
							2017-03-21 09:21:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								66f536ecba 
								
							 
						 
						
							
							
								
								Add user schema.  
							
							
							
						 
						
							2017-03-20 21:28:31 +01:00