Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0e1bda55e8 
								
							 
						 
						
							
							
								
								PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.  
							
							... 
							
							
							
							7a0e554daf 
						
							2020-05-08 21:33:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7637ef4203 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-08 13:13:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b078e0567d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276-2  
							
							
							
						 
						
							2020-05-08 08:51:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fb2d284d28 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-07 15:05:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								3d0c567fbc 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController  
							
							
							
						 
						
							2020-05-07 08:14:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								205313e541 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-06 11:44:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								fb38b7339c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276-2  
							
							
							
						 
						
							2020-05-06 05:55:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8bed6ea922 
								
							 
						 
						
							
							
								
								User, Webfinger: Remove OStatus vestiges  
							
							... 
							
							
							
							Mainly the `magic_key` field 
							
						 
						
							2020-05-05 09:25:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c40afe5ba0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-04 10:43:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								fe7a0d660e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276-2  
							
							
							
						 
						
							2020-05-04 06:08:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e55876409b 
								
							 
						 
						
							
							
								
								Deactivate local users on deletion instead of deleting the record  
							
							... 
							
							
							
							Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes  pleroma/pleroma#1687  
							
						 
						
							2020-05-02 19:05:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f08c8d9932 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3  
							
							
							
						 
						
							2020-05-02 18:59:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f1bba5c787 
								
							 
						 
						
							
							
								
								PleromaFE bundle supporting follow request notifications.  
							
							... 
							
							
							
							5f90b6a384 
						
							2020-05-02 14:37:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6ddfa8f95 
								
							 
						 
						
							
							
								
								static-fe.css: Restore and move to /priv/static/static-fe  
							
							
							
						 
						
							2020-05-02 08:28:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								06fbb95715 
								
							 
						 
						
							
							
								
								Update AdminFE build in preparation for the 2.0.3 release  
							
							
							
						 
						
							2020-05-01 21:56:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								57b31e79c2 
								
							 
						 
						
							
							
								
								Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (with_move).  
							
							
							
						 
						
							2020-05-01 17:59:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								138e6ece1b 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-05-01 14:31:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a92c713d9c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276-2  
							
							
							
						 
						
							2020-05-01 06:21:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								61889e00fc 
								
							 
						 
						
							
							
								
								Deactivate local users on deletion instead of deleting the record  
							
							... 
							
							
							
							Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes  pleroma/pleroma#1687  
							
						 
						
							2020-05-01 00:38:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3ead44a9aa 
								
							 
						 
						
							
							
								
								Update AdminFE build in preparation for the 2.0.3 release  
							
							
							
						 
						
							2020-04-29 15:49:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d6338f2d3 
								
							 
						 
						
							
							
								
								Litepub: Add ChatMessage.  
							
							
							
						 
						
							2020-04-22 12:52:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								139b9d1338 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-04-20 12:37:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								79445ae5d2 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'  
							
							... 
							
							
							
							migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes  #1697 
See merge request pleroma/pleroma!2403  
							
						 
						
							2020-04-18 06:59:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								d698ecef9b 
								
							 
						 
						
							
							
								
								Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs  
							
							
							
						 
						
							2020-04-17 22:48:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eb61564005 
								
							 
						 
						
							
							
								
								migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo  
							
							
							
						 
						
							2020-04-17 23:57:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								24e0db6310 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4  
							
							
							
						 
						
							2020-04-17 13:22:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8c2c325598 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-04-17 15:51:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6936854878 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'  
							
							... 
							
							
							
							migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes  #1695 
See merge request pleroma/pleroma!2398  
							
						 
						
							2020-04-17 13:40:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46f051048f 
								
							 
						 
						
							
							
								
								migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering  
							
							
							
						 
						
							2020-04-17 14:32:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								a17bfb5fab 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1584-client-captcha-options' into 'develop'  
							
							... 
							
							
							
							Creating trusted app from adminFE & mix task
Closes  #1584 
See merge request pleroma/pleroma!2252  
							
						 
						
							2020-04-17 09:19:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								942d7467ca 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into features/remove-user-source_data  
							
							
							
						 
						
							2020-04-16 21:28:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3b1fec4e 
								
							 
						 
						
							
							
								
								added an endpoint for getting unread notification count  
							
							
							
						 
						
							2020-04-15 21:19:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								44bfb491ea 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-04-15 14:41:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4576520461 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'issue/1276' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1877  
							
						 
						
							2020-04-14 16:32:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7c060432fc 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'marker-update-fix' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2380  
							
						 
						
							2020-04-14 16:31:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d8b12ffd59 
								
							 
						 
						
							
							
								
								Marker update migration: Don't try to update virtual field.  
							
							
							
						 
						
							2020-04-14 15:06:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a16b3dbcbf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-04-13 21:19:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a21baf89d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							
							
						 
						
							2020-04-13 09:16:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e365448f3 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-04-11 19:46:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ad92cef844 
								
							 
						 
						
							
							
								
								fix Oban migration  
							
							
							
						 
						
							2020-04-10 21:27:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e89078ac2a 
								
							 
						 
						
							
							
								
								User: remove source_data  
							
							
							
						 
						
							2020-04-10 06:20:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62656ab259 
								
							 
						 
						
							
							
								
								User: Move inbox & shared_inbox to own fields  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19eedb3d04 
								
							 
						 
						
							
							
								
								User: Move public_key from source_data to own field  
							
							
							
						 
						
							2020-04-10 06:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d9f36965f6 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f  
							
							
							
						 
						
							2020-04-08 16:26:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c0a630d42f 
								
							 
						 
						
							
							
								
								Update AdminFE build in preparation for Pleroma 2.0.2  
							
							
							
						 
						
							2020-04-08 00:29:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								19335be24c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-04-06 17:50:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3fa51f7272 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/views/account_view.ex
