Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								63739c5a58 
								
							 
						 
						
							
							
								
								Tests to validate client disclosure obeys user setting  
							
							 
							
							
							
						 
						
							2021-02-18 17:23:17 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d5ef02c7a7 
								
							 
						 
						
							
							
								
								Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default  
							
							 
							
							
							
						 
						
							2021-02-18 16:35:03 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bd3d0e8b57 
								
							 
						 
						
							
							
								
								Use a custom oauth token so we can predict and validate the client_name and website  
							
							 
							
							
							
						 
						
							2021-02-11 15:53:10 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								333ff527fd 
								
							 
						 
						
							
							
								
								Validate client application metadata is retained in the object  
							
							 
							
							
							
						 
						
							2021-02-11 15:07:21 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								008499f65a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2412-filters'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-03 14:23:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								c3dd860a02 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix for scheduled post with poll
Closes  #2449 
See merge request pleroma/pleroma!3294  
							
						 
						
							2021-02-03 14:22:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								f1f773f2c7 
								
							 
						 
						
							
							
								
								Merge branch 'email-stub-in-verify-credentials' into 'develop'  
							
							 
							
							... 
							
							
							
							Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286  
							
						 
						
							2021-02-02 18:35:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d289ad8579 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2411-mutes-api'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md 
							
						 
						
							2021-02-02 17:57:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								cd5ff7a943 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/2164-unify-api-arguments'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-02 17:11:38 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0dc68c157f 
								
							 
						 
						
							
							
								
								fix for scheduled post with poll  
							
							 
							
							
							
						 
						
							2021-02-01 18:22:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fdf1dfed56 
								
							 
						 
						
							
							
								
								only_remote -> remote renaming  
							
							 
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77f0a0af7d 
								
							 
						 
						
							
							
								
								more tests and update for docs and changelog  
							
							 
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2cb6dc5a3a 
								
							 
						 
						
							
							
								
								list timeline filtration by params  
							
							 
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6a72680e2 
								
							 
						 
						
							
							
								
								added only_media flag to home timeline  
							
							 
							
							
							
						 
						
							2021-02-01 14:11:11 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c369d2b930 
								
							 
						 
						
							
							
								
								support for with_relationships parameter  
							
							 
							
							... 
							
							
							
							in /api/v1/mutes and /api/v1/accounts/:id endpoints 
							
						 
						
							2021-01-29 08:41:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								60b4654038 
								
							 
						 
						
							
							
								
								Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).  
							
							 
							
							... 
							
							
							
							Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 . 
							
						 
						
							2021-01-28 19:49:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bddb01bded 
								
							 
						 
						
							
							
								
								Add tests  
							
							 
							
							
							
						 
						
							2021-01-27 18:20:07 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								793fc77b16 
								
							 
						 
						
							
							
								
								Add active user count  
							
							 
							
							
							
						 
						
							2021-01-27 18:20:06 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e854c35e65 
								
							 
						 
						
							
							
								
								Convert tests to all use clear_config instead of Pleroma.Config.put  
							
							 
							
							
							
						 
						
							2021-01-26 11:58:43 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								229acae6c3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into '2435-list-multiple-users'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-01-26 14:24:32 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								875fbaae35 
								
							 
						 
						
							
							
								
								support for expires_in/expires_at in filters  
							
							 
							
							
							
						 
						
							2021-01-26 08:27:45 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								250e202098 
								
							 
						 
						
							
							
								
								Merge branch 'fix/missing-own_votes' into 'develop'  
							
							 
							
							... 
							
							
							
							Include own_votes in the poll data
See merge request pleroma/pleroma!3274  
							
						 
						
							2021-01-26 00:55:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f3d64acbf 
								
							 
						 
						
							
							
								
								little refactor and tests  
							
							 
							
							... 
							
							
							
							for voted & own_votes fields in polls 
							
						 
						
							2021-01-25 19:46:36 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								537ba1c5e0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							 
							
							
							
						 
						
							2021-01-25 09:45:06 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6bfd497f4a 
								
							 
						 
						
							
							
								
								Include own_votes in the poll data  
							
							 
							
							
							
						 
						
							2021-01-22 09:47:59 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								80ccdb56f6 
								
							 
						 
						
							
							
								
								Make tag urls absolute  
							
							 
							
							
							
						 
						
							2021-01-21 16:49:19 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								958a7f6ed0 
								
							 
						 
						
							
							
								
								Merge branch 'fix/reblog-api' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix Reblog API
Closes  #2423 
See merge request pleroma/pleroma!3261  
							
						 
						
							2021-01-18 21:19:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							 
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								44a86951a3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/approval_pending_user_field  
							
							 
							
							
							
						 
						
							2021-01-18 12:05:05 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b79dce7bc 
								
							 
						 
						
							
							
								
								Fix Reblog API  
							
							 
							
							... 
							
							
							
							Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status. 
							
						 
						
							2021-01-18 20:15:57 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								bdfd72630f 
								
							 
						 
						
							
							
								
								ListController: Fix being unable to add / remove users.  
							
							 
							
							
							
						 
						
							2021-01-18 16:28:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d36182c088 
								
							 
						 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed  
							
							 
							
							
							
						 
						
							2021-01-15 12:44:41 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ebd7d1365b 
								
							 
						 
						
							
							
								
								Make setting user activation status explicit  
							
							 
							
							
							
						 
						
							2021-01-15 11:37:17 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							 
							
							
							
						 
						
							2021-01-15 11:24:46 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e59c28ed 
								
							 
						 
						
							
							
								
								Change user.approval_pending field to user.is_approved  
							
							 
							
							
							
						 
						
							2021-01-15 10:42:02 -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 
								
							 
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								e802b48d55 
								
							 
						 
						
							
							
								
								User: Use ObjectID type to validate also-known-as field  
							
							 
							
							
							
						 
						
							2021-01-05 13:10:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								95a0ae8a35 
								
							 
						 
						
							
							
								
								AccountControllerTest: Fix test logic  
							
							 
							
							
							
						 
						
							2021-01-05 11:48:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0e93775ed0 
								
							 
						 
						
							
							
								
								Add test to validate profile pagination works with keyset  
							
							 
							
							
							
						 
						
							2021-01-04 11:04:58 -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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cbce880076 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases  
							
							 
							
							
							
						 
						
							2020-12-30 17:10:02 -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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								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