Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6d48144a9d
								
							
						 | 
						
							
							
								
								use proper naming
							
							
							
							
							
							
							
							for MediaProxyWarmingPolicy in ConcurrentLimiter 
							
						 | 
						
							2021-01-21 09:50:18 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ee99dafcc
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into media-preview-proxy
							
							
							
							
							
						 | 
						
							2020-09-09 11:11:36 -05: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								88a6ee4a59
								
							
						 | 
						
							
							
								
								[#2497] Func defs grouping fix.
							
							
							
							
							
						 | 
						
							2020-09-05 20:23:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f170d47130
								
							
						 | 
						
							
							
								
								[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
							
							
							
							
							
							
							
							Removed :preview pool in favor of existing :media one. Misc. refactoring. 
							
						 | 
						
							2020-09-05 20:19:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e6eb22b4a
								
							
						 | 
						
							
							
								
								Try to warm the cache with the preview image if preview proxy enabled
							
							
							
							
							
						 | 
						
							2020-08-21 12:19:35 -05: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 | 
						
						
							
							
							
								
							
							
						 |