Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d0b4a49f16 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into a1batross-develop-patch-62810  
							
							
							
						 
						
							2021-02-02 12:18:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c118bdb8f0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into a1batross-develop-patch-62810  
							
							
							
						 
						
							2021-02-02 12:16:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d289ad8579 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2411-mutes-api'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md 
							
						 
						
							2021-02-02 17:57:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6a2d3fb9a3 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'  
							
							... 
							
							
							
							fix and delete purge activities duplicates
Closes  #2473 
See merge request pleroma/pleroma!3285  
							
						 
						
							2021-02-02 17:22:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								cd5ff7a943 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/2164-unify-api-arguments'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-02 17:11:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2012800ed1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/attachment-cleanup' into 'develop'  
							
							... 
							
							
							
							Only run attachment cleanup if enabled
See merge request pleroma/pleroma!3288  
							
						 
						
							2021-02-02 17:08:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								69c560cfba 
								
							 
						 
						
							
							
								
								Merge branch 'active-user-count' into 'develop'  
							
							... 
							
							
							
							Monthly Active Users
Closes  #2332 
See merge request pleroma/pleroma!3283  
							
						 
						
							2021-02-02 17:07:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0dc68c157f 
								
							 
						 
						
							
							
								
								fix for scheduled post with poll  
							
							
							
						 
						
							2021-02-01 18:22:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fdf1dfed56 
								
							 
						 
						
							
							
								
								only_remote -> remote renaming  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba512cbea4 
								
							 
						 
						
							
							
								
								/api/v1/accounts/:id/statuses docs update 
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77f0a0af7d 
								
							 
						 
						
							
							
								
								more tests and update for docs and changelog  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2cb6dc5a3a 
								
							 
						 
						
							
							
								
								list timeline filtration by params  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6a72680e2 
								
							 
						 
						
							
							
								
								added only_media flag to home timeline  
							
							
							
						 
						
							2021-02-01 14:11:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3110c46f3 
								
							 
						 
						
							
							
								
								expanding filtration for home timeline  
							
							... 
							
							
							
							added local & remote statuses filtration for home timeline 
							
						 
						
							2021-02-01 14:11:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf4765af40 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.  
							
							
							
						 
						
							2021-01-31 23:06:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10207f840c 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub: temporarily reverted to previous hashtags filtering implementation due to blank results issue.  
							
							
							
						 
						
							2021-01-31 22:36:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								108e90b18e 
								
							 
						 
						
							
							
								
								[ #3213 ] Explicitly defined PKs in hashtags_objects and data_migration_failed_ids. Added "pleroma.database rollback" task to revert a single migration.  
							
							
							
						 
						
							2021-01-31 22:03:59 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6fd4163ab6 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.  
							
							
							
						 
						
							2021-01-31 20:37:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9948ff3356 
								
							 
						 
						
							
							
								
								[ #3213 ] Added HashtagsCleanupWorker periodic job.  
							
							
							
						 
						
							2021-01-31 18:24:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b794dae98a 
								
							 
						 
						
							
							
								
								like this  
							
							
							
						 
						
							2021-01-29 15:55:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c369d2b930 
								
							 
						 
						
							
							
								
								support for with_relationships parameter  
							
							... 
							
							
							
							in /api/v1/mutes and /api/v1/accounts/:id endpoints 
							
						 
						
							2021-01-29 08:41:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								380d0cce6b 
								
							 
						 
						
							
							
								
								[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.  
							
							
							
						 
						
							2021-01-29 00:17:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5fcab23aa3 
								
							 
						 
						
							
							
								
								Improve error message for ConfigDB  
							
							
							
						 
						
							2021-01-28 14:59:23 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								13d79c281f 
								
							 
						 
						
							
							
								
								Make attachment cleanup jobs a noop if the setting is disabled.  
							
							
							
						 
						
							2021-01-28 14:42:20 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a51d903e0c 
								
							 
						 
						
							
							
								
								Make sure active_user_count/1 counts only local users  
							
							
							
						 
						
							2021-01-28 22:23:10 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								60b4654038 
								
							 
						 
						
							
							
								
								Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).  
							
							... 
							
							
							
							Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 . 
							
						 
						
							2021-01-28 19:49:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c987c7670 
								
							 
						 
						
							
							
								
								fix and delete purge activities duplicates  
							
							
							
						 
						
							2021-01-28 16:57:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39335d4251 
								
							 
						 
						
							
							
								
								fix for unique oban worker option  
							
							
							
						 
						
							2021-01-28 16:57:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								aaceb042c5 
								
							 
						 
						
							
							
								
								fix format  
							
							
							
						 
						
							2021-01-28 10:20:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								1547a2fda4 
								
							 
						 
						
							
							
								
								mix: instance: ensure all needed folders are created before generating config  
							
							
							
						 
						
							2021-01-28 09:39:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35cad9793d 
								
							 
						 
						
							
							
								
								cache headers for emoji and images  
							
							
							
						 
						
							2021-01-27 18:49:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								793fc77b16 
								
							 
						 
						
							
							
								
								Add active user count  
							
							
							
						 
						
							2021-01-27 18:20:06 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4158e8bf0 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the instance adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6806c03e85 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the user statuses adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d7af0294e6 
								
							 
						 
						
							
							
								
								Merge branch 'service-worker-allowed-header' into 'develop'  
							
							... 
							
							
							
							Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247  
							
						 
						
							2021-01-26 18:14:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								229acae6c3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into '2435-list-multiple-users'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-01-26 14:24:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								875fbaae35 
								
							 
						 
						
							
							
								
								support for expires_in/expires_at in filters  
							
							
							
						 
						
							2021-01-26 08:27:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								250e202098 
								
							 
						 
						
							
							
								
								Merge branch 'fix/missing-own_votes' into 'develop'  
							
							... 
							
							
							
							Include own_votes in the poll data
See merge request pleroma/pleroma!3274  
							
						 
						
							2021-01-26 00:55:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2cb5c16723 
								
							 
						 
						
							
							
								
								Credo  
							
							
							
						 
						
							2021-01-25 18:25:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0b19534475 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into docs/apache-config  
							
							
							
						 
						
							2021-01-25 17:00:26 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7864a32d7 
								
							 
						 
						
							
							
								
								[ #3213 ] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.  
							
							
							
						 
						
							2021-01-25 22:31:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								694d98be55 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-01-25 21:24:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ea4785213a 
								
							 
						 
						
							
							
								
								[ #3213 ] Switched to using embedded hashtags in Object.hashtags/1  
							
							... 
							
							
							
							(to avoid extra joins / preload in timeline queries). 
							
						 
						
							2021-01-25 20:12:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f868dcf3ac 
								
							 
						 
						
							
							
								
								Ensure consistent behavior between pleroma.user activate/deactivate mix tasks  
							
							
							
						 
						
							2021-01-25 10:48:28 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f3d64acbf 
								
							 
						 
						
							
							
								
								little refactor and tests  
							
							... 
							
							
							
							for voted & own_votes fields in polls 
							
						 
						
							2021-01-25 19:46:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5e8da27e14 
								
							 
						 
						
							
							
								
								Provide pleroma.user mix task for both activate and deactivate  
							
							
							
						 
						
							2021-01-25 10:36:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								537ba1c5e0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-25 09:45:06 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f264d930cc 
								
							 
						 
						
							
							
								
								[ #3213 ] Speedup of HashtagsTableMigrator (query optimization). State handling fix.  
							
							
							
						 
						
							2021-01-24 23:27:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6bfd497f4a 
								
							 
						 
						
							
							
								
								Include own_votes in the poll data  
							
							
							
						 
						
							2021-01-22 09:47:59 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								218c519606 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							... 
							
							
							
							# Conflicts:
#	test/pleroma/web/mastodon_api/views/status_view_test.exs 
							
						 
						
							2021-01-22 10:05:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								80ccdb56f6 
								
							 
						 
						
							
							
								
								Make tag urls absolute  
							
							
							
						 
						
							2021-01-21 16:49:19 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e5b32aab92 
								
							 
						 
						
							
							
								
								rename function  
							
							
							
						 
						
							2021-01-21 14:41:28 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								003402df40 
								
							 
						 
						
							
							
								
								Add ability to invalidate cache entries for Apache  
							
							
							
						 
						
							2021-01-21 14:20:13 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7fcaa188a0 
								
							 
						 
						
							
							
								
								Allow to define custom HTTP headers per each frontend  
							
							
							
						 
						
							2021-01-21 21:55:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								133644dfa2 
								
							 
						 
						
							
							
								
								Ability to set the Service-Worker-Allowed header  
							
							
							
						 
						
							2021-01-21 21:55:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ca7f240643 
								
							 
						 
						
							
							
								
								[ #3213 ] Ignoring of blank elements from objects.data->tag.  
							
							
							
						 
						
							2021-01-21 20:50:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c041e9c630 
								
							 
						 
						
							
							
								
								[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.  
							
							... 
							
							
							
							Changed default hashtags filtering strategy to non-aggregate approach. 
							
						 
						
							2021-01-21 20:23:08 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d48144a9d 
								
							 
						 
						
							
							
								
								use proper naming  
							
							... 
							
							
							
							for MediaProxyWarmingPolicy in ConcurrentLimiter 
							
						 
						
							2021-01-21 09:50:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b4ff63d020 
								
							 
						 
						
							
							
								
								configurable limits for ConcurrentLimiter  
							
							... 
							
							
							
							Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy 
							
						 
						
							2021-01-21 09:47:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2926713fe5 
								
							 
						 
						
							
							
								
								Merge branch 'deprecate-public_endpoint' into 'develop'  
							
							... 
							
							
							
							Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251  
							
						 
						
							2021-01-20 22:48:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2905df841b 
								
							 
						 
						
							
							
								
								Merge branch 'update/oban' into 'develop'  
							
							... 
							
							
							
							Update Oban to 2.3.4
See merge request pleroma/pleroma!3256  
							
						 
						
							2021-01-20 20:32:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								704eef3c2d 
								
							 
						 
						
							
							
								
								Special handling for unconfirmed users based on instance config no longer needed.  
							
							
							
						 
						
							2021-01-20 11:14:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e759579f97 
								
							 
						 
						
							
							
								
								Active users must be confirmed  
							
							
							
						 
						
							2021-01-19 16:39:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b830605577 
								
							 
						 
						
							
							
								
								[ #3213 ] Performance-related stat in HashtagsTableMigrator. Reworked count/_ to indicate approximate total count for current iteration.  
							
							
							
						 
						
							2021-01-19 22:03:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f0f0f2af00 
								
							 
						 
						
							
							
								
								[ #3213 ] timeout option for HashtagsTableMigrator.count/_.  
							
							
							
						 
						
							2021-01-19 21:17:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7f07909a7b 
								
							 
						 
						
							
							
								
								[ #3213 ] Added HashtagsTableMigrator.count/1.  
							
							
							
						 
						
							2021-01-19 21:13:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								958a7f6ed0 
								
							 
						 
						
							
							
								
								Merge branch 'fix/reblog-api' into 'develop'  
							
							... 
							
							
							
							Fix Reblog API
Closes  #2423 
See merge request pleroma/pleroma!3261  
							
						 
						
							2021-01-18 21:19:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								44a86951a3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/approval_pending_user_field  
							
							
							
						 
						
							2021-01-18 12:05:05 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								bdfd72630f 
								
							 
						 
						
							
							
								
								ListController: Fix being unable to add / remove users.  
							
							
							
						 
						
							2021-01-18 16:28:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d28a7ebfb 
								
							 
						 
						
							
							
								
								[ #3213 ] Missing copyright header for HashtagsTableMigrator.State.  
							
							
							
						 
						
							2021-01-17 21:58:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								85f7ef4d13 
								
							 
						 
						
							
							
								
								[ #3213 ] Feature lock adjustment for HashtagsTableMigrator.  
							
							
							
						 
						
							2021-01-17 10:57:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e48c80d7f 
								
							 
						 
						
							
							
								
								start oban app in migrations and mix tasks  
							
							
							
						 
						
							2021-01-17 09:58:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3f88e33a71 
								
							 
						 
						
							
							
								
								[ #3251 ] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to clear_config/_ to minimize such issues in future.  
							
							
							
						 
						
							2021-01-16 23:05:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								48b399cedb 
								
							 
						 
						
							
							
								
								[ #3213 ] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).  
							
							
							
						 
						
							2021-01-16 20:22:14 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								6c50ac1d3f 
								
							 
						 
						
							
							
								
								Readability  
							
							
							
						 
						
							2021-01-15 11:37:17 -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 
								
							 
						 
						
							
							
							
							
								
							
							
								cd1e5d76ab 
								
							 
						 
						
							
							
								
								Remove User.restrict_deactivated/1  
							
							... 
							
							
							
							Everything else is in User.Query, no need for this odd kludge. 
							
						 
						
							2021-01-15 11:24:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							
							
						 
						
							2021-01-15 11:24:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								63923df0a5 
								
							 
						 
						
							
							
								
								Further simplify changeset logic  
							
							
							
						 
						
							2021-01-15 10:42:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e59c28ed 
								
							 
						 
						
							
							
								
								Change user.approval_pending field to user.is_approved  
							
							
							
						 
						
							2021-01-15 10:42:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								cf367fdbd5 
								
							 
						 
						
							
							
								
								Merge branch 'optimize-command_available' into 'develop'  
							
							... 
							
							
							
							Optimize Pleroma.Utils.command_available?/1
See merge request pleroma/pleroma!3254  
							
						 
						
							2021-01-15 04:44:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d0e0396528 
								
							 
						 
						
							
							
								
								Hack to fix tests not passing. Unclear why the filters are being set to nil.  
							
							... 
							
							
							
							Both of these changes are needed or it doesn't work. 
							
						 
						
							2021-01-14 17:49:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8d6e9b25a4 
								
							 
						 
						
							
							
								
								Just validate command is in PATH; forking a shell is wasteful  
							
							
							
						 
						
							2021-01-14 17:19:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f5f267fa76 
								
							 
						 
						
							
							
								
								[ #3213 ] Refactoring of HashtagsTableMigrator.  
							
							
							
						 
						
							2021-01-14 22:41:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								39f3683a06 
								
							 
						 
						
							
							
								
								Pbkdf2: Use it everywhere.  
							
							
							
						 
						
							2021-01-14 15:06:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								87a31c5c9b 
								
							 
						 
						
							
							
								
								Password -> Password.Pbkdf2  
							
							
							
						 
						
							2021-01-14 14:49:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e350898828 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-01-13 22:11:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e4d84729a 
								
							 
						 
						
							
							
								
								[ #3213 ] Prototype of data migrations functionality / HashtagsTableMigrator.  
							
							
							
						 
						
							2021-01-13 22:07:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f0ab60189e 
								
							 
						 
						
							
							
								
								truncated_namespace should default to nil  
							
							
							
						 
						
							2021-01-13 11:54:00 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9106048c61 
								
							 
						 
						
							
							
								
								Password: Replace Pbkdf2 with Password.  
							
							
							
						 
						
							2021-01-13 15:11:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c7cd9bd591 
								
							 
						 
						
							
							
								
								Password: Add password module  
							
							... 
							
							
							
							Replaces Pbkdf2. 
							
						 
						
							2021-01-13 15:09:01 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c35e6fb516 
								
							 
						 
						
							
							
								
								Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader  
							
							
							
						 
						
							2021-01-12 16:34:24 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								12528edc34 
								
							 
						 
						
							
							
								
								Fix another ad-hoc construction of the upload base_url  
							
							
							
						 
						
							2021-01-12 16:32:52 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8b28dce82a 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Uploaders.S3, :public_endpoint  
							
							
							
						 
						
							2021-01-12 16:31:35 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								5453038ce9 
								
							 
						 
						
							
							
								
								Merge branch 'fix/backup-url-on-s3' into 'develop'  
							
							... 
							
							
							
							Standardize base url for uploads
See merge request pleroma/pleroma!3246  
							
						 
						
							2021-01-12 20:54:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7a1cb752dd 
								
							 
						 
						
							
							
								
								Pagination: Don't be dos'd by random parameters.  
							
							
							
						 
						
							2021-01-12 12:59:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ef59d99833 
								
							 
						 
						
							
							
								
								Simplify. We will always have a result from Upload.base_url/0, so just add it to the list  
							
							
							
						 
						
							2021-01-11 14:19:14 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1040881047 
								
							 
						 
						
							
							
								
								Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains  
							
							
							
						 
						
							2021-01-11 14:01:31 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1a547d7d3 
								
							 
						 
						
							
							
								
								ChatMessages: Fix pagination headers.  
							
							... 
							
							
							
							They used to contain the path parameter `id` as query param,
which would break the link. 
							
						 
						
							2021-01-11 15:30:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9887cdf9be 
								
							 
						 
						
							
							
								
								Formatting  
							
							
							
						 
						
							2021-01-10 09:03:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8c972de045 
								
							 
						 
						
							
							
								
								[ #3213 ] transfer_hashtags mix task refactoring.  
							
							
							
						 
						
							2021-01-10 11:44:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								fa63f1b55b 
								
							 
						 
						
							
							
								
								Apply 4 suggestion(s) to 2 file(s)  
							
							
							
						 
						
							2021-01-10 01:34:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e8bf060e6e 
								
							 
						 
						
							
							
								
								Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0  
							
							... 
							
							
							
							Now we should have a correct base URL for S3 hosted objects throughout the codebase. 
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								86dcfb4eb9 
								
							 
						 
						
							
							
								
								More places we should be using Upload.base_url  
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								530fb5b29e 
								
							 
						 
						
							
							
								
								Avoid duplicate Config calls  
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3c936061d5 
								
							 
						 
						
							
							
								
								Apply Upload.base_url for S3  
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ad79983614 
								
							 
						 
						
							
							
								
								Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase  
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								80167e62dd 
								
							 
						 
						
							
							
								
								Merge branch 'fix/missing_emoji_steal_dir' into 'develop'  
							
							... 
							
							
							
							Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218  
							
						 
						
							2021-01-08 13:10:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3342f6a7ef 
								
							 
						 
						
							
							
								
								Backups: render ID in API  
							
							
							
						 
						
							2021-01-07 13:06:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ac1298fce8 
								
							 
						 
						
							
							
								
								Merge branch 'cleanup/unused-proxy-opts' into 'develop'  
							
							... 
							
							
							
							Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236  
							
						 
						
							2021-01-07 16:25:39 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4d56aca904 
								
							 
						 
						
							
							
								
								Merge branch 'adminapi-user-email' into 'develop'  
							
							... 
							
							
							
							AdminAPI: return user email
See merge request pleroma/pleroma!3240  
							
						 
						
							2021-01-07 10:08:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0d521022fe 
								
							 
						 
						
							
							
								
								[ #3213 ] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids).  
							
							
							
						 
						
							2021-01-07 12:20:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20af025c65 
								
							 
						 
						
							
							
								
								AdminAPI: return user email  
							
							
							
						 
						
							2021-01-06 11:30:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								48cd336a72 
								
							 
						 
						
							
							
								
								allow external emoji  
							
							
							
						 
						
							2021-01-06 10:13:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d69c78ceb9 
								
							 
						 
						
							
							
								
								Remove configurability of upload proxy opts, simplify  
							
							
							
						 
						
							2021-01-05 15:06:00 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								64116f63d9 
								
							 
						 
						
							
							
								
								URI.encode custom emojis  
							
							
							
						 
						
							2021-01-05 12:29:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								20a269ed69 
								
							 
						 
						
							
							
								
								Merge branch 'fix/pagination-regression' into 'develop'  
							
							... 
							
							
							
							Do not try to guess which pagination we need by the existence of an :offset param.
Closes  #2399 
See merge request pleroma/pleroma!3230  
							
						 
						
							2021-01-05 12:40:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e802b48d55 
								
							 
						 
						
							
							
								
								User: Use ObjectID type to validate also-known-as field  
							
							
							
						 
						
							2021-01-05 13:10:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0e6cff583 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases  
							
							
							
						 
						
							2021-01-05 12:42:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bea69853a2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff  
							
							
							
						 
						
							2021-01-05 12:19:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d44850d7a5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor  
							
							
							
						 
						
							2021-01-05 10:48:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8e5904daa5 
								
							 
						 
						
							
							
								
								SideEffects.DeleteTest: asyncify.  
							
							... 
							
							
							
							Replace Mock with Mox, mock out Logger. 
							
						 
						
							2021-01-04 18:40:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								83f27282ba 
								
							 
						 
						
							
							
								
								Do not try to guess which pagination we need by the existence of an :offset param.  
							
							... 
							
							
							
							Require explicit request to get offset pagination. 
							
						 
						
							2021-01-04 10:13:17 -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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ec7e9b8e9 
								
							 
						 
						
							
							
								
								AdminAPI: return id for moderation log entries  
							
							
							
						 
						
							2021-01-01 11:59:48 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								afe9c152ab 
								
							 
						 
						
							
							
								
								Merge branch 'fix/reports-ordering' into 'develop'  
							
							... 
							
							
							
							Do not reverse order of reports. We want newest ones sorted to the top.
Closes  #2364 
See merge request pleroma/pleroma!3225  
							
						 
						
							2020-12-31 19:24:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4200a06340 
								
							 
						 
						
							
							
								
								Aliases: refactor validate_also_known_as/1  
							
							
							
						 
						
							2020-12-31 12:53:28 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								0d6b9ce8ca 
								
							 
						 
						
							
							
								
								Apply 2 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-31 18:51:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2aa60e7592 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-31 09:58:43 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								303055456f 
								
							 
						 
						
							
							
								
								Alternative implementation of hashtag-filtering queries in ActivityPub. Fixed GROUP BY clause for aggregation on hashtags.  
							
							
							
						 
						
							2020-12-31 12:45:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								367f0c31c3 
								
							 
						 
						
							
							
								
								[ #3213 ] Added query options support for Repo.chunk_stream/4.  
							
							... 
							
							
							
							Used infinite timeout in transfer_hashtags select query. 
							
						 
						
							2020-12-31 09:36:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11d40e92b7 
								
							 
						 
						
							
							
								
								Render AKAs in Actor endpoints  
							
							
							
						 
						
							2020-12-30 18:53:27 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cbce880076 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases  
							
							
							
						 
						
							2020-12-30 17:10:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2597b028f7 
								
							 
						 
						
							
							
								
								Make pagination type conditional  
							
							
							
						 
						
							2020-12-30 16:37:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								085d4e6cfc 
								
							 
						 
						
							
							
								
								Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset  
							
							
							
						 
						
							2020-12-30 16:10:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5f75f4e9 
								
							 
						 
						
							
							
								
								Support pagination in AdminAPI for user statuses  
							
							
							
						 
						
							2020-12-30 15:18:54 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								744b34709d 
								
							 
						 
						
							
							
								
								Do not reverse order of reports. We want newest ones sorted to the top.  
							
							
							
						 
						
							2020-12-30 14:22:48 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8d1a0c1afd 
								
							 
						 
						
							
							
								
								[ #3213 ] Made Object.object_data_hashtags/1 handle both AS2 and plain text hashtags.  
							
							
							
						 
						
							2020-12-30 15:22:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e0b5edb6d5 
								
							 
						 
						
							
							
								
								[ #3213 ] Fixed Object.object_data_hashtags/1 to process only AS2 elements of data.tag (basing on  #2984 ).  
							
							
							
						 
						
							2020-12-30 14:42:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a25c1e8ec0 
								
							 
						 
						
							
							
								
								[ #3213 ] Improved database.transfer_hashtags mix task: proper rollback, speedup.  
							
							
							
						 
						
							2020-12-30 14:35:19 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								b122b6ffa3 
								
							 
						 
						
							
							
								
								Merge branch 'features/hashtag-column' into 'develop'  
							
							... 
							
							
							
							Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824  
							
						 
						
							2020-12-28 10:14:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d0c2479710 
								
							 
						 
						
							
							
								
								pleroma.database fill_old_hashtags: Add month_limit argument  
							
							
							
						 
						
							2020-12-28 11:05:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								18b536c176 
								
							 
						 
						
							
							
								
								Pleroma.Object/1: take %Object{} as argument instead  
							
							
							
						 
						
							2020-12-28 11:05:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								14fae94c0e 
								
							 
						 
						
							
							
								
								[ #3213 ] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.  
							
							
							
						 
						
							2020-12-28 00:08:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e859794ee 
								
							 
						 
						
							
							
								
								non condition dir creation  
							
							
							
						 
						
							2020-12-27 21:58:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dad76703aa 
								
							 
						 
						
							
							
								
								not needed  
							
							
							
						 
						
							2020-12-27 21:53:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bfb041658 
								
							 
						 
						
							
							
								
								insreasing test coverage for StealEmojiPolicy  
							
							
							
						 
						
							2020-12-27 21:53:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aafd7b44ce 
								
							 
						 
						
							
							
								
								check dir existence in policy  
							
							
							
						 
						
							2020-12-27 21:53:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e02889edb2 
								
							 
						 
						
							
							
								
								Add MRFs to the list of things that may need a soft reboot  
							
							
							
						 
						
							2020-12-27 21:53:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72aeb2e73b 
								
							 
						 
						
							
							
								
								Mark private  
							
							
							
						 
						
							2020-12-27 21:53:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77e39e6aae 
								
							 
						 
						
							
							
								
								Create dir for EmojiStealPolicy automatically  
							
							
							
						 
						
							2020-12-27 21:53:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4134abef63 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2020-12-26 22:23:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb19d0e18 
								
							 
						 
						
							
							
								
								[ #3213 ] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to hashtags table.  
							
							
							
						 
						
							2020-12-26 22:20:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e4f1d8f48c 
								
							 
						 
						
							
							
								
								Merge branch 'cachex-test' into 'develop'  
							
							... 
							
							
							
							Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209  
							
						 
						
							2020-12-26 10:26:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e369b1306b 
								
							 
						 
						
							
							
								
								Added Hashtag entity and objects-hashtags association with auto-sync with data.tag on Object update.  
							
							
							
						 
						
							2020-12-22 22:04:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								538af14d52 
								
							 
						 
						
							
							
								
								possibility to run rollback in test env  
							
							
							
						 
						
							2020-12-22 17:55:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								87b13c5430 
								
							 
						 
						
							
							
								
								Create Object.hashtags/1 wrapper  
							
							
							
						 
						
							2020-12-22 05:15:34 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ab633e51ab 
								
							 
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							2020-12-21 16:48:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5db1e6c8d3 
								
							 
						 
						
							
							
								
								Pipeline test: Switch from Mock to Mox.  
							
							... 
							
							
							
							Speeds up the test and makes it possible to run async. 
							
						 
						
							2020-12-21 16:35:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c9d73af74d 
								
							 
						 
						
							
							
								
								Cachex: Unify arity of callback function  
							
							
							
						 
						
							2020-12-21 12:03:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee81a94ab2 
								
							 
						 
						
							
							
								
								Caching: Add caching behavior, add null implementation.  
							
							
							
						 
						
							2020-12-21 11:42:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaizhe Huang 
								
							 
						 
						
							
							
							
							
								
							
							
								fb02241580 
								
							 
						 
						
							
							
								
								Fix trailing whitespaces in lib/pleroma/web/web_finger.ex  
							
							
							
						 
						
							2020-12-21 00:54:15 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								95a9bdfc37 
								
							 
						 
						
							
							
								
								Tests: Use NullCache for async tests.  
							
							... 
							
							
							
							Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test. 
							
						 
						
							2020-12-18 19:53:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								713612c377 
								
							 
						 
						
							
							
								
								Cachex: Make caching provider switchable at runtime.  
							
							... 
							
							
							
							Defaults to Cachex. 
							
						 
						
							2020-12-18 17:44:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9a744d49c8 
								
							 
						 
						
							
							
								
								Jason: Remove by now superfluous jason_types file  
							
							
							
						 
						
							2020-12-18 17:44:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FiveYellowMice 
								
							 
						 
						
							
							
							
							
								
							
							
								83cd7f2b5f 
								
							 
						 
						
							
							
								
								WebFinger: add subscribe_address in return data of JSON responses  
							
							
							
						 
						
							2020-12-18 13:48:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80891e83d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-12-17 09:05:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b8c317c0f 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'  
							
							... 
							
							
							
							Fix mastoapi ws posts dropping
Closes  #2336 
See merge request pleroma/pleroma!3198  
							
						 
						
							2020-12-16 11:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6bb4f4e172 
								
							 
						 
						
							
							
								
								Merge branch 'support/2255_posix_errors' into 'develop'  
							
							... 
							
							
							
							[#2255 ] added error messages for posix error code
See merge request pleroma/pleroma!3138  
							
						 
						
							2020-12-15 15:16:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0d285cf44f 
								
							 
						 
						
							
							
								
								Merge branch 'fix/config-gen-detect-exiftool' into 'develop'  
							
							... 
							
							
							
							instance.gen: Warn that stripping exif requires exiftool
Closes  #2343 
See merge request pleroma/pleroma!3197  
							
						 
						
							2020-12-15 14:39:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6dac2ac71a 
								
							 
						 
						
							
							
								
								Minor refactoring of the logic for hiding followers/following counts.  
							
							... 
							
							
							
							Field is not nullable anymore, and this is more readable. 
							
						 
						
							2020-12-14 13:27:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								cebe3c7def 
								
							 
						 
						
							
							
								
								Fix for dropping posts/notifs in WS when mix task is executed  
							
							... 
							
							
							
							- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app) 
							
						 
						
							2020-12-14 11:02:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7133c0c5ea 
								
							 
						 
						
							
							
								
								instance.gen: Warn that stripping exif requires exiftool  
							
							... 
							
							
							
							And default to no if it is not installed
Closes  #2343  
							
						 
						
							2020-12-12 20:38:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6aece536eb 
								
							 
						 
						
							
							
								
								instance.gen task: Only show files which will be actually overwritten  
							
							
							
						 
						
							2020-12-12 20:35:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6520599b7d 
								
							 
						 
						
							
							
								
								Update Earmark to 1.4.13, use the new compact_output mode  
							
							
							
						 
						
							2020-12-11 17:23:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								642729b49f 
								
							 
						 
						
							
							
								
								Fix AudioVideoValidator markdown  
							
							
							
						 
						
							2020-12-11 17:22:54 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								f8c93246d6 
								
							 
						 
						
							
							
								
								Refactor Earmark code, fix tests  
							
							
							
						 
						
							2020-12-11 17:22:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								ba71bbf610 
								
							 
						 
						
							
							
								
								Improve Formatter.minify/2  
							
							
							
						 
						
							2020-12-11 17:22:24 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								e9e17e5df3 
								
							 
						 
						
							
							
								
								Upgrade Earmark to v1.4.10  
							
							
							
						 
						
							2020-12-11 17:22:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7fff9c1bee 
								
							 
						 
						
							
							
								
								Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).  
							
							
							
						 
						
							2020-12-09 21:14:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7da0349d73 
								
							 
						 
						
							
							
								
								Changed default OAuth token expiration time to 30 days.  
							
							
							
						 
						
							2020-12-09 19:59:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								477c6c8e55 
								
							 
						 
						
							
							
								
								Merge branch 'auth-improvements' into 'develop'  
							
							... 
							
							
							
							Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112  
							
						 
						
							2020-12-09 15:55:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1436a2fa2d 
								
							 
						 
						
							
							
								
								Merge branch 'stream-follow-updates' into 'develop'  
							
							... 
							
							
							
							Stream follow updates
Closes  #2299 
See merge request pleroma/pleroma!3183  
							
						 
						
							2020-12-09 15:52:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e73d878b38 
								
							 
						 
						
							
							
								
								Merge branch 'feat/warn-large-pool-size' into 'develop'  
							
							... 
							
							
							
							Add a startup error for modified Repo pool_size
See merge request pleroma/pleroma!3190  
							
						 
						
							2020-12-08 16:36:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								50d16a9e27 
								
							 
						 
						
							
							
								
								ApplicationRequirements: Add test, more text for pool size.  
							
							
							
						 
						
							2020-12-08 17:30:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5b9b7b4888 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-08 16:16:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fb3fd692c6 
								
							 
						 
						
							
							
								
								Add a startup error for modified Repo pool_size  
							
							
							
						 
						
							2020-12-07 16:44:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1403798820 
								
							 
						 
						
							
							
								
								instance.reachable?: Limit to binary input  
							
							
							
						 
						
							2020-12-07 21:20:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1a2e8b17c 
								
							 
						 
						
							
							
								
								instance: Do not fetch unreachable instances  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346  
							
						 
						
							2020-12-07 20:11:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c8e7ace812 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-12-07 21:45:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ed76323776 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configdb-mix-tasks' into 'develop'  
							
							... 
							
							
							
							Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174  
							
						 
						
							2020-12-07 18:06:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								93428d7c11 
								
							 
						 
						
							
							
								
								Print out settings that will be removed when specifying the group and key for consistency  
							
							... 
							
							
							
							Fix error message when specified key doesn't exist 
							
						 
						
							2020-12-07 11:45:56 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								61494b5245 
								
							 
						 
						
							
							
								
								Formatting  
							
							
							
						 
						
							2020-12-07 11:22:07 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d817bae802 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-07 17:13:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e00c667145 
								
							 
						 
						
							
							
								
								[ #3174 ] Refactoring: ConfigDB fetching functions, ConfigDB tests.  
							
							... 
							
							
							
							Minor fixes. 
							
						 
						
							2020-12-06 18:02:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a010c5b16a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements  
							
							
							
						 
						
							2020-12-06 13:59:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e9859b68fc 
								
							 
						 
						
							
							
								
								[ #3112 ] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.  
							
							
							
						 
						
							2020-12-06 13:59:10 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6adad96c79 
								
							 
						 
						
							
							
								
								Merge branch 'issue/2256' into 'develop'  
							
							... 
							
							
							
							[#2256 ] added subject actor to moderation log
See merge request pleroma/pleroma!3164  
							
						 
						
							2020-12-04 17:49:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9dfda37821 
								
							 
						 
						
							
							
								
								More compact representation  
							
							
							
						 
						
							2020-12-04 11:37:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3bf5c5b015 
								
							 
						 
						
							
							
								
								Ensure deleting entire group prints out settings that will be removed before actually removing them  
							
							
							
						 
						
							2020-12-04 11:30:48 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								696d39c3dc 
								
							 
						 
						
							
							
								
								Fix deleting an entire group. Also utilize Pleroma.ConfigDB.delete/1  
							
							
							
						 
						
							2020-12-04 11:19:58 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								685e5c8509 
								
							 
						 
						
							
							
								
								Use Pleroma.ConfigDB.delete/1 instead of rolling our own  
							
							
							
						 
						
							2020-12-04 11:09:13 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4aad066091 
								
							 
						 
						
							
							
								
								Use Enum.any? to ensure we return true if there are results  
							
							
							
						 
						
							2020-12-04 11:04:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1d04bd0894 
								
							 
						 
						
							
							
								
								Merge branch 'supported-emojos' into 'develop'  
							
							... 
							
							
							
							Update Emoji support to unicode 13.1, support all RGI emoji.
See merge request pleroma/pleroma!3186  
							
						 
						
							2020-12-03 18:29:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a02eb88396 
								
							 
						 
						
							
							
								
								config_db search methods  
							
							
							
						 
						
							2020-12-03 19:34:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7fd4f4908b 
								
							 
						 
						
							
							
								
								dump_key/2 no longer used  
							
							
							
						 
						
							2020-12-03 10:03:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								60c4ac0f70 
								
							 
						 
						
							
							
								
								Apply 6 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-03 16:03:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								95e908e4e2 
								
							 
						 
						
							
							
								
								Credo  
							
							
							
						 
						
							2020-12-03 09:58:24 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fa0d0b602f 
								
							 
						 
						
							
							
								
								Emoji: Also accept regional indicators  
							
							
							
						 
						
							2020-12-03 16:17:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								16bdc2bcd0 
								
							 
						 
						
							
							
								
								Make the --force flag for reset command consistent with the others and deduplicate db truncation  
							
							
							
						 
						
							2020-12-02 16:34:23 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e379ab8277 
								
							 
						 
						
							
							
								
								Add --force flag for delete and reset commands  
							
							... 
							
							
							
							Bunch of reorganization and consolidation 
							
						 
						
							2020-12-02 16:24:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								20a911f9f7 
								
							 
						 
						
							
							
								
								Add comment for this mysterious behavior  
							
							
							
						 
						
							2020-12-02 14:25:07 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								25fab7da69 
								
							 
						 
						
							
							
								
								No need for a separate functions here  
							
							
							
						 
						
							2020-12-02 14:20:11 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								13947999ad 
								
							 
						 
						
							
							
								
								Use a callback strategy to short circuit the functions and print a nice error  
							
							
							
						 
						
							2020-12-02 12:33:34 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a7b5280b5b 
								
							 
						 
						
							
							
								
								Centralize check that configdb is enabled which now raises an exception  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								53a5ec1952 
								
							 
						 
						
							
							
								
								Left public during debugging  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5135a8189f 
								
							 
						 
						
							
							
								
								Use inspect instead of faking the output  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6334ba9ad3 
								
							 
						 
						
							
							
								
								Remove unnecessary keys command  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d0cb73527f 
								
							 
						 
						
							
							
								
								Ensure scary warning starts on a new line  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0847e3e496 
								
							 
						 
						
							
							
								
								Print whole config when resetting and include a scary looking message.  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d4320e0daf 
								
							 
						 
						
							
							
								
								Both are really atoms  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4bdfcf1682 
								
							 
						 
						
							
							
								
								Transform strings to atoms for all cases, including when the atom is a module like Pleroma.Emails.Mailer  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3df115b2b0 
								
							 
						 
						
							
							
								
								Support atoms and strings as args to the mix task  
							
							... 
							
							
							
							Improve output. Show the user what will be deleted before the prompt. 
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ae7d37de06 
								
							 
						 
						
							
							
								
								Fix deletion regression due to strings instead of atoms  
							
							... 
							
							
							
							Improve message after successful deletion 
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c6a0ca2213 
								
							 
						 
						
							
							
								
								Improve dumping groups and specific keys; add prompts for delete and reset  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								67437feafc 
								
							 
						 
						
							
							
								
								Support listing groups, listing keys in a group, and dumping the config based on group or specific key in that group  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a51da3c1d8 
								
							 
						 
						
							
							
								
								Sort output by group  
							
							... 
							
							
							
							Not the best sorting, but better than nothing. 
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ada073f251 
								
							 
						 
						
							
							
								
								Rename keys to groups  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e8a4062d9d 
								
							 
						 
						
							
							
								
								Document how to delete individual configuration groups and completely reset the config without SQL  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a82ba66662 
								
							 
						 
						
							
							
								
								Better deletion message  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6dcc36baa9 
								
							 
						 
						
							
							
								
								Add mix tasks to give additional recovery and debugging options  
							
							... 
							
							
							
							- pleroma.config dump: prints the entire config as it would be exported to the filesystem
- pleroma.config dump KEY: prints the configuration under a specific ConfigDB key in the database
- pleroma.config keylist: lists the available keys in ConfigDB
- pleroma.config keydel KEY: deletes ConfigDB entry stored under the key
This should prevent the need for users to manually execute SQL queries. 
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8fb259e739 
								
							 
						 
						
							
							
								
								Emoji: Only accept RGI emoji.  
							
							... 
							
							
							
							"recommended for general interchange" 
							
						 
						
							2020-12-02 16:46:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9afb350e7 
								
							 
						 
						
							
							
								
								Document follow relationship updates and cleanup  
							
							
							
						 
						
							2020-12-02 19:16:36 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b6f5e9ac9c 
								
							 
						 
						
							
							
								
								Emoji: Remove unused emoji-data.txt  
							
							
							
						 
						
							2020-12-02 16:15:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1adee08321 
								
							 
						 
						
							
							
								
								Emoji: Update to Unicode 13.1, switch base file, allow multichar.  
							
							
							
						 
						
							2020-12-02 16:15:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								04af0bbe44 
								
							 
						 
						
							
							
								
								User: Remove left-over (wrong) fix.  
							
							
							
						 
						
							2020-12-02 13:39:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								222312900e 
								
							 
						 
						
							
							
								
								User: Don't allow local users in remote changesets  
							
							
							
						 
						
							2020-12-02 12:18:43 +01:00