rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e365448f3 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-04-11 19:46:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								96ee0aadbf 
								
							 
						 
						
							
							
								
								Merge branch 'improving-test-coverage' into 'develop'  
							
							... 
							
							
							
							Tests for emoji mix task
See merge request pleroma/pleroma!2350  
							
						 
						
							2020-04-06 12:49:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								349b9d86dc 
								
							 
						 
						
							
							
								
								Merge branch 'remake-remodel-2' into 'develop'  
							
							... 
							
							
							
							Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315  
							
						 
						
							2020-04-06 11:59:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a43e055916 
								
							 
						 
						
							
							
								
								using another fn for file deletion  
							
							
							
						 
						
							2020-04-06 14:27:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b59ac37b2c 
								
							 
						 
						
							
							
								
								tests for emoji mix task  
							
							
							
						 
						
							2020-04-06 11:13:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								be9d18461a 
								
							 
						 
						
							
							
								
								FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).  
							
							
							
						 
						
							2020-03-28 18:49:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1c05f539aa 
								
							 
						 
						
							
							
								
								Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).  
							
							
							
						 
						
							2020-03-20 18:33:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3c2c32b460 
								
							 
						 
						
							
							
								
								Merge branch 'remake-remodel' into develop  
							
							
							
						 
						
							2020-03-19 18:00:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ec3719f539 
								
							 
						 
						
							
							
								
								Improved in-test config management functions.  
							
							
							
						 
						
							2020-03-18 20:30:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								f92c447bbc 
								
							 
						 
						
							
							
								
								Merge branch 'relay-list-change' into 'develop'  
							
							... 
							
							
							
							Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240  
							
						 
						
							2020-03-11 15:10:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5592db4757 
								
							 
						 
						
							
							
								
								Older copyright updates  
							
							
							
						 
						
							2020-03-03 16:46:45 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							
							
						 
						
							2020-03-03 16:44:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cc98d010ed 
								
							 
						 
						
							
							
								
								relay list shows hosts without accepted follow  
							
							
							
						 
						
							2020-03-02 09:27:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3eccdd15aa 
								
							 
						 
						
							
							
								
								compile fix  
							
							
							
						 
						
							2020-02-25 15:19:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								035c2c1415 
								
							 
						 
						
							
							
								
								Merge branch 'fix/instance-gen-custom-static' into 'develop'  
							
							... 
							
							
							
							instance.gen task: fix crash when using custom static directory
Closes  #1082 
See merge request pleroma/pleroma!2237  
							
						 
						
							2020-02-24 20:52:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e4fe0e8f7 
								
							 
						 
						
							
							
								
								instance.gen task: fix crash when using custom static directory  
							
							... 
							
							
							
							Closes  #1082  
						
							2020-02-24 23:42:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7ad5c51f23 
								
							 
						 
						
							
							
								
								Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope  
							
							
							
						 
						
							2020-02-24 21:46:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ff9fd4ca89 
								
							 
						 
						
							
							
								
								Fix the confusingly named and inverted logic of "no_attachment_links"  
							
							... 
							
							
							
							The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare. 
							
						 
						
							2020-02-11 15:39:19 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4eb935be78 
								
							 
						 
						
							
							
								
								Create pleroma.email mix task  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061  
							
						 
						
							2020-01-28 16:49:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								a182d400d7 
								
							 
						 
						
							
							
								
								Merge branch 'fix_for_migrate_to_db_test' into 'develop'  
							
							... 
							
							
							
							Fix for migrate to db test
