Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								9272cef500
								
							
						 | 
						
							
							
								
								Switch to a build of Majic that does not try to fix extensions by default
							
							
							
							
							
						 | 
						
							2021-01-28 14:03:29 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								e854c35e65
								
							
						 | 
						
							
							
								
								Convert tests to all use clear_config instead of Pleroma.Config.put
							
							
							
							
							
						 | 
						
							2021-01-26 11:58:43 -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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								35ba48494f
								
							
						 | 
						
							
							
								
								Stream follow updates
							
							
							
							
							
						 | 
						
							2020-12-02 00:18:58 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								3283d0805f
								
							
						 | 
						
							
							
								
								Use Jason instead of Poison in tests
							
							
							
							
							
						 | 
						
							2020-11-23 13:28:55 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								46dab37351
								
							
						 | 
						
							
							
								
								little fix
							
							
							
							
							
						 | 
						
							2020-11-19 15:29:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4aaffe3a10
								
							
						 | 
						
							
							
								
								log capture
							
							
							
							
							
						 | 
						
							2020-11-19 09:58:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								be0b874e1d
								
							
						 | 
						
							
							
								
								fix for mastodon forwarded reports
							
							
							
							
							
						 | 
						
							2020-11-19 09:53:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a840aefda8
								
							
						 | 
						
							
							
								
								formatting
							
							
							
							
							
						 | 
						
							2020-11-19 09:53:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e2bf6b1f7e
								
							
						 | 
						
							
							
								
								fix for forwarded reports
							
							
							
							
							
						 | 
						
							2020-11-19 09:53:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								81293e5aad
								
							
						 | 
						
							
							
								
								ActivityPubController: Don't return local only objects
							
							
							
							
							
						 | 
						
							2020-11-17 13:11:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								049ece1ef3
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex 
							
						 | 
						
							2020-10-17 13:12:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								b738f70953
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/gen-magic
							
							
							
							
							
						 | 
						
							2020-10-13 10:08:38 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7dffaef479
								
							
						 | 
						
							
							
								
								tests consistency
							
							
							
							
							
						 | 
						
							2020-10-13 16:35:09 +03:00 | 
						
						
							
							
							
								
							
							
						 |