#	lib/pleroma/web/mastodon_api/views/status_view.ex 
							
						 
						
							2020-04-02 19:38:39 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								fd932b14a7 
								
							 
						 
						
							
							
								
								Merge branch 'update/adminfe-20200331' into 'develop'  
							
							... 
							
							
							
							Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343  
							
						 
						
							2020-04-01 17:12:59 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								219d3aaa2d 
								
							 
						 
						
							
							
								
								Update AdminFE build in preparation for Pleroma 2.0.2  
							
							
							
						 
						
							2020-03-31 13:05:16 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f497cf2f7c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-30 12:15:23 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a34dca8ed 
								
							 
						 
						
							
							
								
								Add emoji support in statuses in staticfe  
							
							
							
						 
						
							2020-03-23 14:03:31 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6ee6784bc 
								
							 
						 
						
							
							
								
								creating trusted app from adminFE & mix task  
							
							
							
						 
						
							2020-03-23 10:44:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb8236cda6 
								
							 
						 
						
							
							
								
								Add embeddable posts  
							
							
							
						 
						
							2020-03-20 21:46:26 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0651730bd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-16 14:25:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9d09755291 
								
							 
						 
						
							
							
								
								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-16 00:15:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								aa4407be93 
								
							 
						 
						
							
							
								
								Update AdminFE  
							
							
							
						 
						
							2020-03-15 17:01:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								963df689b9 
								
							 
						 
						
							
							
								
								static-fe.css: Restore from before  a65ee8ea 
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1616  
							
						 
						
							2020-03-15 16:55:00 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2966377cb9 
								
							 
						 
						
							
							
								
								Update AdminFE  
							
							
							
						 
						
							2020-03-13 21:55:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39ed608b13 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-12 18:31:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a747eb6df9 
								
							 
						 
						
							
							
								
								static-fe.css: Restore from before  a65ee8ea 
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1616  
							
						 
						
							2020-03-11 06:35:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9f8941dac 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-09 10:56:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								edb659dc57 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-03-08 14:10:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c49d51d7 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af  
							
							
							
						 
						
							2020-03-07 18:18:43 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								15d36b7f5f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2274  
							
						 
						
							2020-03-06 15:56:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e25bacabb1 
								
							 
						 
						
							
							
								
								Remove EmojiPacks from AdminFE build  
							
							... 
							
							
							
							Once more, with feeling 
							
						 
						
							2020-03-06 09:54:38 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d283c9abc1 
								
							 
						 
						
							
							
								
								Remove emoji support from AdminFE  
							
							
							
						 
						
							2020-03-06 07:53:33 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a65ee8ead6 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd  
							
							
							
						 
						
							2020-03-05 23:41:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22d52f5691 
								
							 
						 
						
							
							
								
								same copyright date format  
							
							
							
						 
						
							2020-03-04 09:41:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2a850abbeb 
								
							 
						 
						
							
							
								
								MastoFE: Bundle 2020-01-20  
							
							
							
						 
						
							2020-02-29 06:41:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bdd603e9f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into update/pleroma-fe-20200228  
							
							
							
						 
						
							2020-02-28 16:18:09 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c28de93912 
								
							 
						 
						
							
							
								
								Update PleromaFE bundle for the 2.0 release  
							
							
							
						 
						
							2020-02-28 16:15:12 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3d24a0917b 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							... 
							
							
							
							- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements 
							
						 
						
							2020-02-28 12:32:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								554bc88e8a 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-02-25 11:08:35 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6a97c1b9ff 
								
							 
						 
						
							
							
								
								Update adminFE build  
							
							
							
						 
						
							2020-02-17 15:50:45 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								da44ee5b0f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-02-13 09:20:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f9eb35d48e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211  
							
							
							
						 
						
							2020-02-11 10:33:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								de0fea4634 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-02-11 10:24:38 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								60de311164 
								
							 
						 
						
							
							
								
								Update frontend  
							
							
							
						 
						
							2020-02-11 13:59:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cd040691bd 
								
							 
						 
						
							
							
								
								maked unread_count as virtual field  
							
							
							
						 
						
							2020-02-10 09:01:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b87533760b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-02-10 07:59:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f13b7878b4 
								
							 
						 
						
							
							
								
								Merge branch 'rename_emoji_reactios' into 'develop'  
							
							... 
							
							
							
							EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181  
							
						 
						
							2020-02-07 10:35:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								8a79f20c21 
								
							 
						 
						
							
							
								
								EmojiReactions: Rename to EmojiReacts  
							
							
							
						 
						
							2020-02-06 18:09:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fed9b0d1e0 
								
							 
						 
						
							
							
								
								Update FE bundle  
							
							
							
						 
						
							2020-02-06 10:59:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ba5e8a6444 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-01-28 21:11:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f5bfb29d3b 
								
							 
						 
						
							
							
								
								Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9  
							
							
							
						 
						
							2020-01-28 18:39:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6fab5fe7f8 
								
							 
						 
						
							
							
								
								Merge branch 'translation/errors-french' into 'develop'  
							
							... 
							
							
							
							Translation/errors french
