lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4576520461 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'issue/1276' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1877  
							
						 
						
							2020-04-14 16:32:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7c060432fc 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'marker-update-fix' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2380  
							
						 
						
							2020-04-14 16:31:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d8b12ffd59 
								
							 
						 
						
							
							
								
								Marker update migration: Don't try to update virtual field.  
							
							
							
						 
						
							2020-04-14 15:06:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a16b3dbcbf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-04-13 21:19:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a21baf89d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							
							
						 
						
							2020-04-13 09:16:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e365448f3 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-04-11 19:46:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ad92cef844 
								
							 
						 
						
							
							
								
								fix Oban migration  
							
							
							
						 
						
							2020-04-10 21:27:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e89078ac2a 
								
							 
						 
						
							
							
								
								User: remove source_data  
							
							
							
						 
						
							2020-04-10 06:20:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62656ab259 
								
							 
						 
						
							
							
								
								User: Move inbox & shared_inbox to own fields  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19eedb3d04 
								
							 
						 
						
							
							
								
								User: Move public_key from source_data to own field  
							
							
							
						 
						
							2020-04-10 06:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fd97b0e634 
								
							 
						 
						
							
							
								
								Chats: Basic implementation.  
							
							
							
						 
						
							2020-04-02 15:19:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								dbcfac11b4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-04-02 14:47:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								591f7015d9 
								
							 
						 
						
							
							
								
								update Oban package  
							
							
							
						 
						
							2020-04-02 09:34:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								98b96e45ab 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-01 20:08:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2f2bd7fe72 
								
							 
						 
						
							
							
								
								Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.  
							
							... 
							
							
							
							See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param. 
							
						 
						
							2020-04-01 19:49:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ea9c57b26e 
								
							 
						 
						
							
							
								
								[ #2332 ] Misc. improvements per code change requests.  
							
							
							
						 
						
							2020-03-31 09:21:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9c94b6a327 
								
							 
						 
						
							
							
								
								[ #2332 ] Misc. fixes per code change requests.  
							
							
							
						 
						
							2020-03-30 19:08:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								dfd2c74184 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-03-29 06:57:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								be9d18461a 
								
							 
						 
						
							
							
								
								FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).  
							
							
							
						 
						
							2020-03-28 18:49:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0adaab8e75 
								
							 
						 
						
							
							
								
								Bump copyright dates.  
							
							
							
						 
						
							2020-03-26 15:37:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6ee6784bc 
								
							 
						 
						
							
							
								
								creating trusted app from adminFE & mix task  
							
							
							
						 
						
							2020-03-23 10:44:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0651730bd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-16 14:25:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e87a32bcd7 
								
							 
						 
						
							
							
								
								rip out fetch_initial_posts  
							
							... 
							
							
							
							Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes  #1595  #1422  
							
						 
						
							2020-03-15 15:59:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9f8941dac 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-09 10:56:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6cf1958b02 
								
							 
						 
						
							
							
								
								moderation log: fix improperly migrated data  
							
							... 
							
							
							
							Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes  #1606  
							
						 
						
							2020-03-07 17:00:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22d52f5691 
								
							 
						 
						
							
							
								
								same copyright date format  
							
							
							
						 
						
							2020-03-04 09:41:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								10f452ad1f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-02-25 07:22:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7ad5c51f23 
								
							 
						 
						
							
							
								
								Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope  
							
							
							
						 
						
							2020-02-24 21:46:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2d5cf0f8cd 
								
							 
						 
						
							
							
								
								Migrations: Make them not fail for old databases  
							
							
							
						 
						
							2020-02-20 16:44:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cd040691bd 
								
							 
						 
						
							
							
								
								maked unread_count as virtual field  
							
							
							
						 
						
							2020-02-10 09:01:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e442ea5722 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-01-27 15:20:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6c94b7498b 
								
							 
						 
						
							
							
								
								[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.  
							
							
							
						 
						
							2020-01-10 10:52:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								3ecf131511 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/report-notes  
							
							
							
						 
						
							2019-12-12 02:16:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								701815e64c 
								
							 
						 
						
							
							
								
								[ActivityPub] Configurable ActivityPub actor type  
							
							
							
						 
						
							2019-12-10 13:19:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6fbafb1cdc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2019-12-08 20:14:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								49bb0a130f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2019-12-05 12:22:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								30caf3e51e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user.ex 
							
						 
						
							2019-12-04 18:56:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b60d41db9 
								
							 
						 
						
							
							
								
								Add report notes  
							
							
							
						 
						
							2019-12-04 00:26:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7722e5a67a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'  
							
							... 
							
							
							
							Support "Move" activity
Closes  #1316 
See merge request pleroma/pleroma!1883  
							
						 
						
							2019-12-02 16:26:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0d24ab04c5 
								
							 
						 
						
							
							
								
								Merge branch 'remove-info-from-users' into 'develop'  
							
							... 
							
							
							
							Removed users.info field
See merge request pleroma/pleroma!2006  
							
						 
						
							2019-11-30 10:42:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								52cc7de82c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	mix.lock 
							
						 
						
							2019-11-29 10:17:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0bdbe3f61 
								
							 
						 
						
							
							
								
								Migrations: Set users.following_count to NOT NULL  
							
							... 
							
							
							
							Also set following_count for local users to the correct value and for remote
users to 0. 
							
						 
						
							2019-11-28 17:01:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1636cc5b7e 
								
							 
						 
						
							
							
								
								Removed users.info and remaining usages.  
							
							
							
						 
						
							2019-11-23 14:06:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cad9b325e5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs 
							
						 
						
							2019-11-21 16:47:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								de892d2fe1 
								
							 
						 
						
							
							
								
								[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.  
							
							
							
						 
						
							2019-11-20 15:46:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aad6576130 
								
							 
						 
						
							
							
								
								[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.  
							
							
							
						 
						
							2019-11-18 20:38:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c31ddce51e 
								
							 
						 
						
							
							
								
								[ #1335 ] Reorganized users.mutes as relation to UserMute entity.  
							
							
							
						 
						
							2019-11-15 21:38:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c0abfca53 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/move-activity  
							
							
							
						 
						
							2019-11-14 16:39:45 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e6d7e27bd6 
								
							 
						 
						
							
							
								
								Add allow_following_move setting to User  
							
							
							
						 
						
							2019-11-12 18:45:28 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3db988250b 
								
							 
						 
						
							
							
								
								[ #1335 ] User: refactored :blocks field into :blocked_users relation.  
							
							... 
							
							
							
							Introduced UserBlock. 
							
						 
						
							2019-11-10 16:30:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b7c11e3f9 
								
							 
						 
						
							
							
								
								excluded invisible actors from gets  /api/v1/accounts/:id  
							
							
							
						 
						
							2019-11-04 20:44:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ff6c727739 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2019-11-04 20:24:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								57995fa8cf 
								
							 
						 
						
							
							
								
								fix migrate  
							
							... 
							
							
							
							update migrate 
							
						 
						
							2019-11-03 20:44:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								9d8da9ea15 
								
							 
						 
						
							
							
								
								Merge branch 'fix/migration-schema' into 'develop'  
							
							... 
							
							
							
							Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923  
							
						 
						
							2019-11-02 15:07:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								fd8099fb68 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2019-10-31 21:09:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e14cae25aa 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/db-add-defaults' into 'develop'  
							
							... 
							
							
							
							Set defaults to fields with NULL values
Closes  #1358 
See merge request pleroma/pleroma!1914  
							
						 
						
							2019-10-31 13:34:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1b82eb6d41 
								
							 
						 
						
							
							
								
								move sql (update_markers) from migrate to mix task  
							
							
							
						 
						
							2019-10-30 23:22:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d719078699 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2019-10-30 23:07:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8bb6da7cd6 
								
							 
						 
						
							
							
								
								Remove following column from the migrations  
							
							
							
						 
						
							2019-10-30 18:34:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c546da7cfe 
								
							 
						 
						
							
							
								
								Fix bookmark migration using a query with a schema  
							
							... 
							
							
							
							This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema. 
							
						 
						
							2019-10-30 12:59:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								40d5fb6ef8 
								
							 
						 
						
							
							
								
								Add a migration to fix blocked follows  
							
							
							
						 
						
							2019-10-30 15:52:37 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b27a92e8fa 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2019-10-29 22:23:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3e09b7c5ae 
								
							 
						 
						
							
							
								
								Fix two migrations sharing the same module name  
							
							... 
							
							
							
							This makes ecto execute only the latter one. 
							
						 
						
							2019-10-29 16:56:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5334190056 
								
							 
						 
						
							
							
								
								Migrate missing follow requests  
							
							
							
						 
						
							2019-10-29 19:22:34 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								435d220700 
								
							 
						 
						
							
							
								
								Move setDefaultsToTables to past to run before notNull migrations  
							
							
							
						 
						
							2019-10-28 19:17:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b0893631f 
								
							 
						 
						
							
							
								
								Complete defaults  
							
							
							
						 
						
							2019-10-28 19:16:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4270861085 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/move-activity  
							
							
							
						 
						
							2019-10-28 15:10:47 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c86a0ab24 
								
							 
						 
						
							
							
								
								Fix SetNotNullForUsers migration  
							
							
							
						 
						
							2019-10-28 14:45:50 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2480200759 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/following-relationships' into 'develop'  
							
							... 
							
							
							
							Move following relationships to a separate table
Closes  #1233 
See merge request pleroma/pleroma!1814  
							
						 
						
							2019-10-28 07:27:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0be9cb086b 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-27 19:29:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								060adfd762 
								
							 
						 
						
							
							
								
								Merge branch 'improve-user-info-migration' into 'develop'  
							
							... 
							
							
							
							User info migration improvements
See merge request pleroma/pleroma!1887  
							
						 
						
							2019-10-27 05:33:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								fbadd36cc0 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'  
							
							... 
							
							
							
							Add NOT NULL constraints for users table
See merge request pleroma/pleroma!1910  
							
						 
						
							2019-10-27 05:32:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a9cadf3905 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'  
							
							... 
							
							
							
							Add NOT NULL constraints for user_invite_tokens table
See merge request pleroma/pleroma!1909  
							
						 
						
							2019-10-27 05:31:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4a72d39ca6 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'  
							
							... 
							
							
							
							Add NOT NULL constraints for thread_mutes table
See merge request pleroma/pleroma!1908  
							
						 
						
							2019-10-27 05:31:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e94144669a 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'  
							
							... 
							
							
							
							Add NOT NULL constraints for scheduled_activities table
See merge request pleroma/pleroma!1907  
							
						 
						
							2019-10-27 05:31:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9e084771c6 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'  
							
							... 
							
							
							
							Add NOT NULL constraints for registrations table
See merge request pleroma/pleroma!1906  
							
						 
						
							2019-10-27 05:31:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3ac6160299 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'  
							
							... 
							
							
							
							Add NOT NULL constraints for push_subscriptions table
See merge request pleroma/pleroma!1905  
							
						 
						
							2019-10-27 05:31:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								26daaa9f04 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'  
							
							... 
							
							
							
							Add NOT NULL constraints for password_reset_tokens table
See merge request pleroma/pleroma!1904  
							
						 
						
							2019-10-27 05:30:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								175f6c8355 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:59:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								bdb2039453 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:58:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f5f9197fce 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:57:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2e608f7cbf 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:56:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2810729218 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:55:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf72b7649e 
								
							 
						 
						
							
							
								
								Add migration  
							
							
							
						 
						
							2019-10-26 22:54:37 +03:00