eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								13cce9c0de
								
							
						 | 
						
							
							
								
								Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.
							
							
							
							
							
						 | 
						
							2020-03-16 20:42:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
							
							
								
							
							
								8176ca9e40
								
							
						 | 
						
							
							
								
								static_fe: Sanitize HTML in users
							
							
							
							
							
						 | 
						
							2020-03-15 20:44:04 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								46eb160135
								
							
						 | 
						
							
							
								
								AdminAPI: Confirm user account, resend confirmation email
							
							
							
							
							
						 | 
						
							2019-11-19 20:14:02 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6fdfbc4f1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs 
							
						 | 
						
							2019-10-20 20:43:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								10ff01acd9
								
							
						 | 
						
							
							
								
								[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
							
							
							
							
							
						 | 
						
							2019-10-16 21:59:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad42837244
								
							
						 | 
						
							
							
								
								Ability to toggle activation status and permission group for a group of users
							
							
							
							
							
						 | 
						
							2019-10-09 17:03:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								90986667ce
								
							
						 | 
						
							
							
								
								Merge branch 'admin-create-users' into 'develop'
							
							
							
							
							
							
							
							user creation admin api will create multiple users
See merge request pleroma/pleroma!1170 
							
						 | 
						
							2019-08-24 16:04:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								452ca5250d
								
							
						 | 
						
							
							
								
								Merge admin and mastodon user views for reports
							
							
							
							
							
						 | 
						
							2019-06-28 15:15:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								5534d4c676
								
							
						 | 
						
							
							
								
								make bulk user creation from admin works as a transaction
							
							
							
							
							
						 | 
						
							2019-06-01 11:17:53 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								5c028b8f92
								
							
						 | 
						
							
							
								
								user creation admin api will create multiple users
							
							
							
							
							
						 | 
						
							2019-05-17 12:21:58 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								012bb5dcc9
								
							
						 | 
						
							
							
								
								renaming expire_at -> expires_at
							
							
							
							
							
							
							
							keyword style change 
							
						 | 
						
							2019-04-08 16:01:28 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								dcc54f8cfa
								
							
						 | 
						
							
							
								
								admin api endpoints for invites
							
							
							
							
							
						 | 
						
							2019-04-06 20:25:19 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								59333f2d56
								
							
						 | 
						
							
							
								
								Merge branch 'admin-api-account-view-namespace' into 'develop'
							
							
							
							
							
							
							
							MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930 
							
						 | 
						
							2019-03-14 02:01:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cc0f2f8ba3
								
							
						 | 
						
							
							
								
								MastodonAPI.Admin.AccountView → AdminAPI.AccountView
							
							
							
							
							
						 | 
						
							2019-03-13 12:17:57 +01:00 | 
						
						
							
							
							
								
							
							
						 |