Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b1e1db82bc 
								
							 
						 
						
							
							
								
								Store application details in the object under the generator key, not application key  
							
							 
							
							
							
						 
						
							2021-03-01 11:29:10 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								050c4b1f14 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'  
							
							 
							
							... 
							
							
							
							Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes  #2372  and #2535 
See merge request pleroma/pleroma!3336  
							
						 
						
							2021-02-28 16:18:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e6a14e1cd1 
								
							 
						 
						
							
							
								
								Merge branch 'feat/client_app_details' into 'develop'  
							
							 
							
							... 
							
							
							
							Support application field
See merge request pleroma/pleroma!3311  
							
						 
						
							2021-02-28 16:17:34 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d35b6254b4 
								
							 
						 
						
							
							
								
								Store the client application data in ActivityStreams format  
							
							 
							
							
							
						 
						
							2021-02-26 18:14:57 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fb2a8e7ccd 
								
							 
						 
						
							
							
								
								Additional validation so we don't get caught off guard with a nil response  
							
							 
							
							... 
							
							
							
							if CommonAPI ever prevents us from injecting this data 
							
						 
						
							2021-02-12 13:15:33 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3554a65f45 
								
							 
						 
						
							
							
								
								Inject fake application metadata and validate it is stripped by transmogrifier  
							
							 
							
							
							
						 
						
							2021-02-12 13:05:12 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								76414ad277 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/answer-outbox' into 'develop'  
							
							 
							
							... 
							
							
							
							Add test for Answer presence into an authenticated /outbox
See merge request pleroma/pleroma!3269  
							
						 
						
							2021-02-12 08:48:51 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fb25231fbe 
								
							 
						 
						
							
							
								
								Add test for Answer presence into an authenticated /outbox  
							
							 
							
							
							
						 
						
							2021-02-03 12:07:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9272cef500 
								
							 
						 
						
							
							
								
								Switch to a build of Majic that does not try to fix extensions by default  
							
							 
							
							
							
						 
						
							2021-01-28 14:03:29 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e854c35e65 
								
							 
						 
						
							
							
								
								Convert tests to all use clear_config instead of Pleroma.Config.put  
							
							 
							
							
							
						 
						
							2021-01-26 11:58:43 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								537ba1c5e0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							 
							
							
							
						 
						
							2021-01-25 09:45:06 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc4cb6ebd 
								
							 
						 
						
							
							
								
								Special handling for unconfirmed users based on instance config no longer needed.  
							
							 
							
							
							
						 
						
							2021-01-20 11:30:29 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							 
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d36182c088 
								
							 
						 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed  
							
							 
							
							
							
						 
						
							2021-01-15 12:44:41 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								5822338f3a 
								
							 
						 
						
							
							
								
								Merge branch 'guppe-example' into 'develop'  
							
							 
							
							... 
							
							
							
							ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243  
							
						 
						
							2021-01-08 15:55:48 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								bd788c0939 
								
							 
						 
						
							
							
								
								ActivtityPub Test: Add example for guppe actor  
							
							 
							
							
							
						 
						
							2021-01-07 16:20:30 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								f9090e00e6 
								
							 
						 
						
							
							
								
								Add test to validate URLs to custom emojis are properly encoded  
							
							 
							
							
							
						 
						
							2021-01-05 13:58:49 -06: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11d40e92b7 
								
							 
						 
						
							
							
								
								Render AKAs in Actor endpoints  
							
							 
							
							
							
						 
						
							2020-12-30 18:53:27 -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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bfb041658 
								
							 
						 
						
							
							
								
								insreasing test coverage for StealEmojiPolicy  
							
							 
							
							
							
						 
						
							2020-12-27 21:53:30 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								9d5ce82221 
								
							 
						 
						
							
							
								
								Test: More async/sync tweaks.  
							
							 
							
							
							
						 
						
							2020-12-21 15:05:56 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9ba60f70d2 
								
							 
						 
						
							
							
								
								Tests: Make as many tests as possible async.  
							
							 
							
							... 
							
							
							
							In general, tests that match these criteria can be made async:
- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer. 
							
						 
						
							2020-12-21 12:21:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b4b68b71fc 
								
							 
						 
						
							
							
								
								Tests: Remove unneeded explicit cachex use.  
							
							 
							
							... 
							
							
							
							Only use cachex when we're actually testing it. 
							
						 
						
							2020-12-18 13:18:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1436a2fa2d 
								
							 
						 
						
							
							
								
								Merge branch 'stream-follow-updates' into 'develop'  
							
							 
							
							... 
							
							
							
							Stream follow updates
Closes  #2299 
See merge request pleroma/pleroma!3183  
							
						 
						
							2020-12-09 15:52:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5d15486098 
								
							 
						 
						
							
							
								
								SideEffects: fix test  
							
							 
							
							
							
						 
						
							2020-12-02 14:48:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35ba48494f 
								
							 
						 
						
							
							
								
								Stream follow updates  
							
							 
							
							
							
						 
						
							2020-12-02 00:18:58 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3283d0805f 
								
							 
						 
						
							
							
								
								Use Jason instead of Poison in tests  
							
							 
							
							
							
						 
						
							2020-11-23 13:28:55 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46dab37351 
								
							 
						 
						
							
							
								
								little fix  
							
							 
							
							
							
						 
						
							2020-11-19 15:29:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4aaffe3a10 
								
							 
						 
						
							
							
								
								log capture  
							
							 
							
							
							
						 
						
							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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a840aefda8 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2020-11-19 09:53:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2bf6b1f7e 
								
							 
						 
						
							
							
								
								fix for forwarded reports  
							
							 
							
							
							
						 
						
							2020-11-19 09:53:13 +03:00