Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fe4c4a7178
								
							
						 | 
						
							
							
								
								MRF: create MRF.Policy behaviour separate from MRF module
							
							
							
							
							
							
							
							Speeds up recompilation by reducing compile-time deps 
							
						 | 
						
							2021-06-07 14:22:08 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f2134e605b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
							
							
							
							
							
						 | 
						
							2021-05-31 16:49:46 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87
								
							
						 | 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0
							
							
							
							
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 | 
						
							2021-05-31 16:48:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								926a233cc4
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
							
							
							
							
							
						 | 
						
							2021-04-30 14:21:17 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c16c7fdb87
								
							
						 | 
						
							
							
								
								SimplePolicy: filter string Objects
							
							
							
							
							
						 | 
						
							2021-04-30 14:20:54 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3d742c3c1a
								
							
						 | 
						
							
							
								
								SimplePolicy: filter nested objects
							
							
							
							
							
						 | 
						
							2021-04-30 14:20:37 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								03f38ac4eb
								
							
						 | 
						
							
							
								
								Prefer FollowBot naming convention vs Followbot
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:44 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4796df0bc3
								
							
						 | 
						
							
							
								
								Remove Task.async as it is broken here and probably a premature optimization anyway
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:44 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								778010ef8e
								
							
						 | 
						
							
							
								
								Do not try to follow local users. Their posts are already available locally on the instance.
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:44 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								86182ef8e4
								
							
						 | 
						
							
							
								
								Change module name to FollowbotPolicy
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:44 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0dcc1ca69
								
							
						 | 
						
							
							
								
								Lint
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:44 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								a176914c73
								
							
						 | 
						
							
							
								
								Better checking of previous follow request attempts
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:44 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								3989ec508c
								
							
						 | 
						
							
							
								
								Prevent duplicates from being processed
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:44 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								3949cfdc24
								
							
						 | 
						
							
							
								
								Make the followbot only dispatch follow requests once per 30 day period
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:43 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								e78738173a
								
							
						 | 
						
							
							
								
								Enforce that the followbot must be marked as a bot.
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:43 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								fba770b3ea
								
							
						 | 
						
							
							
								
								Try to handle misconfiguration scenarios gracefully
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b81d62227
								
							
						 | 
						
							
							
								
								Upstream original followbot implementation
							
							
							
							
							
						 | 
						
							2021-03-30 11:10:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3bc7d12271
								
							
						 | 
						
							
							
								
								Remove sensitive-property setting #nsfw, create HashtagPolicy
							
							
							
							
							
						 | 
						
							2021-02-27 21:26:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5992382cf8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/mix/tasks/pleroma/database.ex
