Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								45b7325b9e 
								
							 
						 
						
							
							
								
								Refactor skipped plugs into Pleroma.Web functions  
							
							... 
							
							
							
							Speeds up recompilation by reducing compile cycles 
							
						 
						
							2021-06-08 19:15:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ec1dbd922 
								
							 
						 
						
							
							
								
								Let pins federate  
							
							... 
							
							
							
							- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins 
							
						 
						
							2021-03-25 13:03:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b1e1db82bc 
								
							 
						 
						
							
							
								
								Store application details in the object under the generator key, not application key  
							
							
							
						 
						
							2021-03-01 11:29:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d35b6254b4 
								
							 
						 
						
							
							
								
								Store the client application data in ActivityStreams format  
							
							
							
						 
						
							2021-02-26 18:14:57 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								63739c5a58 
								
							 
						 
						
							
							
								
								Tests to validate client disclosure obeys user setting  
							
							
							
						 
						
							2021-02-18 17:23:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d5ef02c7a7 
								
							 
						 
						
							
							
								
								Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default  
							
							
							
						 
						
							2021-02-18 16:35:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9b61df1fb6 
								
							 
						 
						
							
							
								
								App is already preloaded into the token, so avoid an extra query  
							
							
							
						 
						
							2021-02-12 12:44:45 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d78328ee 
								
							 
						 
						
							
							
								
								Consistency  
							
							
							
						 
						
							2021-02-11 14:27:52 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6dc0b13cf8 
								
							 
						 
						
							
							
								
								Revert to original formatting for these function defs  
							
							
							
						 
						
							2021-02-11 14:24:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7c508319a5 
								
							 
						 
						
							
							
								
								Prefer naming this put_application because we're putting it into the params map  
							
							
							
						 
						
							2021-02-11 14:19:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								09b8378646 
								
							 
						 
						
							
							
								
								%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.  
							
							
							
						 
						
							2021-02-11 14:15:25 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3dc7e89c54 
								
							 
						 
						
							
							
								
								Ensure we capture the application details into the object  
							
							
							
						 
						
							2021-02-09 18:07:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f 
								
							 
						 
						
							
							
								
								Bump Copyright to 2021  
							
							... 
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;' 
							
						 
						
							2021-01-13 07:49:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1e7e4d379 
								
							 
						 
						
							
							
								
								Object: Rework how Object.normalize works  
							
							... 
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 
						
							2021-01-04 13:38:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								fb41bd1a85 
								
							 
						 
						
							
							
								
								Hide reactions from muted and blocked users  
							
							
							
						 
						
							2020-11-16 22:50:14 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dd2b3a8da9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes  
							
							
							
						 
						
							2020-11-04 16:51:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								64553ebae2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into chore/elixir-1.11  
							
							
							
						 
						
							2020-10-13 09:54:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f4fe5485b 
								
							 
						 
						
							
							
								
								alias alphabetically order  
							
							
							
						 
						
							2020-10-13 16:43:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								011525a3d1 
								
							 
						 
						
							
							
								
								EnsurePublicOrAuthenticatedPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e 
								
							 
						 
						
							
							
								
								OAuthScopesPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b1863ca4e 
								
							 
						 
						
							
							
								
								RateLimiter module name  
							
							
							
						 
						
							2020-10-13 16:43:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ed6511a086 
								
							 
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							2020-10-07 15:28:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636c00037d 
								
							 
						 
						
							
							
								
								Fix duplicate @doc entries  
							
							
							
						 
						
							2020-10-07 09:58:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								91b9985e1c 
								
							 
						 
						
							
							
								
								Pass expires_in param from status controller  
							
							
							
						 
						
							2020-09-08 15:26:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
						 
						
							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