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 
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								241a3d744a 
								
							 
						 
						
							
							
								
								Add ActivityExpirationPolicy  
							
							
							
						 
						
							2020-02-13 22:27:10 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								237b2068f9 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2194  
							
						 
						
							2020-02-11 16:55:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ea1631d7e6 
								
							 
						 
						
							
							
								
								Make Floki use fast_html  
							
							
							
						 
						
							2020-02-11 16:17:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								503d966e9f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-21 10:32:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c533e10e7 
								
							 
						 
						
							
							
								
								Bump credo to 1.1.5  
							
							
							
						 
						
							2020-01-20 12:17:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2753285b77 
								
							 
						 
						
							
							
								
								config editing through database  
							
							
							
						 
						
							2020-01-10 15:51:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ee6805850c 
								
							 
						 
						
							
							
								
								Set log level to debug for not important messages  
							
							
							
						 
						
							2019-12-11 17:47:19 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								eecd64cc07 
								
							 
						 
						
							
							
								
								object age policy: remove debug logging  
							
							
							
						 
						
							2019-11-14 19:56:14 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5705cf0e3e 
								
							 
						 
						
							
							
								
								MRF: add ObjectAgePolicy which deals with old posts being imported  
							
							
							
						 
						
							2019-11-14 19:48:10 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								dd017c65a4 
								
							 
						 
						
							
							
								
								[ #1149 ] Refactored Oban workers API (introduced enqueue/3).  
							
							
							
						 
						
							2019-08-31 21:58:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a90ea8ba15 
								
							 
						 
						
							
							
								
								[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).  
							
							
							
						 
						
							2019-08-31 19:08:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e890ea7e82 
								
							 
						 
						
							
							
								
								[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2019-08-31 14:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								7853b3f17d 
								
							 
						 
						
							
							
								
								Fix AntiFollowbotPolicy when trying to follow a relay  
							
							
							
						 
						
							2019-08-30 00:38:03 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								626e094589 
								
							 
						 
						
							
							
								
								MRF: fix up unserializable option lists in describe implementations  
							
							
							
						 
						
							2019-08-14 18:54:17 +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