| 
								
								
									 Ivan Tashkinov | 455e072d27 | [#2068] Introduced proper OAuth tokens usage to controller tests. | 2019-12-19 17:23:27 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e6d7e27bd6 | Add allow_following_movesetting to User | 2019-11-12 18:45:28 +07:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 10ff01acd9 | [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. | 2019-10-16 21:59:21 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 06b3bb54c5 | Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes # Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex | 2019-10-06 11:43:49 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 64095961fe | [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes # Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex | 2019-10-02 20:42:40 +03:00 |  | 
				
					
						| 
								
								
									 kPherox | f364438032 | Add rel="ugc" | 2019-10-01 02:24:06 +09:00 |  | 
				
					
						| 
								
								
									 kPherox | a0f101ee80 | Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials | 2019-10-01 01:40:33 +09:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 987e0b8be8 | Move update_credentials to MastodonAPI.AccountController | 2019-09-30 19:10:56 +07:00 |  |