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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b607ae1a1c
								
							
						 | 
						
							
							
								
								removing grouped reports admin api endpoint
							
							
							
							
							
						 | 
						
							2020-03-30 13:51:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07
							
							
							
							
							
							
							
							Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 | 
						
							2020-03-02 06:08:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2a6a40367
								
							
						 | 
						
							
							
								
								Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)
							
							
							
							
							
						 | 
						
							2020-02-26 20:21:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e93cc561cd
								
							
						 | 
						
							
							
								
								restarting pleroma from outside application
							
							
							
							
							
						 | 
						
							2020-01-25 18:42:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								89e93fb33f
								
							
						 | 
						
							
							
								
								return db key on update requests
							
							
							
							
							
						 | 
						
							2020-01-17 18:15:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								29155137fd
								
							
						 | 
						
							
							
								
								renaming
							
							
							
							
							
							
							
							Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB 
							
						 | 
						
							2020-01-16 08:50:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8cb852523a
								
							
						 | 
						
							
							
								
								Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
							
							
							
							
							
							
							
							AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054 
							
						 | 
						
							2019-12-12 09:28:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ecf131511
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/report-notes
							
							
							
							
							
						 | 
						
							2019-12-12 02:16:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								82fae3e23f
								
							
						 | 
						
							
							
								
								AdminAPI: Merge account views for list instance statuses
							
							
							
							
							
						 | 
						
							2019-12-11 18:57:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7f77785c2
								
							
						 | 
						
							
							
								
								Implement report notes destruction
							
							
							
							
							
						 | 
						
							2019-12-08 11:27:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								08c89fd2b8
								
							
						 | 
						
							
							
								
								Fix incorrect report count
							
							
							
							
							
						 | 
						
							2019-12-06 17:17:24 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b60d41db9
								
							
						 | 
						
							
							
								
								Add report notes
							
							
							
							
							
						 | 
						
							2019-12-04 00:26:37 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5135656f57
								
							
						 | 
						
							
							
								
								Handle reopened reports with deleted statuses
							
							
							
							
							
						 | 
						
							2019-11-27 22:54:12 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b62be2564c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-render-whole-status
							
							
							
							
							
						 | 
						
							2019-11-26 00:25:43 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								40059c9b1e
								
							
						 | 
						
							
							
								
								Typo
							
							
							
							
							
						 | 
						
							2019-11-25 00:05:52 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b341627da
								
							
						 | 
						
							
							
								
								Admin API: Render whole status in grouped reports
							
							
							
							
							
						 | 
						
							2019-11-25 00:04:29 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								46eb160135
								
							
						 | 
						
							
							
								
								AdminAPI: Confirm user account, resend confirmation email
							
							
							
							
							
						 | 
						
							2019-11-19 20:14:02 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f171095960
								
							
						 | 
						
							
							
								
								Grouped reports with status data baked in
							
							
							
							
							
						 | 
						
							2019-11-06 21:25:46 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								43ea16870f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
							
							
							
							
							
						 | 
						
							2019-11-05 02:12:48 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7aceaa517b
								
							
						 | 
						
							
							
								
								Admin API: Reports, grouped by status
							
							
							
							
							
						 | 
						
							2019-10-07 15:39:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e7aef27c00
								
							
						 | 
						
							
							
								
								Fix merge
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7836adf21
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/moderation-log-filters
							
							
							
							
							
						 | 
						
							2019-09-26 19:01:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steven Fuchs
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1d2d69c87
								
							
						 | 
						
							
							
								
								Clean up views
							
							
							
							
							
						 | 
						
							2019-09-23 22:33:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								736165c082
								
							
						 | 
						
							
							
								
								Reverse reports list
							
							
							
							
							
						 | 
						
							2019-09-05 16:54:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								af746fa4a8
								
							
						 | 
						
							
							
								
								Return total for reports
							
							
							
							
							
						 | 
						
							2019-09-04 20:08:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c96b17e16
								
							
						 | 
						
							
							
								
								Add pagination to logs
							
							
							
							
							
						 | 
						
							2019-09-01 21:23:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								37dd3867bb
								
							
						 | 
						
							
							
								
								Log admin/moderator actions
							
							
							
							
							
						 | 
						
							2019-08-25 19:39:37 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								846ad9a463
								
							
						 | 
						
							
							
								
								admin api configure changes
							
							
							
							
							
						 | 
						
							2019-07-11 13:02:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								93a0eeab16
								
							
						 | 
						
							
							
								
								Add license/copyright to all project files
							
							
							
							
							
						 | 
						
							2019-07-10 05:13:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugenij
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab50c6b3ca
								
							
						 | 
						
							
							
								
								Add fallback value to the admin report view.
							
							
							
							
							
							
							
							This is to avoid 500 error when the reported user no longer exists
in the database. 
							
						 | 
						
							2019-07-02 01:27:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								452ca5250d
								
							
						 | 
						
							
							
								
								Merge admin and mastodon user views for reports
							
							
							
							
							
						 | 
						
							2019-06-28 15:15:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								982cad0268
								
							
						 | 
						
							
							
								
								support for config groups
							
							
							
							
							
						 | 
						
							2019-06-23 08:16:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf6aa6f1a8
								
							
						 | 
						
							
							
								
								Fix report content stopping to be nullable
							
							
							
							
							
						 | 
						
							2019-06-16 13:06:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								44de34d170
								
							
						 | 
						
							
							
								
								Credo fixes
							
							
							
							
							
						 | 
						
							2019-06-16 01:35:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								641bcaa44e
								
							
						 | 
						
							
							
								
								Sanitize HTML in ReportView
							
							
							
							
							
							
							
							Closes #990 
							
						 | 
						
							2019-06-16 01:30:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2ca1f22a2
								
							
						 | 
						
							
							
								
								it is changed in compile time
							
							
							
							
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 | 
						
							2019-06-14 15:45:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad5263c647
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into admin-create-users
							
							
							
							
							
						 | 
						
							2019-06-01 11:42:37 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2b3a27204
								
							
						 | 
						
							
							
								
								Add Reports to Admin API
							
							
							
							
							
						 | 
						
							2019-05-16 19:09:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |