Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								b0d2b53934 
								
							 
						 
						
							
							
								
								Merge branch 'manifest' into 'develop'  
							
							 
							
							... 
							
							
							
							Expose /manifest.json for PWA
Closes  #882 
See merge request pleroma/pleroma!3544  
							
						 
						
							2021-12-19 18:18:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								df5359aa72 
								
							 
						 
						
							
							
								
								Merge branch 'replies-count' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix replies count for remote replies
See merge request pleroma/pleroma!3541  
							
						 
						
							2021-12-19 17:36:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								d1510c98d7 
								
							 
						 
						
							
							
								
								Merge branch 'link-headers-chats' into 'develop'  
							
							 
							
							... 
							
							
							
							Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562  
							
						 
						
							2021-12-19 17:35:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								1ff9ffed83 
								
							 
						 
						
							
							
								
								Merge branch 'live-dashboard' into 'develop'  
							
							 
							
							... 
							
							
							
							Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566  
							
						 
						
							2021-12-19 17:35:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4f9cb1c1b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into manifest  
							
							 
							
							
							
						 
						
							2021-12-19 11:33:10 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								bd853199d9 
								
							 
						 
						
							
							
								
								Merge branch 'v2-suggestions' into 'develop'  
							
							 
							
							... 
							
							
							
							V2 suggestions
See merge request pleroma/pleroma!3547  
							
						 
						
							2021-12-19 17:31:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								7c1d804554 
								
							 
						 
						
							
							
								
								Merge branch 'fix-search-dos' into 'develop'  
							
							 
							
							... 
							
							
							
							Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563  
							
						 
						
							2021-12-19 17:30:52 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1b89fe3aa 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into live-dashboard  
							
							 
							
							
							
						 
						
							2021-12-15 19:05:36 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29d80b39f2 
								
							 
						 
						
							
							
								
								Add Phoenix LiveDashboard  
							
							 
							
							... 
							
							
							
							Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com> 
							
						 
						
							2021-12-15 19:05:27 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6eb7d69e60 
								
							 
						 
						
							
							
								
								Merge branch 'delete-account-fix' into 'develop'  
							
							 
							
							... 
							
							
							
							TwitterAPI: allow deleting one's own account with request body
Closes  #2799  and #2746 
See merge request pleroma/pleroma!3564  
							
						 
						
							2021-12-15 21:26:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8672ad6b00 
								
							 
						 
						
							
							
								
								TwitterAPI: allow deleting one's own account with request body  
							
							 
							
							
							
						 
						
							2021-12-13 17:07:29 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								108dfd1f87 
								
							 
						 
						
							
							
								
								Search: limit number of results  
							
							 
							
							
							
						 
						
							2021-12-12 22:50:07 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								dff435488d 
								
							 
						 
						
							
							
								
								Add link headers in ChatController.index2  
							
							 
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-12 17:43:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c96668a2c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions  
							
							 
							
							
							
						 
						
							2021-12-07 13:41:54 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f03d71ea6 
								
							 
						 
						
							
							
								
								AttachmentValidator: ingest width and height  
							
							 
							
							
							
						 
						
							2021-12-07 12:59:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								ca8c676867 
								
							 
						 
						
							
							
								
								Linting.  
							
							 
							
							
							
						 
						
							2021-12-07 12:12:23 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Finn Behrens 
								
							 
						 
						
							
							
							
							
								
							
							
								8af53101fb 
								
							 
						 
						
							
							
								
								move result into with guard  
							
							 
							
							
							
						 
						
							2021-12-07 09:18:53 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8286ceb465 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into password-reset  
							
							 
							
							
							
						 
						
							2021-12-03 00:11:38 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5da4f33bf1 
								
							 
						 
						
							
							
								
								Restore POST /auth/password  
							
							 
							
							
							
						 
						
							2021-12-03 00:10:57 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6519f59d91 
								
							 
						 
						
							
							
								
								v2 Suggestions: return is_suggested through the API  
							
							 
							
							
							
						 
						
							2021-11-26 23:10:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8dc1d2201a 
								
							 
						 
						
							
							
								
								Instance: add v2_suggestions feature  
							
							 
							
							
							
						 
						
							2021-11-26 22:45:49 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5a7547fbe 
								
							 
						 
						
							
							
								
								v2 Suggestions: also filter out users you follow  
							
							 
							
							
							
						 
						
							2021-11-26 21:46:08 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								437c1a5a52 
								
							 
						 
						
							
							
								
								v2 Suggestions: actually flter out dismissed suggestions  
							
							 
							
							
							
						 
						
							2021-11-26 21:09:37 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aee55b9a8b 
								
							 
						 
						
							
							
								
								v2 Suggestions: dismiss a suggestion  
							
							 
							
							
							
						 
						
							2021-11-26 20:19:29 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c0484d571 
								
							 
						 
						
							
							
								
								AdminAPI: suggest a user through the API  
							
							 
							
							
							
						 
						
							2021-11-26 15:19:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e28d990ecb 
								
							 
						 
						
							
							
								
								v2 Suggestions: don't skip visibility check  
							
							 
							
							
							
						 
						
							2021-11-26 14:46:29 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b17360cd7c 
								
							 
						 
						
							
							
								
								v2 Suggestions: rudimentary API response  
							
							 
							
							
							
						 
						
							2021-11-26 14:34:10 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e1caddc58 
								
							 
						 
						
							
							
								
								v2 Suggestions: return empty array  
							
							 
							
							
							
						 
						
							2021-11-25 14:57:36 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								720198d569 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into manifest  
							
							 
							
							
							
						 
						
							2021-11-24 17:58:58 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb9359335f 
								
							 
						 
						
							
							
								
								Expose /manifest.json for PWA  
							
							 
							
							
							
						 
						
							2021-11-24 17:50:55 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								d64d1b1d45 
								
							 
						 
						
							
							
								
								Fix replies count for remote replies  
							
							 
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-23 11:31:09 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								04aca335aa 
								
							 
						 
						
							
							
								
								nodeinfo: report activeMonth and activeHalfyear users fields  
							
							 
							
							
							
						 
						
							2021-11-15 17:01:30 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e2772d6bf1 
								
							 
						 
						
							
							
								
								Merge branch 'block-behavior' into 'develop'  
							
							 
							
							... 
							
							
							
							Configurable block visibility, fixes  #2123 
