Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fc9cd0974 
								
							 
						 
						
							
							
								
								Video: Handle peertube videos only stashing attachments in x-mpegURL  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535  
							
						 
						
							2021-02-21 23:41:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a853218701 
								
							 
						 
						
							
							
								
								Merge branch 'features/ap_id-c2s-authentication' into 'develop'  
							
							... 
							
							
							
							activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295  
							
						 
						
							2021-02-09 19:29:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								a5bee1bf35 
								
							 
						 
						
							
							
								
								Merge branch 'feat/mrf-noemptypolicy' into 'develop'  
							
							... 
							
							
							
							MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
See merge request pleroma/pleroma!3309  
							
						 
						
							2021-02-08 21:49:20 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c7b3b20d8 
								
							 
						 
						
							
							
								
								activity_pub_controller: Add authentication to object & activity endpoints  
							
							
							
						 
						
							2021-02-08 20:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								76f732766b 
								
							 
						 
						
							
							
								
								Exclude reporter from receiving notifications from their own reports.  
							
							... 
							
							
							
							Currently only works if the reporting actor is an admin, but if we include
moderators with those who receive notification reports it will work for them. 
							
						 
						
							2021-02-03 12:32:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								8d2ea95402 
								
							 
						 
						
							
							
								
								Merge branch 'feature/2438-users-posts-total-count' into 'develop'  
							
							... 
							
							
							
							Feature/2438 users/instances posts total count
Closes  #2438 
See merge request pleroma/pleroma!3270  
							
						 
						
							2021-02-03 14:21:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fdf1dfed56 
								
							 
						 
						
							
							
								
								only_remote -> remote renaming  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3110c46f3 
								
							 
						 
						
							
							
								
								expanding filtration for home timeline  
							
							... 
							
							
							
							added local & remote statuses filtration for home timeline 
							
						 
						
							2021-02-01 14:11:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4158e8bf0 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the instance adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6806c03e85 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the user statuses adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								537ba1c5e0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-25 09:45:06 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d48144a9d 
								
							 
						 
						
							
							
								
								use proper naming  
							
							... 
							
							
							
							for MediaProxyWarmingPolicy in ConcurrentLimiter 
							
						 
						
							2021-01-21 09:50:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							
							
						 
						
							2021-01-15 11:24:46 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								cf0eb0c1c5 
								
							 
						 
						
							
							
								
								Merge branch 'object-normalize-refactor' into 'develop'  
							
							... 
							
							
							
							Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229  
							
						 
						
							2021-01-07 11:09:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								64116f63d9 
								
							 
						 
						
							
							
								
								URI.encode custom emojis  
							
							
							
						 
						
							2021-01-05 12:29:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								20a269ed69 
								
							 
						 
						
							
							
								
								Merge branch 'fix/pagination-regression' into 'develop'  
							
							... 
							
							
							
							Do not try to guess which pagination we need by the existence of an :offset param.
Closes  #2399 
See merge request pleroma/pleroma!3230  
							
						 
						
							2021-01-05 12:40:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0e6cff583 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases  
							
							
							
						 
						
							2021-01-05 12:42:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d44850d7a5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor  
							
							
							
						 
						
							2021-01-05 10:48:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8e5904daa5 
								
							 
						 
						
							
							
								
								SideEffects.DeleteTest: asyncify.  
							
							... 
							
							
							
							Replace Mock with Mox, mock out Logger. 
							
						 
						
							2021-01-04 18:40:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								83f27282ba 
								
							 
						 
						
							
							
								
								Do not try to guess which pagination we need by the existence of an :offset param.  
							
							... 
							
							
							
							Require explicit request to get offset pagination. 
							
						 
						
							2021-01-04 10:13:17 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2aa60e7592 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-31 09:58:43 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11d40e92b7 
								
							 
						 
						
							
							
								
								Render AKAs in Actor endpoints  
							
							
							
						 
						
							2020-12-30 18:53:27 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2597b028f7 
								
							 
						 
						
							
							
								
								Make pagination type conditional  
							
							
							
						 
						
							2020-12-30 16:37:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								085d4e6cfc 
								
							 
						 
						
							
							
								
								Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset  
							
							
							
						 
						
							2020-12-30 16:10:10 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5db1e6c8d3 
								
							 
						 
						
							
							
								
								Pipeline test: Switch from Mock to Mox.  
							
							... 
							
							
							
							Speeds up the test and makes it possible to run async. 
							
						 
						
							2020-12-21 16:35:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								713612c377 
								
							 
						 
						
							
							
								
								Cachex: Make caching provider switchable at runtime.  
							
							... 
							
							
							
							Defaults to Cachex. 
							
						 
						
							2020-12-18 17:44:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35ba48494f 
								
							 
						 
						
							
							
								
								Stream follow updates  
							
							
							
						 
						
							2020-12-02 00:18:58 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ecd1ef8cb5 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2302-report-duplicates' into 'develop'  
							
							... 
							
							
							
							Fix for forwarded reports
Closes  #2303  and #2302 
See merge request pleroma/pleroma!3146  
							
						 
						
							2020-11-20 18:40:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								79a509ee61 
								
							 
						 
						
							
							
								
								Merge branch '2301-users-search-discoverability-fix' into 'develop'  
							
							... 
							
							
							
							[#2301 ] Proper handling of User.is_discoverable
Closes  #2301 
See merge request pleroma/pleroma!3162  
							
						 
						
							2020-11-19 20:33:52 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e164c37139 
								
							 
						 
						
							
							
								
								[ #2301 ] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.  
							
							
							
						 
						
							2020-11-19 19:30:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8a8c154b4e 
								
							 
						 
						
							
							
								
								test fixes  
							
							
							
						 
						
							2020-11-19 09:58:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be0b874e1d 
								
							 
						 
						
							
							
								
								fix for mastodon forwarded reports  
							
							
							
						 
						
							2020-11-19 09:53:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2bf6b1f7e 
								
							 
						 
						
							
							
								
								fix for forwarded reports  
							
							
							
						 
						
							2020-11-19 09:53:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d33b9e7b33 
								
							 
						 
						
							
							
								
								Merge branch 'remove/fedsockets' into 'develop'  
							
							... 
							
							
							
							Remove FedSockets
See merge request pleroma/pleroma!3155  
							
						 
						
							2020-11-17 14:58:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2c55f7d7cb 
								
							 
						 
						
							
							
								
								Remove FedSockets  
							
							... 
							
							
							
							Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
 ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
 are just too overkill for what they were trying to accomplish, which is
 reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
 logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262  for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
 would approve the descision to remove them as well,
therefore I am submitting this patch. 
							
						 
						
							2020-11-17 17:28:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fec1ed802e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope  
							
							
							
						 
						
							2020-11-17 15:01:38 +01:00