kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								1fc591fcfc
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for objects table
See merge request pleroma/pleroma!1903 
							
						 | 
						
							2019-10-27 05:30:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b204b4d71
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for oauth_authorizations table
See merge request pleroma/pleroma!1902 
							
						 | 
						
							2019-10-27 05:30:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe97493d91
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for oauth_tokens table
See merge request pleroma/pleroma!1901 
							
						 | 
						
							2019-10-27 05:30:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								84e992d85b
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for notifications table
See merge request pleroma/pleroma!1900 
							
						 | 
						
							2019-10-27 05:30:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								19a625459b
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for moderation_log table
See merge request pleroma/pleroma!1899 
							
						 | 
						
							2019-10-27 05:29:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								79702b54b6
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for markers table
See merge request pleroma/pleroma!1898 
							
						 | 
						
							2019-10-27 05:29:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e7e43c853
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for lists table
See merge request pleroma/pleroma!1897 
							
						 | 
						
							2019-10-27 05:29:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								75dab79183
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for instances table
See merge request pleroma/pleroma!1896 
							
						 | 
						
							2019-10-27 05:29:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								24699b991a
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for filters table
See merge request pleroma/pleroma!1895 
							
						 | 
						
							2019-10-27 05:29:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ac8eb4046
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for conversation_participations table
See merge request pleroma/pleroma!1894 
							
						 | 
						
							2019-10-27 05:28:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								6be16b8617
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for conversation_participation_recipient_ships table
See merge request pleroma/pleroma!1893 
							
						 | 
						
							2019-10-27 05:28:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								b05fbc890e
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for config table
See merge request pleroma/pleroma!1892 
							
						 | 
						
							2019-10-27 05:28:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								8785d7ba5d
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for bookmarks table
See merge request pleroma/pleroma!1891 
							
						 | 
						
							2019-10-27 05:28:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								93f6f173ce
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for apps table
See merge request pleroma/pleroma!1890 
							
						 | 
						
							2019-10-27 05:27:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								5cb5f9a270
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'
							
							
							
							
							
							
							
							Add NOT NULL constraints for activity_expirations table
See merge request pleroma/pleroma!1889 
							
						 | 
						
							2019-10-27 05:27:24 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								75da202ab7
								
							
						 | 
						
							
							
								
								[#1304] Typo fix.
							
							
							
							
							
						 | 
						
							2019-10-21 10:20:28 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								32808208be
								
							
						 | 
						
							
							
								
								Enable mix format for migrations
							
							
							
							
							
						 | 
						
							2019-10-08 15:16:39 +03: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 | 
						
						
							
							
							
								
							
							
						 |