#	lib/pleroma/web/templates/feed/feed/_activity.rss.eex 
							
						 | 
						
							2021-02-11 19:31:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								55a13fc360
								
							
						 | 
						
							
							
								
								MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
							
							
							
							
							
							
							
							Helps prevent accidental button mashes from submitting incomplete posts 
							
						 | 
						
							2021-02-08 15:32:47 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2634a16b4c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 | 
						
							2021-01-21 20:20:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6d48144a9d
								
							
						 | 
						
							
							
								
								use proper naming
							
							
							
							
							
							
							
							for MediaProxyWarmingPolicy in ConcurrentLimiter 
							
						 | 
						
							2021-01-21 09:50:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e350898828
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-01-13 22:11:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								80167e62dd
								
							
						 | 
						
							
							
								
								Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
							
							
							
							
							
							
							
							Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218 
							
						 | 
						
							2021-01-08 13:10:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1e7e4d379
								
							
						 | 
						
							
							
								
								Object: Rework how Object.normalize works
							
							
							
							
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 | 
						
							2021-01-04 13:38:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								3966add048
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !2824 
							
						 | 
						
							2020-12-28 12:02:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								b122b6ffa3
								
							
						 | 
						
							
							
								
								Merge branch 'features/hashtag-column' into 'develop'
							
							
							
							
							
							
							
							Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824 
							
						 | 
						
							2020-12-28 10:14:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								18b536c176
								
							
						 | 
						
							
							
								
								Pleroma.Object/1: take %Object{} as argument instead
							
							
							
							
							
						 | 
						
							2020-12-28 11:05:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2e859794ee
								
							
						 | 
						
							
							
								
								non condition dir creation
							
							
							
							
							
						 | 
						
							2020-12-27 21:58:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7bfb041658
								
							
						 | 
						
							
							
								
								insreasing test coverage for StealEmojiPolicy
							
							
							
							
							
						 | 
						
							2020-12-27 21:53:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								aafd7b44ce
								
							
						 | 
						
							
							
								
								check dir existence in policy
							
							
							
							
							
						 | 
						
							2020-12-27 21:53:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4134abef63
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2020-12-26 22:23:05 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								87b13c5430
								
							
						 | 
						
							
							
								
								Create Object.hashtags/1 wrapper
							
							
							
							
							
						 | 
						
							2020-12-22 05:15:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								acb03d591b
								
							
						 | 
						
							
							
								
								Insert text representation of hashtags into object["hashtags"]
							
							
							
							
							
							
							
							Includes a new mix task: pleroma.database fill_old_hashtags 
							
						 | 
						
							2020-12-22 05:15:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee221277b0
								
							
						 | 
						
							
							
								
								Encapsulation of tags / hashtags fetching from objects.
							
							
							
							
							
						 | 
						
							2020-12-21 22:54:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab633e51ab
								
							
						 | 
						
							
							
								
								Linting
							
							
							
							
							
						 | 
						
							2020-12-21 16:48:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd1b4155d5
								
							
						 | 
						
							
							
								
								Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
							
							
							
							
							
							
							
							Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129 
							
						 | 
						
							2020-11-19 20:32:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8d218ebaf5
								
							
						 | 
						
							
							
								
								Moving some background jobs into simple tasks
							
							
							
							
							
							
							
							- fetching activity data
- attachment prefetching
- using limiter to prevent overload 
							
						 | 
						
							2020-11-11 13:39:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f97f24b067
								
							
						 | 
						
							
							
								
								making credo happy and test fix
							
							
							
							
							
						 | 
						
							2020-11-11 10:48:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								efc27f6464
								
							
						 | 
						
							
							
								
								fix for adminFE
							
							
							
							
							
							
							
							- revert UserAllowPolicy description
- MRF descriptions order 
							
						 | 
						
							2020-11-11 10:10:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								485697d96c
								
							
						 | 
						
							
							
								
								config descriptions for custom MRF policies
							
							
							
							
							
						 | 
						
							2020-11-10 19:20:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a428800405
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 | 
						
							2020-09-17 22:22:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
							
							
								
							
							
								abf25e5d52
								
							
						 | 
						
							
							
								
								Create MRF.filter_pipeline to inject :object_data when present
							
							
							
							
							
						 | 
						
							2020-09-17 22:07:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a0f99ed35
								
							
						 | 
						
							
							
								
								KeywordPolicy: Still match when fields are absent
							
							
							
							
							
						 | 
						
							2020-09-17 22:07:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f155fb89f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
							
							
							
							
							
						 | 
						
							2020-09-15 20:29:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0b36621f1
								
							
						 | 
						
							
							
								
								Ensure we only apply NSFW Simple policy on parsable objects
							
							
							
							
							
						 | 
						
							2020-09-11 23:22:14 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0bda85857e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/instances/instance.ex 
							
						 | 
						
							2020-09-11 17:19:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9bf1065a06
								
							
						 | 
						
							
							
								
								schedule activity expiration in Oban
							
							
							
							
							
						 | 
						
							2020-09-10 21:50:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								148bc24435
								
							
						 | 
						
							
							
								
								[#2497] Removed Hackney-specific code
							
							
							
							
							
							
							
							(no longer needed due to adapter options unification). 
							
						 | 
						
							2020-09-10 11:54:10 +03:00 | 
						
						
							
							
							
								
							
							
						 |