Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								9bf1065a06 
								
							 
						 
						
							
							
								
								schedule activity expiration in Oban  
							
							 
							
							
							
						 
						
							2020-09-10 21:50:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								21efda2edb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted  
							
							 
							
							
							
						 
						
							2020-09-08 09:31:26 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								95688c90ad 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: simplify code  
							
							 
							
							
							
						 
						
							2020-09-08 01:15:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								8b695c3eeb 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: format  
							
							 
							
							
							
						 
						
							2020-09-07 22:53:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								699224a900 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version  
							
							 
							
							
							
						 
						
							2020-09-07 22:15:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								696bf09433 
								
							 
						 
						
							
							
								
								passing adapter options directly without adapter key  
							
							 
							
							
							
						 
						
							2020-09-07 19:59:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a83916fdac 
								
							 
						 
						
							
							
								
								adapter options unification  
							
							 
							
							... 
							
							
							
							not needed options deletion 
							
						 
						
							2020-09-07 19:59:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								91fbb5b21f 
								
							 
						 
						
							
							
								
								Fix ActivityExpirationPolicy  
							
							 
							
							
							
						 
						
							2020-08-04 18:26:37 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56b5b9aa27 
								
							 
						 
						
							
							
								
								Merge branch 'follower-mrf-again' into 'develop'  
							
							 
							
							... 
							
							
							
							Follower mrf again
See merge request pleroma/pleroma!2833  
							
						 
						
							2020-08-03 14:22:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								10c792110e 
								
							 
						 
						
							
							
								
								MRF Object Age Policy: Don't break on messages without cc/to  
							
							 
							
							
							
						 
						
							2020-08-03 14:12:32 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b18a07392 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-1ac0969c' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !2825  
							
						 
						
							2020-07-31 15:18:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								010d77ec85 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'mrf-silence-2' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !2820  
							
						 
						
							2020-07-31 15:17:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1dd162a5f7 
								
							 
						 
						
							
							
								
								SimplePolicy: Fix problem with DM leaks.  
							
							 
							
							
							
						 
						
							2020-07-31 09:57:30 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								702f0fb822 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into mrf-silence  
							
							 
							
							
							
						 
						
							2020-07-29 13:01:16 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								93638935d7 
								
							 
						 
						
							
							
								
								SimpleMRF: :silence --> :followers_only  
							
							 
							
							
							
						 
						
							2020-07-29 12:58:08 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								edf8b6abfe 
								
							 
						 
						
							
							
								
								EnsureRePrepended: Don't break on chat messages.  
							
							 
							
							
							
						 
						
							2020-07-29 10:53:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2a99e7df8e 
								
							 
						 
						
							
							
								
								SimpleMRF silence: optimize, work okay with nil values in addressing  
							
							 
							
							
							
						 
						
							2020-07-28 20:32:58 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c90f7f715 
								
							 
						 
						
							
							
								
								SimpleMRF: Let instances be silenced  
							
							 
							
							
							
						 
						
							2020-07-28 19:06:42 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								858d9fc7e8 
								
							 
						 
						
							
							
								
								MRF Policies: Return a {:reject, reason} instead of {:reject, nil}  
							
							 
							
							
							
						 
						
							2020-07-14 11:04:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d23804f191 
								
							 
						 
						
							
							
								
								Use the Pleroma.Config alias  
							
							 
							
							
							
						 
						
							2020-07-09 10:53:51 -05: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1c7f8e576 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-03-12 16:02:24 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22d52f5691 
								
							 
						 
						
							
							
								
								same copyright date format  
							
							 
							
							
							
						 
						
							2020-03-04 09:41:23 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4427161ca3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							 
							
							
							
						 
						
							2020-03-03 17:15:49 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							 
							
							
							
						 
						
							2020-03-03 16:44:49 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								509c81e4b1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							 
							
							
							
						 
						
							2020-03-03 10:08:07 +03: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								011ede4536 
								
							 
						 
						
							
							
								
								Update documentation  
							
							 
							
							
							
						 
						
							2020-02-21 14:42:43 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								819cd46717 
								
							 
						 
						
							
							
								
								Auto-expire Create activities only  
							
							 
							
							
							
						 
						
							2020-02-20 22:04:02 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cf94349287 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							 
							
							
							
						 
						
							2020-02-18 09:06:27 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3fa2ac68df 
								
							 
						 
						
							
							
								
								Merge branch 'chore/standardize-mrf-behavior' into 'develop'  
							
							 
							
							... 
							
							
							
							Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212  
							
						 
						
							2020-02-18 14:36:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								514c899275 
								
							 
						 
						
							
							
								
								adding gun adapter  
							
							 
							
							
							
						 
						
							2020-02-18 08:19:01 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								472132215e 
								
							 
						 
						
							
							
								
								Use floki's new APIs for parsing fragments  
							
							 
							
							
							
						 
						
							2020-02-16 01:55:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								478619782b 
								
							 
						 
						
							
							
								
								Standardize @behaviour usage in MRFs  
							
							 
							
							
							
						 
						
							2020-02-14 11:02:24 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								57878f8708 
								
							 
						 
						
							
							
								
								Improve readability  
							
							 
							
							
							
						 
						
							2020-02-14 15:50:31 +04:00