FloatingGhost
								
							 
						 | 
						
							
							
							
							
								
							
							
								2033d7d4fc
								
							
						 | 
						
							
							
								
								ensure extra info in fix_follow_state prints
							
							
							
							
							
						 | 
						
							2022-07-29 19:50:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									floatingghost
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c47992686
								
							
						 | 
						
							
							
								
								bugfix/follow-state (#104)
							
							
							
							
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104 
							
						 | 
						
							2022-07-23 18:58:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									floatingghost
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2a185c013
								
							
						 | 
						
							
							
								
								Documentation updates for stable release (#73)
							
							
							
							
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/73 
							
						 | 
						
							2022-07-15 12:27:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d901c337e
								
							
						 | 
						
							
							
								
								fix inbound federation
							
							
							
							
							
						 | 
						
							2021-12-14 13:58:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a6260f64e
								
							
						 | 
						
							
							
								
								re-enable deactivated check
							
							
							
							
							
						 | 
						
							2021-12-06 12:03:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca2bd8b72b
								
							
						 | 
						
							
							
								
								remove deactivated_users call
							
							
							
							
							
						 | 
						
							2021-12-06 10:18:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								bb54720778
								
							
						 | 
						
							
							
								
								add debug
							
							
							
							
							
						 | 
						
							2021-12-05 21:56:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								eb1c7d75f4
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2021-10-16 14:08:04 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								5f33699169
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2021-02-20 15:27:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f868dcf3ac
								
							
						 | 
						
							
							
								
								Ensure consistent behavior between pleroma.user activate/deactivate mix tasks
							
							
							
							
							
						 | 
						
							2021-01-25 10:48:28 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e8da27e14
								
							
						 | 
						
							
							
								
								Provide pleroma.user mix task for both activate and deactivate
							
							
							
							
							
						 | 
						
							2021-01-25 10:36:51 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								3aa25b008d
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2021-01-23 22:38:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								28581e03ad
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field
							
							
							
							
							
						 | 
						
							2021-01-18 14:58:21 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c0fe2ea9e
								
							
						 | 
						
							
							
								
								Remove toggle_confirmation; require explicit state change
							
							
							
							
							
							
							
							Also cosmetic changes to make the code clearer 
							
						 | 
						
							2021-01-15 13:11:51 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d36182c088
								
							
						 | 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed
							
							
							
							
							
						 | 
						
							2021-01-15 12:44:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebd7d1365b
								
							
						 | 
						
							
							
								
								Make setting user activation status explicit
							
							
							
							
							
						 | 
						
							2021-01-15 11:37:17 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								7516660753
								
							
						 | 
						
							
							
								
								Remove toggle_activation
							
							
							
							
							
						 | 
						
							2021-01-15 11:25:32 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								860b5c7804
								
							
						 | 
						
							
							
								
								Change user.deactivated field to user.is_active
							
							
							
							
							
						 | 
						
							2021-01-15 11:24:46 -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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								6cd0586ef9
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2020-12-29 13:16:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								80891e83d8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow
							
							
							
							
							
						 | 
						
							2020-12-17 09:05:36 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								50aadc3d5c
								
							
						 | 
						
							
							
								
								shell_yes?/1 was not showing the correct message and always defaults to yes which is dangerous
							
							
							
							
							
						 | 
						
							2020-12-04 11:49:56 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9546c1444c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow
							
							
							
							
							
						 | 
						
							2020-11-14 19:48:47 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								ddf36b096e
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2020-11-01 12:22:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								dc38dc8472
								
							
						 | 
						
							
							
								
								Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
							
							
							
							
							
						 | 
						
							2020-10-13 22:01:27 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								9968b7efed
								
							
						 | 
						
							
							
								
								Change user.locked field to user.is_locked
							
							
							
							
							
						 | 
						
							2020-10-13 09:31:13 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9938611f7
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2020-10-02 15:09:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b84ca4901
								
							
						 | 
						
							
							
								
								Simplify the value comparison
							
							
							
							
							
						 | 
						
							2020-09-25 10:37:59 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8af8eb5ce7
								
							
						 | 
						
							
							
								
								Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream
							
							
							
							
							
						 | 
						
							2020-09-23 12:32:47 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3a1f9c3bb
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/bulk-confirmation
							
							
							
							
							
						 | 
						
							2020-09-23 11:56:22 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								599f8bb152
								
							
						 | 
						
							
							
								
								RepoStreamer.chunk_stream ->  Repo.chunk_stream
							
							
							
							
							
						 | 
						
							2020-09-16 09:47:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								75b6fef25d
								
							
						 | 
						
							
							
								
								Add mix task for bulk [un]confirming the local instance users
							
							
							
							
							
						 | 
						
							2020-09-08 16:39:41 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								992deaa09b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2020-08-01 19:32:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								79707e879d
								
							
						 | 
						
							
							
								
								cleap up
							
							
							
							
							
						 | 
						
							2020-07-09 19:13:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d5fcec8315
								
							
						 | 
						
							
							
								
								fix for info after tag/untag user
							
							
							
							
							
						 | 
						
							2020-07-09 18:59:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								be48c1bafb
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2020-06-19 10:40:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								40970f6bb9
								
							
						 | 
						
							
							
								
								New mix task: pleroma.user reset_mfa <nickname>
							
							
							
							
							
						 | 
						
							2020-06-11 22:54:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								780ac9cedb
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2020-06-06 18:20:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9bc5e18ade
								
							
						 | 
						
							
							
								
								rename mix task: pleroma.user unsubscribe -> pleroma.user deactivate
							
							
							
							
							
						 | 
						
							2020-05-21 08:06:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								63477d07ad
								
							
						 | 
						
							
							
								
								unsubscribes of friends when user deactivated
							
							
							
							
							
						 | 
						
							2020-05-12 08:14:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								e18958a5d7
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2020-05-08 14:12:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								51f1dbf0a2
								
							
						 | 
						
							
							
								
								User deletion mix task: Use common pipeline.
							
							
							
							
							
						 | 
						
							2020-05-01 14:05:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								3508f698b9
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2020-03-03 11:16:59 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								22018adae6
								
							
						 | 
						
							
							
								
								Fix Dialyzer warnings
							
							
							
							
							
						 | 
						
							2020-02-25 18:34:56 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								97f67e0786
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2019-12-11 10:01:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								835ac2157c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 | 
						
							2019-12-10 08:55:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3cee00057
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2019-12-09 18:17:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								13926537b6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
							
							
							
							
							
						 | 
						
							2019-12-06 00:26:31 +03:00 | 
						
						
							
							
							
								
							
							
						 |