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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								b5465bf385
								
							
						 | 
						
							
							
								
								timeline controller: add a TODO for replacing copypaste with a macro
							
							
							
							
							
						 | 
						
							2020-03-01 02:03:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ffcebe7e22
								
							
						 | 
						
							
							
								
								timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
							
							
							
							
							
						 | 
						
							2020-03-01 01:13:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ee6754095
								
							
						 | 
						
							
							
								
								Mix Tasks: Add pleroma.benchmarks.tags
							
							
							
							
							
						 | 
						
							2020-01-14 17:24:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d0b989521
								
							
						 | 
						
							
							
								
								add subject to atom feed
							
							
							
							
							
						 | 
						
							2019-11-10 11:10:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82
								
							
						 | 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship
							
							
							
							
							
						 | 
						
							2019-10-11 02:35:32 +07: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								3572cf29b7
								
							
						 | 
						
							
							
								
								Extract timeline actions from MastodonAPIController into TimelineController
							
							
							
							
							
						 | 
						
							2019-09-26 10:53:42 +07:00 | 
						
						
							
							
							
								
							
							
						 |