feld 
								
							 
						 
						
							
							
							
							
								
							
							
								593c0851d9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'new-user-emails'  
							
							
							
						 
						
							2021-02-08 16:01:50 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6e68058b63 
								
							 
						 
						
							
							
								
								Merge branch 'feat/allow_alt_text_search_config' into 'develop'  
							
							... 
							
							
							
							allow user defined text search config in database
See merge request pleroma/pleroma!3275  
							
						 
						
							2021-02-06 09:42:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hyperion 
								
							 
						 
						
							
							
							
							
								
							
							
								8d4e0342e1 
								
							 
						 
						
							
							
								
								Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files  
							
							
							
						 
						
							2021-02-06 09:42:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								af37a5c51a 
								
							 
						 
						
							
							
								
								Also make this maybe_ for consistency  
							
							
							
						 
						
							2021-02-04 14:33:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e2d7c4fd57 
								
							 
						 
						
							
							
								
								Merge branch 'feat/openapi-spec-export' into 'develop'  
							
							... 
							
							
							
							Improve OpenAPI spec and deploy it to api.pleroma.social
See merge request pleroma/pleroma!3296  
							
						 
						
							2021-02-03 13:21:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9fcff7851f 
								
							 
						 
						
							
							
								
								Improve OpenAPI spec and deploy it to api.pleroma.social  
							
							... 
							
							
							
							Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information. 
							
						 
						
							2021-02-03 16:07:44 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f868dcf3ac 
								
							 
						 
						
							
							
								
								Ensure consistent behavior between pleroma.user activate/deactivate mix tasks  
							
							
							
						 
						
							2021-01-25 10:48:28 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5e8da27e14 
								
							 
						 
						
							
							
								
								Provide pleroma.user mix task for both activate and deactivate  
							
							
							
						 
						
							2021-01-25 10:36:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								537ba1c5e0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-25 09:45:06 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e48c80d7f 
								
							 
						 
						
							
							
								
								start oban app in migrations and mix tasks  
							
							
							
						 
						
							2021-01-17 09:58:41 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								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