feld 
								
							 
						 
						
							
							
							
							
								
							
							
								8f9ee694ed 
								
							 
						 
						
							
							
								
								Merge branch 'features/profile-fields-emojo' into 'develop'  
							
							... 
							
							
							
							user: Add support for custom emojis in profile fields
See merge request pleroma/pleroma!2741  
							
						 
						
							2020-07-13 15:43:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b39eb6ecc5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information  
							
							
							
						 
						
							2020-07-10 12:26:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cc7153cd82 
								
							 
						 
						
							
							
								
								user: Add support for custom emojis in profile fields  
							
							
							
						 
						
							2020-07-09 19:21:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								59cf78e412 
								
							 
						 
						
							
							
								
								AccountController: Allow removal / reset of user images.  
							
							
							
						 
						
							2020-07-07 16:53:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e3b5559780 
								
							 
						 
						
							
							
								
								AccountController: Make setting accepts_chat_messages possible.  
							
							
							
						 
						
							2020-07-03 15:54:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								691742e62d 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'avatar-removing' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2701  
							
						 
						
							2020-07-01 08:51:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e64d08439e 
								
							 
						 
						
							
							
								
								UpdateCredentialsTest: Add test for removing profile images.  
							
							
							
						 
						
							2020-06-29 12:40:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b63646169d 
								
							 
						 
						
							
							
								
								Add support for bot field in update_credentials  
							
							
							
						 
						
							2020-06-19 21:18:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1b07402ab 
								
							 
						 
						
							
							
								
								User: Add raw_bio, storing unformatted bio  
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1643  
							
						 
						
							2020-06-06 16:23:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9460983032 
								
							 
						 
						
							
							
								
								AccountController: Federate user account changes.  
							
							... 
							
							
							
							Hotfixy commit, will be moved to the pipeline. 
							
						 
						
							2020-06-01 13:03:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								41f8f17260 
								
							 
						 
						
							
							
								
								fix api/v1/accounts/update_credentials  
							
							
							
						 
						
							2020-05-19 09:42:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2efc00b3cf 
								
							 
						 
						
							
							
								
								Use json_response_and_validate_schema/2 in tests to validate OpenAPI schema  
							
							
							
						 
						
							2020-04-27 20:46:52 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab400b2ddb 
								
							 
						 
						
							
							
								
								Add specs for ActorType and VisibilityScope  
							
							
							
						 
						
							2020-04-13 18:16:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								260cbddc94 
								
							 
						 
						
							
							
								
								Add spec for AccountController.update_credentials  
							
							
							
						 
						
							2020-04-13 18:16:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d067eaa7b3 
								
							 
						 
						
							
							
								
								formatter.ex: Use Phoenix.HTML for mention/hashtag generation  
							
							... 
							
							
							
							Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason. 
							
						 
						
							2020-04-08 22:58:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
							
							
								
							
							
								06471940e0 
								
							 
						 
						
							
							
								
								Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs  
							
							
							
						 
						
							2020-04-07 08:44:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dbf9d719f9 
								
							 
						 
						
							
							
								
								split test for update profile fields  
							
							
							
						 
						
							2020-04-01 02:52:30 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9081a071ee 
								
							 
						 
						
							
							
								
								Add a test for accounts/update_credentials  
							
							
							
						 
						
							2020-03-25 18:46:17 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15be6ba9c2 
								
							 
						 
						
							
							
								
								AccountView: fix for other forms of <br> in bio  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643  
							
						 
						
							2020-03-22 16:41:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1c05f539aa 
								
							 
						 
						
							
							
								
								Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).  
							
							
							
						 
						
							2020-03-20 18:33:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								983a87175e 
								
							 
						 
						
							
							
								
								mastodon API: do not sanitize html in non-html fields  
							
							
							
						 
						
							2020-02-02 14:46:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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_move setting 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