Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5fc92deef3
								
							
						 | 
						
							
							
								
								[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
							
							
							
							
							
						 | 
						
							2020-03-09 20:51:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6fc98d9cd
								
							
						 | 
						
							
							
								
								[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.
							
							
							
							
							
						 | 
						
							2020-03-03 22:22:02 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
							
							
								
							
							
								314928333a
								
							
						 | 
						
							
							
								
								Pleroma API: Add endpoint to get reaction information on a single emoji
							
							
							
							
							
						 | 
						
							2020-02-19 17:16:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Soykaf
								
							 
						 | 
						
							
							
							
							
								
							
							
								4538a1ee01
								
							
						 | 
						
							
							
								
								EmojiReactions: Remove old API endpoints
							
							
							
							
							
						 | 
						
							2020-02-07 15:01:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Soykaf
								
							 
						 | 
						
							
							
							
							
								
							
							
								f875b9650a
								
							
						 | 
						
							
							
								
								EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
							
							
							
							
							
						 | 
						
							2020-02-07 14:52:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5db6ac8ee4
								
							
						 | 
						
							
							
								
								removing migrate_from_db endpoint from admin api
							
							
							
							
							
						 | 
						
							2020-02-05 20:36:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								49e80a1537
								
							
						 | 
						
							
							
								
								Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
							
							
							
							
							
							
							
							Restarting pleroma from outside application
See merge request pleroma/pleroma!2144 
							
						 | 
						
							2020-02-05 16:59:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e93cc561cd
								
							
						 | 
						
							
							
								
								restarting pleroma from outside application
							
							
							
							
							
						 | 
						
							2020-01-25 18:42:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2cfe1b9385
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/tag_feed
							
							
							
							
							
						 | 
						
							2020-01-23 11:42:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								60ba2339a2
								
							
						 | 
						
							
							
								
								saving to DB only added by user settings
							
							
							
							
							
						 | 
						
							2020-01-17 11:45:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9f45edeac
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/tag_feed
							
							
							
							
							
						 | 
						
							2020-01-14 21:29:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								70c7a26de8
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into admin-be
							
							
							
							
							
						 | 
						
							2020-01-14 14:52:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2753285b77
								
							
						 | 
						
							
							
								
								config editing through database
							
							
							
							
							
						 | 
						
							2020-01-10 15:51:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b84156013
								
							
						 | 
						
							
							
								
								moved remote follow in separate controller
							
							
							
							
							
						 | 
						
							2019-12-21 21:27:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a879c396bb
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/tag_feed
							
							
							
							
							
						 | 
						
							2019-12-17 09:24:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ecf131511
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/report-notes
							
							
							
							
							
						 | 
						
							2019-12-12 02:16:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								75b419d7c8
								
							
						 | 
						
							
							
								
								Do not apply http signature pipeline to the unsubscribe route
							
							
							
							
							
						 | 
						
							2019-12-10 22:36:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7f77785c2
								
							
						 | 
						
							
							
								
								Implement report notes destruction
							
							
							
							
							
						 | 
						
							2019-12-08 11:27:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								22fc271e23
								
							
						 | 
						
							
							
								
								init tag feed
							
							
							
							
							
						 | 
						
							2019-12-06 09:33:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b60d41db9
								
							
						 | 
						
							
							
								
								Add report notes
							
							
							
							
							
						 | 
						
							2019-12-04 00:26:37 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								82f4e4760e
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
							
							
							
							
							
						 | 
						
							2019-11-25 01:46:18 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd24467b92
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
							
							
							
							
							
						 | 
						
							2019-11-25 01:43:11 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd62946020
								
							
						 | 
						
							
							
								
								Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
							
							
							
							
							
							
							
							AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994 
							
						 | 
						
							2019-11-22 15:39:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								46eb160135
								
							
						 | 
						
							
							
								
								AdminAPI: Confirm user account, resend confirmation email
							
							
							
							
							
						 | 
						
							2019-11-19 20:14:02 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								22554ac5ca
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/1395-email-activation' into 'develop'
							
							
							
							
							
							
							
							Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965 
							
						 | 
						
							2019-11-15 14:11:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f17e0f8e4f
								
							
						 | 
						
							
							
								
								OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
							
							
							
							
							
						 | 
						
							2019-11-15 14:13:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								114930b5fd
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
							
							
							
							
							
						 | 
						
							2019-11-14 23:45:29 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								30af5da330
								
							
						 | 
						
							
							
								
								Admin API: list all statuses from a given instance
							
							
							
							
							
						 | 
						
							2019-11-14 23:44:07 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								1afeaf82fa
								
							
						 | 
						
							
							
								
								Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
							
							
							
							
							
							
							
							Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815 
							
						 | 
						
							2019-11-14 13:35:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								6085c71bd1
								
							
						 | 
						
							
							
								
								Merge branch 'reactions' into 'develop'
							
							
							
							
							
							
							
							Emoji Reactions
See merge request pleroma/pleroma!1662 
							
						 | 
						
							2019-11-14 08:47:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Phil Hagelberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc3b87d153
								
							
						 | 
						
							
							
								
								Move static FE routing into its own plug.
							
							
							
							
							
							
							
							Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place. 
							
						 | 
						
							2019-11-09 18:08:08 -08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b22ee9d966
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions
							
							
							
							
							
						 | 
						
							2019-11-08 13:27:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b14bf9044f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
							
							
							
							
							
						 | 
						
							2019-11-08 18:30:49 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								43ea16870f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
							
							
							
							
							
						 | 
						
							2019-11-05 02:12:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								743b622b7b
								
							
						 | 
						
							
							
								
								Force password reset for multiple users
							
							
							
							
							
						 | 
						
							2019-11-01 18:45:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								243719a965
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/masto_api_markers
							
							
							
							
							
						 | 
						
							2019-10-21 11:32:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								f01dbc450c
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mastofe-pwa' into 'develop'
							
							
							
							
							
							
							
							MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834 
							
						 | 
						
							2019-10-19 20:11:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								52ed2f8f2d
								
							
						 | 
						
							
							
								
								Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
							
							
							
							
							
						 | 
						
							2019-10-19 15:24:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									KokaKiwi
								
							 
						 | 
						
							
							
							
							
								
							
							
								638457ba94
								
							
						 | 
						
							
							
								
								MastoFE: Add PWA manifest.
							
							
							
							
							
						 | 
						
							2019-10-19 12:15:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								019147f115
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/relay-list
							
							
							
							
							
						 | 
						
							2019-10-18 18:35:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								beb9861f9d
								
							
						 | 
						
							
							
								
								router: disconnect Salmon
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f82e42e4e
								
							
						 | 
						
							
							
								
								websub: remove entirely
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2473702be2
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/relay-list
							
							
							
							
							
						 | 
						
							2019-10-18 10:24:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								66b5d0ff55
								
							
						 | 
						
							
							
								
								add Markers /api/v1/markers
							
							
							
							
							
						 | 
						
							2019-10-17 15:26:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc6875b582
								
							
						 | 
						
							
							
								
								Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
							
							
							
							
							
						 | 
						
							2019-10-11 19:12:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aaa4252f41
								
							
						 | 
						
							
							
								
								Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
							
							
							
							
							
						 | 
						
							2019-10-11 15:58:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5104f36bb
								
							
						 | 
						
							
							
								
								Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
							
							
							
							
							
						 | 
						
							2019-10-11 00:24:31 +03:00 | 
						
						
							
							
							
								
							
							
						 |