Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ebd7d1365b 
								
							 
						 
						
							
							
								
								Make setting user activation status explicit  
							
							
							
						 
						
							2021-01-15 11:37:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7516660753 
								
							 
						 
						
							
							
								
								Remove toggle_activation  
							
							
							
						 
						
							2021-01-15 11:25:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							
							
						 
						
							2021-01-15 11:24:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f 
								
							 
						 
						
							
							
								
								Bump Copyright to 2021  
							
							... 
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;' 
							
						 
						
							2021-01-13 07:49:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3966add048 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2824  
							
						 
						
							2020-12-28 12:02:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d0c2479710 
								
							 
						 
						
							
							
								
								pleroma.database fill_old_hashtags: Add month_limit argument  
							
							
							
						 
						
							2020-12-28 11:05:25 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								751712d970 
								
							 
						 
						
							
							
								
								Prevent mix tasks from spewing any internal logging unless DEBUG is in the env  
							
							... 
							
							
							
							e.g., DEBUG=1 mix pleroma.config migrate_from_db 
							
						 
						
							2020-11-25 12:52:39 -06:00