Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3b7c454418
								
							
						 | 
						
							
							
								
								Let favourites and emoji reactions optionally be hidden
							
							
							
							
							
						 | 
						
							2020-07-28 14:58:30 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d29b8997f4
								
							
						 | 
						
							
							
								
								MastoAPI: fix & test giving MRF reject reasons
							
							
							
							
							
						 | 
						
							2020-07-15 15:25:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc1f34b851
								
							
						 | 
						
							
							
								
								Delete activity before sending response to client
							
							
							
							
							
						 | 
						
							2020-07-06 00:01:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								244655e884
								
							
						 | 
						
							
							
								
								MastoAPI: Show source field when deleting
							
							
							
							
							
						 | 
						
							2020-06-26 19:52:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								317e2b8d61
								
							
						 | 
						
							
							
								
								Use atoms as keys in ActivityPub.fetch_* functions options
							
							
							
							
							
						 | 
						
							2020-06-04 21:36:26 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								51bc6674f6
								
							
						 | 
						
							
							
								
								Mastodon API Controllers: Use the correct params for rate limiting.
							
							
							
							
							
						 | 
						
							2020-05-26 13:45:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								23e248694d
								
							
						 | 
						
							
							
								
								Announcements: Fix all tests.
							
							
							
							
							
						 | 
						
							2020-05-21 13:16:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd2fb2bb2e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs 
							
						 | 
						
							2020-05-13 12:42:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7803a85d2c
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for StatusController
							
							
							
							
							
						 | 
						
							2020-05-13 00:25:21 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								14a49a0483
								
							
						 | 
						
							
							
								
								[#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications.
							
							
							
							
							
						 | 
						
							2020-05-09 18:05:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3bb2e5474
								
							
						 | 
						
							
							
								
								Undoing: Move undoing announcements to the pipeline everywhere.
							
							
							
							
							
						 | 
						
							2020-05-05 16:42:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3071f0231
								
							
						 | 
						
							
							
								
								Undoing: Move undoing likes to the pipeline everywhere.
							
							
							
							
							
						 | 
						
							2020-05-05 15:08:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								908cf22a6c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex 
							
						 | 
						
							2020-04-28 19:56:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4139cc547
								
							
						 | 
						
							
							
								
								[#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.
							
							
							
							
							
						 | 
						
							2020-04-24 22:25:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								00e62161f6
								
							
						 | 
						
							
							
								
								[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
							
							
							
							
							
						 | 
						
							2020-04-24 16:52:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c10485db16
								
							
						 | 
						
							
							
								
								StatusController: Ignore nil scheduled_at parameters.
							
							
							
							
							
						 | 
						
							2020-04-22 14:26:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f685cbd309
								
							
						 | 
						
							
							
								
								Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
							
							
							
							
							
						 | 
						
							2020-04-21 16:29:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a21baf89d8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
							
							
							
							
							
						 | 
						
							2020-04-13 09:16:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								349b9d86dc
								
							
						 | 
						
							
							
								
								Merge branch 'remake-remodel-2' into 'develop'
							
							
							
							
							
							
							
							Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315 
							
						 | 
						
							2020-04-06 11:59:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15
								
							
						 | 
						
							
							
								
								restrict_unauthenticated setting
							
							
							
							
							
						 | 
						
							2020-03-20 16:36:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c2c32b460
								
							
						 | 
						
							
							
								
								Merge branch 'remake-remodel' into develop
							
							
							
							
							
						 | 
						
							2020-03-19 18:00:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4bce13fa2f
								
							
						 | 
						
							
							
								
								MastodonController: Return 404 errors correctly.
							
							
							
							
							
						 | 
						
							2020-03-04 18:09:06 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								67cb46e15d
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1383
							
							
							
							
							
						 | 
						
							2019-12-14 21:44:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9993acdbb
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
							
							
							
							
							
						 | 
						
							2019-12-04 16:35:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								652cc6ba4b
								
							
						 | 
						
							
							
								
								updated ScheduledActivity
							
							
							
							
							
						 | 
						
							2019-12-04 09:12:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0937895182
								
							
						 | 
						
							
							
								
								updated fetch_favorites
							
							
							
							
							
						 | 
						
							2019-11-18 16:56:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9da4c88b49
								
							
						 | 
						
							
							
								
								fix test
							
							
							
							
							
						 | 
						
							2019-11-18 10:00:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4beb3ce5c5
								
							
						 | 
						
							
							
								
								/api/v1/favourites: added sorting for activites by adds to favorites
							
							
							
							
							
						 | 
						
							2019-11-18 09:44:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steven Fuchs
								
							 
						 | 
						
							
							
							
							
								
							
							
								94627baa5c
								
							
						 | 
						
							
							
								
								New rate limiter
							
							
							
							
							
						 | 
						
							2019-11-11 12:13:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e4f52f8a2
								
							
						 | 
						
							
							
								
								Introduce new ingestion pipeline structure, implement internal Likes with it.
							
							
							
							
							
						 | 
						
							2019-10-16 16:16:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								580a67f5ca
								
							
						 | 
						
							
							
								
								Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)
							
							
							
							
							
						 | 
						
							2019-10-09 07:27:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b93856874d
								
							
						 | 
						
							
							
								
								[#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-06 17:12:17 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e0c68eeb02
								
							
						 | 
						
							
							
								
								Move :favourites and :bookmarks actions to StatusController
							
							
							
							
							
						 | 
						
							2019-10-02 21:31:19 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								427d0c2a00
								
							
						 | 
						
							
							
								
								Store private announcements in object.data["announcements"], filter them on display
							
							
							
							
							
						 | 
						
							2019-10-01 22:39:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c1f158f5d
								
							
						 | 
						
							
							
								
								Allow users to announce privately, including own private notes
							
							
							
							
							
						 | 
						
							2019-10-01 20:00:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								36a34c36fe
								
							
						 | 
						
							
							
								
								Extract poll actions from MastodonAPIController to PollController
							
							
							
							
							
						 | 
						
							2019-10-01 11:44:34 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e7aef27c00
								
							
						 | 
						
							
							
								
								Fix merge
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1053319cd6
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into tests/mastodon_api_controller.ex
							
							
							
							
							
						 | 
						
							2019-09-28 10:36:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9202904da9
								
							
						 | 
						
							
							
								
								status_controller.ex: Posting media status without content defined
							
							
							
							
							
						 | 
						
							2019-09-28 01:53:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ea5c58a85
								
							
						 | 
						
							
							
								
								Move view logic from StatusController.context to StatusView and add a test
							
							
							
							
							
						 | 
						
							2019-09-27 10:52:47 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								98d1347a4e
								
							
						 | 
						
							
							
								
								Extract status actions from MastodonAPIController into StatusController
							
							
							
							
							
						 | 
						
							2019-09-27 10:51:15 +07:00 | 
						
						
							
							
							
								
							
							
						 |