floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								54ed8760ff 
								
							 
						 
						
							
							
								
								Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' ( #85 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/85  
							
						 
						
							2022-07-18 13:08:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sfr 
								
							 
						 
						
							
							
							
							
								
							
							
								058bf96798 
								
							 
						 
						
							
							
								
								implement Move activities ( #45 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/45 
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com> 
							
						 
						
							2022-07-04 16:29:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
							
							
								
							
							
								72bdb0640f 
								
							 
						 
						
							
							
								
								Allow user to register with custom language  
							
							
							
						 
						
							2022-06-29 20:46:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								45b7d18871 
								
							 
						 
						
							
							
								
								update api spec for custom emoji reaction  
							
							
							
						 
						
							2022-06-25 15:45:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								746c9daa62 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-28 16:27:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								f734579965 
								
							 
						 
						
							
							
								
								MastoAPI: Add GET /api/v1/accounts/lookup  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-28 16:11:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f5c3d45120 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into apps-api-endpoint  
							
							
							
						 
						
							2021-12-27 18:01:25 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								de006443f0 
								
							 
						 
						
							
							
								
								MastoAPI: Profile directory  
							
							
							
						 
						
							2021-12-26 02:35:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								73609211a4 
								
							 
						 
						
							
							
								
								Merge branch 'account-notes' into 'develop'  
							
							... 
							
							
							
							MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540  
							
						 
						
							2021-12-25 01:41:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								b96a58ff28 
								
							 
						 
						
							
							
								
								Merge branch 'account-subscriptions' into 'develop'  
							
							... 
							
							
							
							MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555  
							
						 
						
							2021-12-25 01:34:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								9775955974 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into remote-follow-api  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-25 00:52:02 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								c96e52b88c 
								
							 
						 
						
							
							
								
								Add 'notifying' to relationship for compatibility with Mastodon  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 21:24:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								64a4c147b1 
								
							 
						 
						
							
							
								
								MastoAPI: accept notify param in follow request  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 19:36:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								cd5fb84b76 
								
							 
						 
						
							
							
								
								remote_interaction API endpoint  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-02 16:08:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c0484d571 
								
							 
						 
						
							
							
								
								AdminAPI: suggest a user through the API  
							
							
							
						 
						
							2021-11-26 15:19:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								588bcbac55 
								
							 
						 
						
							
							
								
								Apply 2 suggestion(s) to 2 file(s)  
							
							
							
						 
						
							2021-11-22 10:54:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								8e040e098b 
								
							 
						 
						
							
							
								
								Lint  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 18:17:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								106b5c2678 
								
							 
						 
						
							
							
								
								Fix a typo  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 17:36:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								40414bf177 
								
							 
						 
						
							
							
								
								MastoAPI: Add user notes on accounts  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 16:56:26 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3117c60997 
								
							 
						 
						
							
							
								
								Make suggested change for create_response  
							
							
							
						 
						
							2021-08-29 07:25:54 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d02cf7b0cd 
								
							 
						 
						
							
							
								
								Fix lint  
							
							
							
						 
						
							2021-08-28 18:17:09 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a14e1c0003 
								
							 
						 
						
							
							
								
								Move GET /api/v1/apps to GET /api/v1/pleroma/apps  
							
							
							
						 
						
							2021-08-28 18:02:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eab6291094 
								
							 
						 
						
							
							
								
								Require follow and read OAuth scopes for GET /api/v1/apps  
							
							
							
						 
						
							2021-08-28 11:13:25 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								baa8196fc9 
								
							 
						 
						
							
							
								
								Fix API spec, add app schema  
							
							
							
						 
						
							2021-08-26 11:55:43 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba6914f90a 
								
							 
						 
						
							
							
								
								Fix formatting in app_operation.ex  
							
							
							
						 
						
							2021-08-26 11:11:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6519732045 
								
							 
						 
						
							
							
								
								GET /api/v1/apps endpoint  
							
							
							
						 
						
							2021-08-25 21:01:04 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 (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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62bf6d67e3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes  
							
							
							
						 
						
							2021-07-18 11:49:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0114754db2 
								
							 
						 
						
							
							
								
								MastodonAPI: Support poll notification  
							
							
							
						 
						
							2021-07-17 22:19:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc6ab78a84 
								
							 
						 
						
							
							
								
								Add test on changing [:instance, :upload_limit]  
							
							
							
						 
						
							2021-06-22 12:25:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								0c56f9de0d 
								
							 
						 
						
							
							
								
								Merge branch 'tests/openapi-everywhere' into 'develop'  
							
							... 
							
							
							
							Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324  
							
						 
						
							2021-06-04 18:53:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								f9bedf5597 
								
							 
						 
						
							
							
								
								Apply lanodan's suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2021-04-20 21:08:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								42185d8750 
								
							 
						 
						
							
							
								
								Apply lanodan's suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2021-04-20 21:06:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								e104829c2f 
								
							 
						 
						
							
							
								
								Apply lanodan's suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2021-04-20 21:06:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								30b1d50938 
								
							 
						 
						
							
							
								
								Apply lanodan's suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2021-04-20 21:06:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c6dcd863e2 
								
							 
						 
						
							
							
								
								Apply rinpatch's suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2021-04-16 09:59:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ec1dbd922 
								
							 
						 
						
							
							
								
								Let pins federate  
							
							... 
							
							
							
							- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins 
							
						 
						
							2021-03-25 13:03:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								a2aa309496 
								
							 
						 
						
							
							
								
								Merge branch 'update_open_api_spex' into 'develop'  
							
							... 
							
							
							
							Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362  
							
						 
						
							2021-03-16 01:54:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								55bdfb075c 
								
							 
						 
						
							
							
								
								OpenAPI: TwitterAPI Util Controller  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4743847a1 
								
							 
						 
						
							
							
								
								OpenAPI: PleromaAPI UserImport Controller  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3123ecdd6e 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Media Controller  
							
							
							
						 
						
							2021-03-15 06:47:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7eecc3b61d 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Timeline Controller  
							
							
							
						 
						
							2021-03-15 06:47:06 +01:00