Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9bae9b1b1b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-20 20:47:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c05f539aa
								
							
						 | 
						
							
							
								
								Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).
							
							
							
							
							
						 | 
						
							2020-03-20 18:33:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec3719f539
								
							
						 | 
						
							
							
								
								Improved in-test config management functions.
							
							
							
							
							
						 | 
						
							2020-03-18 20:30:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f0753eed0f
								
							
						 | 
						
							
							
								
								removing try block in tesla request
							
							
							
							
							
							
							
							added mocks for tests which fail with Tesla.Mock.Error 
							
						 | 
						
							2020-03-05 17:31:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								22d52f5691
								
							
						 | 
						
							
							
								
								same copyright date format
							
							
							
							
							
						 | 
						
							2020-03-04 09:41:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f8c3462a8
								
							
						 | 
						
							
							
								
								Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.
							
							
							
							
							
						 | 
						
							2020-02-13 21:55:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c59bc9ef9
								
							
						 | 
						
							
							
								
								fix credo
							
							
							
							
							
						 | 
						
							2019-11-14 20:18:45 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								5705cf0e3e
								
							
						 | 
						
							
							
								
								MRF: add ObjectAgePolicy which deals with old posts being imported
							
							
							
							
							
						 | 
						
							2019-11-14 19:48:10 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								08f6837065
								
							
						 | 
						
							
							
								
								Switch from HtmlSanitizeEx to FastSanitize
							
							
							
							
							
						 | 
						
							2019-10-29 01:18:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								10ff01acd9
								
							
						 | 
						
							
							
								
								[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
							
							
							
							
							
						 | 
						
							2019-10-16 21:59:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								58aeabd020
								
							
						 | 
						
							
							
								
								mrf/simple_policy: check actor against accept/reject
							
							
							
							
							
						 | 
						
							2019-10-07 03:49:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								256ff09aa8
								
							
						 | 
						
							
							
								
								[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 | 
						
							2019-08-22 20:59:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								a320358703
								
							
						 | 
						
							
							
								
								added test helpers to clear config after tests
							
							
							
							
							
						 | 
						
							2019-08-19 15:34:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8778c16dac
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
						 | 
						
							2019-08-14 21:44:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ef31767f2
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mrf-vocabulary' into 'develop'
							
							
							
							
							
							
							
							MRF Vocabulary
See merge request pleroma/pleroma!1559 
							
						 | 
						
							2019-08-13 22:51:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd0b71ea6d
								
							
						 | 
						
							
							
								
								tests: add tests for MRF.describe()
							
							
							
							
							
						 | 
						
							2019-08-13 22:19:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								f7e3b7ff75
								
							
						 | 
						
							
							
								
								tests: add tests for mrf_vocabulary
							
							
							
							
							
						 | 
						
							2019-08-13 20:55:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e1c481a94
								
							
						 | 
						
							
							
								
								[#1149] Added more oban workers. Refactoring.
							
							
							
							
							
						 | 
						
							2019-08-13 20:20:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								9cfc289594
								
							
						 | 
						
							
							
								
								MRF: ensure that subdomain_match calls are case-insensitive
							
							
							
							
							
						 | 
						
							2019-08-10 21:19:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b70e659304
								
							
						 | 
						
							
							
								
								Feature/1087 wildcard option for blocks
							
							
							
							
							
						 | 
						
							2019-07-22 14:33:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									RX14
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								96a2890a9e
								
							
						 | 
						
							
							
								
								Add MRF MentionPolicy for dropping posts which mention specific actors
							
							
							
							
							
						 | 
						
							2019-07-17 15:16:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								bb8065a1fd
								
							
						 | 
						
							
							
								
								tests MRF filters
							
							
							
							
							
						 | 
						
							2019-07-10 05:12:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c22f0bfb80
								
							
						 | 
						
							
							
								
								test: add tests for mediaproxy warming policy
							
							
							
							
							
						 | 
						
							2019-06-28 23:41:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								b37ede5df3
								
							
						 | 
						
							
							
								
								log capturing
							
							
							
							
							
						 | 
						
							2019-06-23 08:16:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								21dacd4b15
								
							
						 | 
						
							
							
								
								unbreak polls
							
							
							
							
							
						 | 
						
							2019-06-19 16:33:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								736d8ad6be
								
							
						 | 
						
							
							
								
								implement anti link spam MRF
							
							
							
							
							
						 | 
						
							2019-06-19 15:58:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								38a275b31f
								
							
						 | 
						
							
							
								
								test: add tests for subchain policy
							
							
							
							
							
						 | 
						
							2019-06-02 10:08:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								79503ce90f
								
							
						 | 
						
							
							
								
								mrf: simple policy: fix matching imported activitypub and ostatus statuses
							
							
							
							
							
						 | 
						
							2019-05-26 02:01:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8086c7aed6
								
							
						 | 
						
							
							
								
								tests: add tests for banner and avatar removal
							
							
							
							
							
						 | 
						
							2019-05-22 18:53:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Aaron Tinio
								
							 
						 | 
						
							
							
							
							
								
							
							
								2375e9a95b
								
							
						 | 
						
							
							
								
								Add report filtering to MRF.SimplePolicy
							
							
							
							
							
						 | 
						
							2019-05-20 06:02:50 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Aaron Tinio
								
							 
						 | 
						
							
							
							
							
								
							
							
								443cd68a4c
								
							
						 | 
						
							
							
								
								Add tests for MRF.SimplePolicy
							
							
							
							
							
						 | 
						
							2019-05-17 09:02:34 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c5926fe91
								
							
						 | 
						
							
							
								
								tests: add regression test
							
							
							
							
							
						 | 
						
							2019-03-07 12:20:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d0a94f98e0
								
							
						 | 
						
							
							
								
								more tests for HellthreadPolicy
							
							
							
							
							
						 | 
						
							2019-02-17 14:33:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								dca6bee2f7
								
							
						 | 
						
							
							
								
								Rename test, add check for follower collection when delisting
							
							
							
							
							
						 | 
						
							2019-02-15 13:43:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								d943c90249
								
							
						 | 
						
							
							
								
								Add tests, change default config values, fix a bug
							
							
							
							
							
						 | 
						
							2019-02-15 12:47:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								379d04692c
								
							
						 | 
						
							
							
								
								Filter summary in keywordpolicy
							
							
							
							
							
						 | 
						
							2019-02-11 21:35:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								b05a341187
								
							
						 | 
						
							
							
								
								oof
							
							
							
							
							
						 | 
						
							2019-02-09 08:12:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a23f8f3ea
								
							
						 | 
						
							
							
								
								Add tests and fix a typo in docs
							
							
							
							
							
						 | 
						
							2019-02-08 20:23:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								13d72826df
								
							
						 | 
						
							
							
								
								test: add anti-followbot policy tests
							
							
							
							
							
						 | 
						
							2019-01-24 09:50:40 +00:00 | 
						
						
							
							
							
								
							
							
						 |