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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								2d9f803dc6 
								
							 
						 
						
							
							
								
								Merge branch 'StealEmojiMRF_add_adminFE' into 'develop'  
							
							... 
							
							
							
							Add Admin-FE menu for StealEmojiPolicy
See merge request pleroma/pleroma!3512  
							
						 
						
							2021-08-14 18:40:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								773708cfe8 
								
							 
						 
						
							
							
								
								Merge branch 'builder-note' into 'develop'  
							
							... 
							
							
							
							CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
See merge request pleroma/pleroma!3511  
							
						 
						
							2021-08-14 18:32:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba6049aa81 
								
							 
						 
						
							
							
								
								Builder.note/1: return {:ok, map(), keyword()} like other Builder functions  
							
							
							
						 
						
							2021-08-14 11:24:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sam Therapy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b901b73057 
								
							 
						 
						
							
							
								
								Add Admin-FE menu for StealEmojiPolicy  
							
							
							
						 
						
							2021-08-14 11:08:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a2eacfc525 
								
							 
						 
						
							
							
								
								CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1  
							
							
							
						 
						
							2021-08-14 11:01:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								5049b4272e 
								
							 
						 
						
							
							
								
								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. 
							
						 
						
							2021-08-14 13:42:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01175ef498 
								
							 
						 
						
							
							
								
								Streamer: fix crash in MastodonAPI.StatusView  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508  
							
						 
						
							2021-08-13 17:58:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e117551169 
								
							 
						 
						
							
							
								
								AdminAPI: hotfix for nil report objects  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504  
							
						 
						
							2021-08-13 17:57:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb2d5879cc 
								
							 
						 
						
							
							
								
								maybe_notify_subscribers: Don't create notifications from ingested replies  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505  
							
						 
						
							2021-08-13 17:57:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e2aebd036 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_email require body params instead of query  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503  
							
						 
						
							2021-08-13 17:57:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3961422f85 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_password require body params instead of query  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503  
							
						 
						
							2021-08-13 17:56:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8baaa36a16 
								
							 
						 
						
							
							
								
								ObjectAgePolicy: Fix pattern matching on published  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500  
							
						 
						
							2021-08-13 17:56:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								34606d609d 
								
							 
						 
						
							
							
								
								fix: stream out Create Activity  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499  
							
						 
						
							2021-08-13 17:54:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								61ba54897e 
								
							 
						 
						
							
							
								
								Merge branch 'streamer-crash-fix' into 'develop'  
							
							... 
							
							
							
							Streamer crash fix
See merge request pleroma/pleroma!3508  
							
						 
						
							2021-08-13 15:42:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b7bbf42acd 
								
							 
						 
						
							
							
								
								Streamer: fix crash in MastodonAPI.StatusView  
							
							
							
						 
						
							2021-08-13 10:25:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3a7b54be4a 
								
							 
						 
						
							
							
								
								Merge branch 'nil-report-object-hotfix' into 'develop'  
							
							... 
							
							
							
							AdminAPI: hotfix for nil report objects
See merge request pleroma/pleroma!3504  
							
						 
						
							2021-08-11 20:30:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61d233921c 
								
							 
						 
						
							
							
								
								ObjectValidator.stringify_keys: filter out nil values  
							
							
							
						 
						
							2021-08-11 21:38:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3ca39ccf69 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/subscriptions-replies' into 'develop'  
							
							... 
							
							
							
							maybe_notify_subscribers: Normalize Object to check inReplyTo presence
Closes  #2732 
See merge request pleroma/pleroma!3505  
							
						 
						
							2021-08-11 18:50:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								436fac3bac 
								
							 
						 
						
							
							
								
								maybe_notify_subscribers: Don't create notifications from ingested messages  
							
							
							
						 
						
							2021-08-11 20:49:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7247c29653 
								
							 
						 
						
							
							
								
								AdminAPI: hotfix for nil report objects  
							
							
							
						 
						
							2021-08-11 09:42:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								7c1243178b 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/change_password' into 'develop'  
							
							... 
							
							
							
							TwitterAPI: Make change_password require body params instead of query
Closes  #2740 
See merge request pleroma/pleroma!3503  
							
						 
						
							2021-08-10 18:40:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								197cdebca9 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_email require body params instead of query  
							
							
							
						 
						
							2021-08-10 20:33:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								8679a57a71 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/object-age-create' into 'develop'  
							
							... 
							
							
							
							ObjectAgePolicy: Fix pattern matching on published
See merge request pleroma/pleroma!3500  
							
						 
						
							2021-08-10 18:16:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								09dcb2b522 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_password require body params instead of query  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740  
							
						 
						
							2021-08-10 20:01:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c64eae40a2 
								
							 
						 
						
							
							
								
								ObjectAgePolicy: Fix pattern matching on published  
							
							
							
						 
						
							2021-08-10 07:41:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								f4af74b0fc 
								
							 
						 
						
							
							
								
								Merge branch 'fix/streaming-api-for-create-activity' into 'develop'  
							
							... 
							
							
							
							fix: stream out Create Activity
Closes  #2691 
See merge request pleroma/pleroma!3499  
							
						 
						
							2021-08-09 19:10:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								901204df22 
								
							 
						 
						
							
							
								
								Merge branch 'poll-notification' into 'develop'  
							
							... 
							
							
							
							MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484  
							
						 
						
							2021-08-09 10:02:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee5def34da 
								
							 
						 
						
							
							
								
								fix: stream out Create Activity  
							
							
							
						 
						
							2021-08-09 18:37:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
							
							
								
							
							
								1841bd8383 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe  
							
							
							
						 
						
							2021-08-06 08:08:20 -06:00