Oneric 
								
							 
						 
						
							
							
							
							
								
							
							
								376f6b15ca 
								
							 
						 
						
							
							
								
								Add ability to auto-approve followbacks  
							
							 
							
							... 
							
							
							
							Resolves: https://akkoma.dev/AkkomaGang/akkoma/issues/148  
							
						 
						
							2024-02-13 15:42:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								64e233ca20 
								
							 
						 
						
							
							
								
								Tag Mock-tests as "mocked" and run them seperately  
							
							 
							
							
							
						 
						
							2023-08-04 12:50:50 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								98cb255d12 
								
							 
						 
						
							
							
								
								Support elixir1.15  
							
							 
							
							... 
							
							
							
							OTP builds to 1.15
Changelog entry
Ensure policies are fully loaded
Fix :warn
use main branch for linkify
Fix warn in tests
Migrations for phoenix 1.17
Revert "Migrations for phoenix 1.17"
This reverts commit 6a3b2f15b74ea5e33150529385215b7a531f3999.
Oban upgrade
Add default empty whitelist
mix format
limit test to amd64
OTP 26 tests for 1.15
use OTP_VERSION tag
baka
just 1.15
Massive deps update
Update locale, deps
Mix format
shell????
multiline???
?
max cases 1
use assert_recieve
don't put_env in async tests
don't async conn/fs tests
mix format
FIx some uploader issues
Fix tests 
							
						 
						
							2023-08-03 17:44:09 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tusooa 
								
							 
						 
						
							
							
							
							
								
							
							
								fee6e2aac4 
								
							 
						 
						
							
							
								
								Fix deleting banned users' statuses  
							
							 
							
							
							
						 
						
							2023-06-14 22:45:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								aeb68a0ad1 
								
							 
						 
						
							
							
								
								paginate follow requests ( #460 )  
							
							 
							
							... 
							
							
							
							matches https://docs.joinmastodon.org/methods/follow_requests/#get  mostly
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/460  
							
						 
						
							2023-02-04 20:51:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								2641dcdd15 
								
							 
						 
						
							
							
								
								Post editing ( #202 )  
							
							 
							
							... 
							
							
							
							Rebased from #103 
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/202  
							
						 
						
							2022-09-06 19:24:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								8e4de118c1 
								
							 
						 
						
							
							
								
								Don't persist local undone follow ( #194 )  
							
							 
							
							... 
							
							
							
							same deal but backwards this time
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/194  
							
						 
						
							2022-08-31 18:00:36 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								0f132b802d 
								
							 
						 
						
							
							
								
								purge chat and shout endpoints  
							
							 
							
							
							
						 
						
							2022-07-21 11:29:28 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								cf0ad02ea9 
								
							 
						 
						
							
							
								
								Remove scrobbling support  
							
							 
							
							
							
						 
						
							2022-07-19 15:07:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								5b4d77eaa7 
								
							 
						 
						
							
							
								
								maintenance: dependency upgrade ( #81 )  
							
							 
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/81  
							
						 
						
							2022-07-18 00:56:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								829ae13572 
								
							 
						 
						
							
							
								
								ensure tests pass  
							
							 
							
							
							
						 
						
							2022-06-14 16:24:03 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								0ddf492c5d 
								
							 
						 
						
							
							
								
								Merge branch 'cycles-base-url' into 'develop'  
							
							 
							
							... 
							
							
							
							Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432  
							
						 
						
							2021-06-01 16:15:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c4b4258374 
								
							 
						 
						
							
							
								
								Merge branch 'features/validators-note' into 'develop'  
							
							 
							
							... 
							
							
							
							Pipeline Ingestion: Note
Closes  #290 
See merge request pleroma/pleroma!2984  
							
						 
						
							2021-06-01 01:51:38 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f2134e605b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-base-url  
							
							 
							
							
							
						 
						
							2021-05-31 16:49:46 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0  
							
							 
							
							... 
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 
						
							2021-05-31 16:48:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52fc59f125 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into earmark  
							
							 
							
							
							
						 
						
							2021-04-30 13:17:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ef4659b37 
								
							 
						 
						
							
							
								
								test/pleroma/web/common_api_test.exs: Strip : around emoji key-name  
							
							 
							
							
							
						 
						
							2021-04-05 19:25:55 +02: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d3660b24d3 
								
							 
						 
						
							
							
								
								Copy emoji in the subject from parent post  
							
							 
							
							... 
							
							
							
							Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post. 
							
						 
						
							2021-03-22 21:20:47 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1b49b8efe5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2021-01-31 20:38:58 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e854c35e65 
								
							 
						 
						
							
							
								
								Convert tests to all use clear_config instead of Pleroma.Config.put  
							
							 
							
							
							
						 
						
							2021-01-26 11:58:43 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								694d98be55 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-01-25 21:24:07 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								537ba1c5e0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							 
							
							
							
						 
						
							2021-01-25 09:45:06 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2634a16b4c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2021-01-21 20:20:35 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51d5951c02 
								
							 
						 
						
							
							
								
								Test that only author can reblog a private status  
							
							 
							
							
							
						 
						
							2021-01-18 21:01:00 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b79dce7bc 
								
							 
						 
						
							
							
								
								Fix Reblog API  
							
							 
							
							... 
							
							
							
							Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status. 
							
						 
						
							2021-01-18 20:15:57 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							 
							
							
							
						 
						
							2021-01-15 11:24:46 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e350898828 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-01-13 22:11:16 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								cf0eb0c1c5 
								
							 
						 
						
							
							
								
								Merge branch 'object-normalize-refactor' into 'develop'  
							
							 
							
							... 
							
							
							
							Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229  
							
						 
						
							2021-01-07 11:09:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								48cd336a72 
								
							 
						 
						
							
							
								
								allow external emoji  
							
							 
							
							
							
						 
						
							2021-01-06 10:13:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1e7e4d379 
								
							 
						 
						
							
							
								
								Object: Rework how Object.normalize works  
							
							 
							
							... 
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 
						
							2021-01-04 13:38:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3966add048 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !2824  
							
						 
						
							2020-12-28 12:02:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acb03d591b 
								
							 
						 
						
							
							
								
								Insert text representation of hashtags into object["hashtags"]  
							
							 
							
							... 
							
							
							
							Includes a new mix task: pleroma.database fill_old_hashtags 
							
						 
						
							2020-12-22 05:15:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ee221277b0 
								
							 
						 
						
							
							
								
								Encapsulation of tags / hashtags fetching from objects.  
							
							 
							
							
							
						 
						
							2020-12-21 22:54:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								f8c93246d6 
								
							 
						 
						
							
							
								
								Refactor Earmark code, fix tests  
							
							 
							
							
							
						 
						
							2020-12-11 17:22:42 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fec1ed802e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope  
							
							 
							
							
							
						 
						
							2020-11-17 15:01:38 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0118ccb53c 
								
							 
						 
						
							
							
								
								Add local visibility  
							
							 
							
							
							
						 
						
							2020-11-11 18:54:01 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dd2b3a8da9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes  
							
							 
							
							
							
						 
						
							2020-11-04 16:51:42 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								1bfd8528bb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/local-only-scope'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-10-27 18:59:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d6907e6e0c 
								
							 
						 
						
							
							
								
								Merge branch 'chore/elixir-1.11' into 'develop'  
							
							 
							
							... 
							
							
							
							Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059  
							
						 
						
							2020-10-22 20:33:52 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8d251096fe 
								
							 
						 
						
							
							
								
								SideEffects: Correctly handle chat messages sent to yourself  
							
							 
							
							
							
						 
						
							2020-10-22 12:22:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9ea31b373f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11  
							
							 
							
							
							
						 
						
							2020-10-17 17:53:47 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f79bbbc31 
								
							 
						 
						
							
							
								
								Add local-only statuses  
							
							 
							
							
							
						 
						
							2020-10-15 18:37:44 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3985c1b450 
								
							 
						 
						
							
							
								
								Fix warnings  
							
							 
							
							
							
						 
						
							2020-10-15 16:54:59 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2013705690 
								
							 
						 
						
							
							
								
								Merge branch 'feature/gen-magic' into 'develop'  
							
							 
							
							... 
							
							
							
							Use libmagic via majic
Closes  #1736 
See merge request pleroma/pleroma!2534  
							
						 
						
							2020-10-14 17:31:45 +00:00