See merge request pleroma/pleroma!1457  
							
						 
						
							2020-01-28 13:26:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e442ea5722 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-01-27 15:20:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								be27777156 
								
							 
						 
						
							
							
								
								Merge branch 'admin-be' into 'develop'  
							
							... 
							
							
							
							Config api for admin-fe
Closes  #1406 
See merge request pleroma/pleroma!1976  
							
						 
						
							2020-01-22 17:13:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd3f3756fb 
								
							 
						 
						
							
							
								
								Update MastoFE bundle to 2020-01-22  
							
							
							
						 
						
							2020-01-22 16:00:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								32a643a159 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-22 11:22:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ee2f86d76 
								
							 
						 
						
							
							
								
								Revert "Update AdminFE build"  
							
							... 
							
							
							
							This reverts commit 6395ad942c 
							
						 
						
							2020-01-22 08:21:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2860bee604 
								
							 
						 
						
							
							
								
								Last AdminFE update was accidentally built from master, not develop  
							
							
							
						 
						
							2020-01-21 15:09:16 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bc2ebdcfd6 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-01-21 13:41:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								503d966e9f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-21 10:32:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d1e9768e10 
								
							 
						 
						
							
							
								
								[ #1478 ] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.  
							
							
							
						 
						
							2020-01-15 18:38:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d128ca208 
								
							 
						 
						
							
							
								
								dynamic_configuration renaming  
							
							... 
							
							
							
							and moving it from instance settings 
							
						 
						
							2020-01-10 19:34:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6395ad942c 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-01-10 15:52:02 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fd3c23af63 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-01-09 10:00:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2f31cef71f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/native-captcha' into 'develop'  
							
							... 
							
							
							
							Add native captcha and enable it by default.
Closes  #1017  and #1405 
See merge request pleroma/pleroma!2060  
							
						 
						
							2019-12-12 18:43:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								756a029edf 
								
							 
						 
						
							
							
								
								Update frontend  
							
							
							
						 
						
							2019-12-12 17:05:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2792672793 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'admin-scope-support-code' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2055  
							
						 
						
							2019-12-12 09:37:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								3ecf131511 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/report-notes  
							
							
							
						 
						
							2019-12-12 02:16:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								84f0aec9aa 
								
							 
						 
						
							
							
								
								Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.  
							
							
							
						 
						
							2019-12-11 19:48:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								701815e64c 
								
							 
						 
						
							
							
								
								[ActivityPub] Configurable ActivityPub actor type  
							
							
							
						 
						
							2019-12-10 13:19:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d6c89068f3 
								
							 
						 
						
							
							
								
								HTML: Compile Scrubbers on boot  
							
							... 
							
							
							
							This makes it possible to configure their behavior on OTP releases. 
							
						 
						
							2019-12-08 20:35:41 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8feb5dcb42 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1348' into 'develop'  
							
							... 
							
							
							
							[#1348 ] excluded invisible actors from gets  /api/v1/accounts/:id
See merge request pleroma/pleroma!1937  
							
						 
						
							2019-11-21 13:13:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f88b1b435 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							
							
						 
						
							2019-11-20 15:47:11 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0fe08346db 
								
							 
						 
						
							
							
								
								bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7  
							
							
							
						 
						
							2019-11-19 23:28:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aad6576130 
								
							 
						 
						
							
							
								
								[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.  
							
							
							
						 
						
							2019-11-18 20:38:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								01d9c093c3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							
							
						 
						
							2019-11-15 21:40:14 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6085c71bd1 
								
							 
						 
						
							
							
								
								Merge branch 'reactions' into 'develop'  
							
							... 
							
							
							
							Emoji Reactions
See merge request pleroma/pleroma!1662  
							
						 
						
							2019-11-14 08:47:10 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a88e834dba 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'reactions'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-11-10 11:32:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								274cc18e8a 
								
							 
						 
						
							
							
								
								Visually separate header.  
							
							
							
						 
						
							2019-11-09 18:08:08 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								1dc785b74b 
								
							 
						 
						
							
							
								
								Move static-fe CSS to a separate file.  
							
							
							
						 
						
							2019-11-09 18:07:50 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3cc2437598 
								
							 
						 
						
							
							
								
								Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642  
							
							
							
						 
						
							2019-11-09 01:49:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b22ee9d966 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-11-08 13:27:11 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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