See merge request pleroma/pleroma!2133  
							
						 
						
							2020-01-24 00:25:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4344c5d5b9 
								
							 
						 
						
							
							
								
								truncate config table on migrate to db task  
							
							
							
						 
						
							2020-01-23 17:23:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2bad25cf14 
								
							 
						 
						
							
							
								
								fix for migrate to db test  
							
							
							
						 
						
							2020-01-23 15:13:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								efb8ef5abe 
								
							 
						 
						
							
							
								
								releases support  
							
							
							
						 
						
							2020-01-18 17:14:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								60ba2339a2 
								
							 
						 
						
							
							
								
								saving to DB only added by user settings  
							
							
							
						 
						
							2020-01-17 11:45:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29155137fd 
								
							 
						 
						
							
							
								
								renaming  
							
							... 
							
							
							
							Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB 
							
						 
						
							2020-01-16 08:50:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59ba5c80b9 
								
							 
						 
						
							
							
								
								little cleanup  
							
							
							
						 
						
							2020-01-15 17:10:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d128ca208 
								
							 
						 
						
							
							
								
								dynamic_configuration renaming  
							
							... 
							
							
							
							and moving it from instance settings 
							
						 
						
							2020-01-10 19:34:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e412d2f152 
								
							 
						 
						
							
							
								
								test fixes after rebase  
							
							
							
						 
						
							2020-01-10 15:52:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fea734ca70 
								
							 
						 
						
							
							
								
								errors on endpoints  
							
							
							
						 
						
							2020-01-10 15:52:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0656816c77 
								
							 
						 
						
							
							
								
								tests for setttings without an explicit key  
							
							
							
						 
						
							2020-01-10 15:51:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2753285b77 
								
							 
						 
						
							
							
								
								config editing through database  
							
							
							
						 
						
							2020-01-10 15:51:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9dfaa0b832 
								
							 
						 
						
							
							
								
								fix loads config variable with large value from db  
							
							
							
						 
						
							2019-12-09 22:29:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1bd1f62af5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel  
							
							
							
						 
						
							2019-11-05 15:21:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4c1dd55c48 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships  
							
							
							
						 
						
							2019-10-24 14:55:36 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ea1a61b00 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/following-relationships  
							
							
							
						 
						
							2019-10-21 14:19:15 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6e4f52f8a2 
								
							 
						 
						
							
							
								
								Introduce new ingestion pipeline structure, implement internal Likes with it.  
							
							
							
						 
						
							2019-10-16 16:16:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82 
								
							 
						 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship  
							
							
							
						 
						
							2019-10-11 02:35:32 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d537bfd4e1 
								
							 
						 
						
							
							
								
								Add a task to re-count statuses for all users  
							
							
							
						 
						
							2019-10-09 13:11:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								48a82c4609 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/user' into 'develop'  
							
							... 
							
							
							
							Simplify updating user's `info`
See merge request pleroma/pleroma!1712  
							
						 
						
							2019-09-26 03:00:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								dd4263da5a 
								
							 
						 
						
							
							
								
								Apply suggestion to test/tasks/instance_test.exs  
							
							
							
						 
						
							2019-09-25 17:47:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1b2e4a0ae0 
								
							 
						 
						
							
							
								
								clears robot.txt after tests  
							
							
							
						 
						
							2019-09-25 13:27:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								209395c7e6 
								
							 
						 
						
							
							
								
								Add User.change_info/2 and User.update_info/2  
							
							
							
						 
						
							2019-09-24 19:50:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								447514dfa2 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed in 2019  
							
							... 
							
							
							
							Done via the following command:
git diff 1e6c102bfc 
							
						 
						
							2019-09-18 23:21:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e890ea7e82 
								
							 
						 
						
							
							
								
								[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2019-08-31 14:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								73bcbf4fa3 
								
							 
						 
						
							
							
								
								add tests  
							
							
							
						 
						
							2019-08-24 11:03:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								256ff09aa8 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 
						
							2019-08-22 20:59:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8340fe8fcc 
								
							 
						 
						
							
							
								
								Merge branch 'digest-template' into 'develop'  
							
							... 
							
							
							
							Improve digest email template
See merge request pleroma/pleroma!1565  
							
						 
						
							2019-08-20 12:55:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								75a5dd41ee 
								
							 
						 
						
							
							
								
								Add more tests for Database tasks and DigestEmailWorker  
							
							
							
						 
						
							2019-08-19 16:10:00 +00:00