floatingghost
								
							 
						 | 
						
							
							
							
							
								
							
							
								07a48b9293
								
							
						 | 
						
							
							
								
								giant massive dep upgrade and dialyxir-found error emporium (#371)
							
							
							
							
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/371 
							
						 | 
						
							2022-12-14 12:38:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Norm
								
							 
						 | 
						
							
							
							
							
								
							
							
								a6d85003fe
								
							
						 | 
						
							
							
								
								Remote interaction with posts (#198)
							
							
							
							
							
							
							
							Grabbed from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3587
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/198
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev> 
							
						 | 
						
							2022-09-08 10:19:22 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5da4f33bf1
								
							
						 | 
						
							
							
								
								Restore POST /auth/password
							
							
							
							
							
						 | 
						
							2021-12-03 00:10:57 -06: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1399b82f7b
								
							
						 | 
						
							
							
								
								Create WrapperAuthenticator and simplify Authenticator behaviour
							
							
							
							
							
							
							
							Speeds up recompilation by reducing compile-time cycles 
							
						 | 
						
							2021-06-07 18:18:39 -05: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								07fed0fda2
								
							
						 | 
						
							
							
								
								Switch to aliasing Router.Helpers instead of importing
							
							
							
							
							
						 | 
						
							2021-05-18 17:45:30 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								55bdfb075c
								
							
						 | 
						
							
							
								
								OpenAPI: TwitterAPI Util Controller
							
							
							
							
							
						 | 
						
							2021-03-15 06:47:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								65cd9cb638
								
							
						 | 
						
							
							
								
								TwitterAPI: Remove unused read notification function
							
							
							
							
							
						 | 
						
							2021-03-15 06:47:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebd7d1365b
								
							
						 | 
						
							
							
								
								Make setting user activation status explicit
							
							
							
							
							
						 | 
						
							2021-01-15 11:37:17 -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
								
							 
						 | 
						
							
							
							
							
								
							
							
								11e0d5f9ac
								
							
						 | 
						
							
							
								
								Password Resets: Don't accept tokens above a certain age.
							
							
							
							
							
							
							
							By default, one day 
							
						 | 
						
							2020-11-19 12:27:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9f4fe5485b
								
							
						 | 
						
							
							
								
								alias alphabetically order
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8c993c5f63
								
							
						 | 
						
							
							
								
								FederatingPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e
								
							
						 | 
						
							
							
								
								OAuthScopesPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								83ae45b000
								
							
						 | 
						
							
							
								
								Preload /api/pleroma/frontend_configurations, fixes #1932
							
							
							
							
							
						 | 
						
							2020-10-12 18:49:37 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b867f9d7ae
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/2099
							
							
							
							
							
						 | 
						
							2020-09-17 08:41:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7dd986a563
								
							
						 | 
						
							
							
								
								expire mfa tokens  through Oban
							
							
							
							
							
						 | 
						
							2020-09-10 16:01:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ae56aafb2
								
							
						 | 
						
							
							
								
								added import mutes
							
							
							
							
							
						 | 
						
							2020-09-06 21:42:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d23804f191
								
							
						 | 
						
							
							
								
								Use the Pleroma.Config alias
							
							
							
							
							
						 | 
						
							2020-07-09 10:53:51 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								67d92ac7b7
								
							
						 | 
						
							
							
								
								Remove /statusnet/config
							
							
							
							
							
						 | 
						
							2020-06-29 17:00:37 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8693e01799
								
							
						 | 
						
							
							
								
								Fix warning
							
							
							
							
							
						 | 
						
							2020-06-29 16:29:51 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4a306720e8
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into remove-twitter-api
							
							
							
							
							
						 | 
						
							2020-06-29 16:09:49 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b8180d7d1
								
							
						 | 
						
							
							
								
								add status_net/config
							
							
							
							
							
						 | 
						
							2020-06-03 16:34:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d15aa9d950
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'remove-twitter-api'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 
							
						 | 
						
							2020-05-16 17:07:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d0c567fbc
								
							
						 | 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
							
							
							
							
							
						 | 
						
							2020-05-07 08:14:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0062116e07
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex 
							
						 | 
						
							2020-04-22 18:51:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7771424a8
								
							
						 | 
						
							
							
								
								Fix blocks import
							
							
							
							
							
						 | 
						
							2020-04-22 19:27:28 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								88b82e5c3e
								
							
						 | 
						
							
							
								
								Fix follow import
							
							
							
							
							
						 | 
						
							2020-04-22 19:27:28 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f685cbd309
								
							
						 | 
						
							
							
								
								Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
							
							
							
							
							
						 | 
						
							2020-04-21 16:29:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								94a6590e3c
								
							
						 | 
						
							
							
								
								Partially restore /api/statusnet/config.json
							
							
							
							
							
						 | 
						
							2020-03-26 17:59:45 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3189c44a0c
								
							
						 | 
						
							
							
								
								Remove some TwitterAPI endpoints
							
							
							
							
							
						 | 
						
							2020-03-24 15:21:40 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								027714b519
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
							
							
							
							
							
						 | 
						
							2020-03-06 11:48:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								99a6c660a9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
							
							
							
							
							
						 | 
						
							2020-03-02 18:41:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07
							
							
							
							
							
							
							
							Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 | 
						
							2020-03-02 06:08:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0cf1d4fcd0
								
							
						 | 
						
							
							
								
								[#1560] Restricted AP- & OStatus-related routes for non-federating instances.
							
							
							
							
							
						 | 
						
							2020-02-22 19:48:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7bfb8ed14d
								
							
						 | 
						
							
							
								
								remote_follow_controller.ex: Redirect to the user page on success
							
							
							
							
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245 
							
						 | 
						
							2020-01-21 16:46:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f5b8fbeb3
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1354
							
							
							
							
							
						 | 
						
							2020-01-12 12:12:15 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								933dc12043
								
							
						 | 
						
							
							
								
								added code of mr#2067
							
							
							
							
							
						 | 
						
							2019-12-25 15:12:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9a44ec4a6
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
							
							
							
							
							
						 | 
						
							2019-12-22 17:58:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b84156013
								
							
						 | 
						
							
							
								
								moved remote follow in separate controller
							
							
							
							
							
						 | 
						
							2019-12-21 21:27:42 +03:00 | 
						
						
							
							
							
								
							
							
						 |