Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								858d9fc7e8 
								
							 
						 
						
							
							
								
								MRF Policies: Return a {:reject, reason} instead of {:reject, nil}  
							
							 
							
							
							
						 
						
							2020-07-14 11:04:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								04abee782b 
								
							 
						 
						
							
							
								
								AntiSpamLinkPolicy: Exempt local users.  
							
							 
							
							
							
						 
						
							2020-06-25 12:40:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c7d69e9256 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'  
							
							 
							
							... 
							
							
							
							Moving mrf settings from instance to separate mrf group
Closes  #1631 
See merge request pleroma/pleroma!2320  
							
						 
						
							2020-06-23 16:38:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								35e9282ffd 
								
							 
						 
						
							
							
								
								HellthreadPolicy: Restrict to Notes and Articles.  
							
							 
							
							
							
						 
						
							2020-06-22 10:35:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3 
								
							 
						 
						
							
							
								
								moving mrf settings from instance to separate group  
							
							 
							
							
							
						 
						
							2020-06-16 18:32:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								cb7be6eef2 
								
							 
						 
						
							
							
								
								Remove use of atoms in MRF.UserAllowListPolicy  
							
							 
							
							
							
						 
						
							2020-06-13 12:08:46 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d44843e677 
								
							 
						 
						
							
							
								
								Restrict ActivityExpirationPolicy to Notes only  
							
							 
							
							
							
						 
						
							2020-06-08 17:56:34 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7627bdc7a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-06-01 15:48:51 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5d5db7e5b7 
								
							 
						 
						
							
							
								
								StealEmojiPolicyTest: Clean up.  
							
							 
							
							
							
						 
						
							2020-05-25 14:00:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2dff376041 
								
							 
						 
						
							
							
								
								StealEmojiPolicyTest: Fix flaky test.  
							
							 
							
							
							
						 
						
							2020-05-25 13:58:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e688d4ee69 
								
							 
						 
						
							
							
								
								MRF.StealEmojiPolicy: New Policy  
							
							 
							
							... 
							
							
							
							Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex  
							
						 
						
							2020-05-14 09:59:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c56c0a3d23 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-04-24 18:37:58 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								364eecc49f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-04-20 20:37:56 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bedc558809 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into accept-deletes  
							
							 
							
							
							
						 
						
							2020-04-20 10:15:40 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b54c8813d6 
								
							 
						 
						
							
							
								
								Add :reject_deletes option to SimplePolicy  
							
							 
							
							
							
						 
						
							2020-04-20 10:11:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								8b4de61d64 
								
							 
						 
						
							
							
								
								Fix ObjectAgePolicyTest  
							
							 
							
							... 
							
							
							
							The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests 
							
						 
						
							2020-04-20 12:59:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a3c74b244 
								
							 
						 
						
							
							
								
								Always accept deletions through SimplePolicy  
							
							 
							
							
							
						 
						
							2020-04-12 20:26:35 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f692343c8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-04-10 14:20:48 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80e1571610 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-03-20 22:08:34 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1c7f8e576 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-03-12 16:02:24 +04: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0f386110c6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-03-03 00:32:34 +04: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								819cd46717 
								
							 
						 
						
							
							
								
								Auto-expire Create activities only  
							
							 
							
							
							
						 
						
							2020-02-20 22:04:02 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2d358f1fb 
								
							 
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2020-02-14 15:19:23 +04: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								241a3d744a 
								
							 
						 
						
							
							
								
								Add ActivityExpirationPolicy  
							
							 
							
							
							
						 
						
							2020-02-13 22:27:10 +04: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