Closes  #2123 
See merge request pleroma/pleroma!3242  
							
						 
						
							2021-11-15 14:27:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6e3df11693 
								
							 
						 
						
							
							
								
								Merge branch 'instance-deletion' into 'develop'  
							
							 
							
							... 
							
							
							
							AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483  
							
						 
						
							2021-11-15 14:24:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bd77243981 
								
							 
						 
						
							
							
								
								Merge branch 'userfeed-fe-fallback' into 'develop'  
							
							 
							
							... 
							
							
							
							UserController: fall back to frontend when user isn't found
Closes  #2730 
See merge request pleroma/pleroma!3515  
							
						 
						
							2021-11-15 10:48:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								23e91ec8dd 
								
							 
						 
						
							
							
								
								activity_pub_controller: Fix misleading debug warning in post_inbox_fallback  
							
							 
							
							
							
						 
						
							2021-11-10 01:11:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								23161526d4 
								
							 
						 
						
							
							
								
								object_validators: Group common fields in CommonValidations  
							
							 
							
							... 
							
							
							
							Notes:
- QuestionValidator didn't have a :name field but that seems like a mistake
- `_fields` functions can't inherit others because of some Validators
- bto/bcc fields were absent in activities, also seems like a mistake
  (Well IIRC we don't or barely support bto/bcc anyway) 
							
						 
						
							2021-10-10 02:50:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a17910a6c6 
								
							 
						 
						
							
							
								
								CI: Bump lint stage to elixir-1.12  
							
							 
							
							... 
							
							
							
							Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format` 
							
						 
						
							2021-10-06 08:11:05 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								92a8ff59aa 
								
							 
						 
						
							
							
								
								Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'  
							
							 
							
							... 
							
							
							
							Allow users to remove their emails if instance does not need email to register
See merge request pleroma/pleroma!3522  
							
						 
						
							2021-10-06 05:44:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6b3842cf50 
								
							 
						 
						
							
							
								
								Merge branch 'remove/mastofe' into 'develop'  
							
							 
							
							... 
							
							
							
							Remove MastoFE from Pleroma, fixes  #2625 
Closes  #2625 
See merge request pleroma/pleroma!3392  
							
						 
						
							2021-09-07 16:41:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tusooa Zhu 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								198250dcef 
								
							 
						 
						
							
							
								
								Allow users to remove their emails if instance does not need email to register  
							
							 
							
							
							
						 
						
							2021-09-05 21:27:02 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								181282fb2e 
								
							 
						 
						
							
							
								
								Remove unused Logger  
							
							 
							
							
							
						 
						
							2021-09-01 14:56:48 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20084329ea 
								
							 
						 
						
							
							
								
								Selecting MRF policies didn't work as intended any more  
							
							 
							
							... 
							
							
							
							* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
    * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
    * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509  
							
						 
						
							2021-08-28 18:27:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								53b0dd4ecc 
								
							 
						 
						
							
							
								
								List available frontends also when no static/frontends folder is present yet  
							
							 
							
							... 
							
							
							
							* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510  
							
						 
						
							2021-08-28 18:23:49 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sam Therapy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								09c42ce13e 
								
							 
						 
						
							
							
								
								Add Admin-FE menu for StealEmojiPolicy  
							
							 
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512  
							
						 
						
							2021-08-28 18:21:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								bc62a35282 
								
							 
						 
						
							
							
								
								Merge branch 'features/ingestion-no-nil' into 'develop'  
							
							 
							
							... 
							
							
							
							ObjectValidator.stringify_keys: filter out nil values
See merge request pleroma/pleroma!3506  
							
						 
						
							2021-08-28 16:07:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6633ec816f 
								
							 
						 
						
							
							
								
								Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'  
							
							 
							
							... 
							
							
							
							Selecting MRF policies didn't work as intended any more
Closes admin-fe#198
See merge request pleroma/pleroma!3509  
							
						 
						
							2021-08-28 16:06:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b11dbbf403 
								
							 
						 
						
							
							
								
								UserController: fall back to frontend when user isn't found  
							
							 
							
							
							
						 
						
							2021-08-17 18:32:32 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								84ec0fbeaa 
								
							 
						 
						
							
							
								
								Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop'  
							
							 
							
							... 
							
							
							
							List available frontends also when no static/frontends folder is present yet
Closes admin-fe#201
See merge request pleroma/pleroma!3510  
							
						 
						
							2021-08-14 18:42:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								f9bafc17fb 
								
							 
						 
						
							
							
								
								List available frontends also when no static/frontends folder is present yet  
							
							 
							
							... 
							
							
							
							* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already 
							
						 
						
							2021-08-14 18:42:12 +00:00