Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								4a895a46d1 
								
							 
						 
						
							
							
								
								Allow port specification in instance.ex  
							
							
							
						 
						
							2018-12-15 11:00:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									link0ff 
								
							 
						 
						
							
							
							
							
								
							
							
								51dd294c48 
								
							 
						 
						
							
							
								
								Allow to set both admin and moderator at the same time in mix task User  
							
							
							
						 
						
							2018-12-12 22:45:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									link0ff 
								
							 
						 
						
							
							
							
							
								
							
							
								a40ba3ba57 
								
							 
						 
						
							
							
								
								Fix toggle_activated in mix task User  
							
							
							
						 
						
							2018-12-12 22:30:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								bda25b999b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'  
							
							... 
							
							
							
							# Conflicts:
#   lib/mix/tasks/pleroma/uploads.ex 
							
						 
						
							2018-12-10 18:33:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e94c3442f4 
								
							 
						 
						
							
							
								
								updates  
							
							
							
						 
						
							2018-12-10 13:27:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								993c8c8bd4 
								
							 
						 
						
							
							
								
								Keep the shortdoc descriptive  
							
							
							
						 
						
							2018-12-10 08:03:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								cbe048bb3f 
								
							 
						 
						
							
							
								
								Mix tasks: improve uploads.ex moduledoc  
							
							
							
						 
						
							2018-12-09 20:17:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								5436aaad4f 
								
							 
						 
						
							
							
								
								Merge branch 'fix/add-upload.ex' into 'develop'  
							
							... 
							
							
							
							Mix Tasks: Add task uploads.ex for migrating local uploads.
See merge request pleroma/pleroma!517  
							
						 
						
							2018-12-08 09:12:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								6c73136aec 
								
							 
						 
						
							
							
								
								[ #283 ] Mix Tasks: Fix a typo in relay.ex  
							
							
							
						 
						
							2018-12-08 08:30:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								fd5c7b445f 
								
							 
						 
						
							
							
								
								Fix a typo  
							
							
							
						 
						
							2018-12-07 19:19:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								a02e0c18bc 
								
							 
						 
						
							
							
								
								Mix Tasks: Add task uploads.ex for migrating local uploads.  
							
							
							
						 
						
							2018-12-07 15:13:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								8764f64690 
								
							 
						 
						
							
							
								
								Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'  
							
							... 
							
							
							
							Add mix pleroma.user unsubscribe to mix doc
See merge request pleroma/pleroma!512  
							
						 
						
							2018-12-07 09:23:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4e2250b1dd 
								
							 
						 
						
							
							
								
								Fix a typo in relay.ex moduledoc  
							
							
							
						 
						
							2018-12-07 11:41:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e23aee90 
								
							 
						 
						
							
							
								
								Oops  
							
							
							
						 
						
							2018-12-07 10:44:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f661813807 
								
							 
						 
						
							
							
								
								Add mix pleroma.user unsubscribe to mix doc  
							
							
							
						 
						
							2018-12-07 10:39:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								08e10a70ec 
								
							 
						 
						
							
							
								
								Rename def to defval  
							
							
							
						 
						
							2018-12-07 09:46:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								1d11c4cf11 
								
							 
						 
						
							
							
								
								add common.ex  
							
							
							
						 
						
							2018-12-07 06:12:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								71d5cf9ed8 
								
							 
						 
						
							
							
								
								Remove unused vars from user.ex  
							
							
							
						 
						
							2018-12-06 18:25:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								66313cda02 
								
							 
						 
						
							
							
								
								Update instance.ex for web push  
							
							
							
						 
						
							2018-12-06 18:16:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								88f92693f2 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2018-12-06 18:11:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								ca7b46fb3b 
								
							 
						 
						
							
							
								
								Refactor common functions to common.ex  
							
							
							
						 
						
							2018-12-06 18:01:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								4a2a7ce636 
								
							 
						 
						
							
							
								
								Refactor common functions to common.ex  
							
							
							
						 
						
							2018-12-06 18:00:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								3a84511df1 
								
							 
						 
						
							
							
								
								remove migrate_local_uploads.ex  
							
							
							
						 
						
							2018-12-06 17:35:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4944498133 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/compat/push-subscriptions  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex 
							
						 
						
							2018-12-06 20:15:16 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								8b4397c704 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/compat/push-subscriptions  
							
							... 
							
							
							
							# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock 
							
						 
						
							2018-12-06 19:55:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								04a48286e6 
								
							 
						 
						
							
							
								
								Add web push support  
							
							
							
						 
						
							2018-12-06 19:29:04 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc9c08796 
								
							 
						 
						
							
							
								
								formating  
							
							
							
						 
						
							2018-12-05 19:12:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								ffec96d8cc 
								
							 
						 
						
							
							
								
								Everything should use Mix.Task.Run  
							
							
							
						 
						
							2018-12-05 19:05:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								facfd03bc1 
								
							 
						 
						
							
							
								
								Move relay tasks to relay.ex  
							
							
							
						 
						
							2018-12-05 18:11:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								e8ba579efe 
								
							 
						 
						
							
							
								
								Switch from User.info_changeset because it is deprecated  
							
							
							
						 
						
							2018-12-05 17:58:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								c3519132df 
								
							 
						 
						
							
							
								
								Sorry  
							
							
							
						 
						
							2018-12-05 16:44:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								5427d2af3a 
								
							 
						 
						
							
							
								
								Update mix tasks since User.info.info_changeset is deprecated  
							
							
							
						 
						
							2018-12-05 16:41:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								9938fa3293 
								
							 
						 
						
							
							
								
								Merge develop to refactor/mix-tasks  
							
							
							
						 
						
							2018-12-05 14:16:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								6396f1b58f 
								
							 
						 
						
							
							
								
								change new to gen in instance.ex . Refactor user.ex  
							
							
							
						 
						
							2018-12-04 19:00:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1a360a4eaa 
								
							 
						 
						
							
							
								
								compact database task: fix formatting  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ef56488349 
								
							 
						 
						
							
							
								
								mix: add task to compact the database  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								03b2d1016d 
								
							 
						 
						
							
							
								
								F O R M A T I N G  
							
							
							
						 
						
							2018-12-02 20:27:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								57c71f8468 
								
							 
						 
						
							
							
								
								Move generate_invite to user.ex  
							
							
							
						 
						
							2018-12-02 20:26:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								d924b6cd3d 
								
							 
						 
						
							
							
								
								Refactor copypasta to a private function in instance.ex  
							
							
							
						 
						
							2018-12-02 20:04:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								cbe22deb51 
								
							 
						 
						
							
							
								
								Lint fix  
							
							
							
						 
						
							2018-12-02 19:20:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								faf1f2b304 
								
							 
						 
						
							
							
								
								Move gen.instance to instance.ex  
							
							
							
						 
						
							2018-12-02 19:18:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								7983b0bdfe 
								
							 
						 
						
							
							
								
								Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users.  
							
							
							
						 
						
							2018-12-02 18:05:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e3f3d13d99 
								
							 
						 
						
							
							
								
								Add uuid generation extension to sample_psql.eex.  
							
							
							
						 
						
							2018-12-02 11:20:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								31b3ac05ac 
								
							 
						 
						
							
							
								
								Lint fix  
							
							
							
						 
						
							2018-12-02 10:01:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								a8ef6b1190 
								
							 
						 
						
							
							
								
								Add admin option to pleroma.user new. Add user existence checking to toggle_activated  
							
							
							
						 
						
							2018-12-02 09:36:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ae82852330 
								
							 
						 
						
							
							
								
								Move set_admin task to lib/mix/tasks/pleroma/user.ex  
							
							
							
						 
						
							2018-12-01 18:55:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6f174cbb71 
								
							 
						 
						
							
							
								
								Delete reactivate user task  
							
							
							
						 
						
							2018-12-01 18:34:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5f91d6b859 
								
							 
						 
						
							
							
								
								Fix toggle_deactivated to reactivate a deactivated user  
							
							
							
						 
						
							2018-12-01 18:33:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fe2759bc9f 
								
							 
						 
						
							
							
								
								Attempt to resolve merge conflict  
							
							
							
						 
						
							2018-12-01 18:12:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02d3dc6869 
								
							 
						 
						
							
							
								
								Uploads fun, part. 2  
							
							
							
						 
						
							2018-11-30 18:02:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								44b6200103 
								
							 
						 
						
							
							
								
								lib/mix/tasks/relay*: Use a with block  
							
							
							
						 
						
							2018-11-17 22:12:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								12ccf0c4f8 
								
							 
						 
						
							
							
								
								Change Relay from status to {status, message}  
							
							
							
						 
						
							2018-11-17 22:12:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1a31d71187 
								
							 
						 
						
							
							
								
								lib/mix/tasks/relay_{un,}follow.ex: Use a with block  
							
							
							
						 
						
							2018-11-17 20:25:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fbfd2db96 
								
							 
						 
						
							
							
								
								lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow  
							
							
							
						 
						
							2018-11-17 20:25:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								011a2e36b1 
								
							 
						 
						
							
							
								
								lib/mix/tasks/make_admin.ex: New task  
							
							
							
						 
						
							2018-11-17 20:25:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2829fa4183 
								
							 
						 
						
							
							
								
								sample config: chase http_security change  
							
							
							
						 
						
							2018-11-12 15:17:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a2bf5426cb 
								
							 
						 
						
							
							
								
								sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)  
							
							
							
						 
						
							2018-11-11 06:42:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ecb5629f6 
								
							 
						 
						
							
							
								
								lib/mix/tasks: s/@doc/@moduledoc/  
							
							
							
						 
						
							2018-11-10 13:09:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e3207045e 
								
							 
						 
						
							
							
								
								lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy  
							
							
							
						 
						
							2018-11-10 13:09:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								64c0289893 
								
							 
						 
						
							
							
								
								lib/mix/tasks: Add remaining documentation for mix tasks  
							
							
							
						 
						
							2018-11-10 13:09:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b2541e4e7 
								
							 
						 
						
							
							
								
								Document the mix tasks in ex_doc instead  
							
							
							
						 
						
							2018-11-10 13:09:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1814bb322 
								
							 
						 
						
							
							
								
								Document mix tasks  
							
							
							
						 
						
							2018-11-10 13:09:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f584a603f9 
								
							 
						 
						
							
							
								
								user: make User.delete() return data consistent with Object.delete()  
							
							
							
						 
						
							2018-11-01 07:56:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								b92e38d2d4 
								
							 
						 
						
							
							
								
								Add user reactivation task.  
							
							
							
						 
						
							2018-10-29 23:13:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								69192f36ff 
								
							 
						 
						
							
							
								
								mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots)  
							
							
							
						 
						
							2018-10-28 19:47:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Greizgh 
								
							 
						 
						
							
							
							
							
								
							
							
								a494508320 
								
							 
						 
						
							
							
								
								Cleanup postgresql setup script  
							
							... 
							
							
							
							Drop unused CREATEDB privilege.
Do not try to handle multiple run. 
							
						 
						
							2018-10-27 14:31:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8e28e8a18f 
								
							 
						 
						
							
							
								
								mix: remove fix_ap_users task, now obsolete  
							
							
							
						 
						
							2018-09-20 23:50:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								d424e9fa5f 
								
							 
						 
						
							
							
								
								fix S3 ref in sample config to generate proper path.  
							
							
							
						 
						
							2018-08-28 23:49:23 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								ab9e5d64d6 
								
							 
						 
						
							
							
								
								add a sample swift config  
							
							
							
						 
						
							2018-08-28 22:39:33 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								03c35e579b 
								
							 
						 
						
							
							
								
								sample config: add S3 public endpoint option  
							
							
							
						 
						
							2018-08-28 00:18:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e95d958b52 
								
							 
						 
						
							
							
								
								sample config: show how amazon s3 support is activated, including third-party clones like wasabi  
							
							
							
						 
						
							2018-08-27 23:30:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5bff8c66 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/relay'  
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex 
							
						 
						
							2018-08-26 21:06:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jorty 
								
							 
						 
						
							
							
							
							
								
							
							
								ba6e3eba33 
								
							 
						 
						
							
							
								
								Move invite task to pleroma namespace  
							
							... 
							
							
							
							Some other minor changes were made to make it consistent with the behavior of
other tasks both within Pleroma and the conventions set by dependencies such as
Phoenix. Namely, the task is named `gen.invite` and `IO.puts` has been replaced
with references to `Mix.shell()` where appropriate. 
							
						 
						
							2018-08-23 12:46:13 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jorty 
								
							 
						 
						
							
							
							
							
								
							
							
								8a1dc0de92 
								
							 
						 
						
							
							
								
								Refactor Mix tasks  
							
							... 
							
							
							
							1. Move Mix tasks into a `pleroma` namespace, to avoid
   collisions with dependent packages.
2. Rename and condense tasks  into two `pleroma.user` and
   `pleroma.gen.instance` tasks for consistency with Hex and Phoenix.
3. Add additional functionality to the tasks to make them more
   user-friendly. Arguments with sensible defaults were demoted to flags
   and in the interactive `generate_config` (renamed to
   `pleroma.gen.instance`), flags were added to allow non-interactive
   use, though interactive use remains the primary interface. That task
   also now prompts the user for database parameters.
4. Documentation has been added to both tasks such that `mix help` now
   shows useful information.
5. Finally, use of IO.puts in tasks has been replaced with Mix.shell()
   equivalents to make the behavior more consistent with Mix tasks in
   other packages, and such that variables like MIX_QUIET are respected.
   The only exception is in `mix pleroma.user reset_password`, wherein
   the URL must always be printed regardless of the value of MIX_QUIET
   since that's its entire purpose. 
							
						 
						
							2018-08-23 11:33:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								13440a80e1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/invites' into 'develop'  
							
							... 
							
							
							
							Invites
Closes  #108 
See merge request pleroma/pleroma!208  
							
						 
						
							2018-08-12 12:04:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								1e9d152d60 
								
							 
						 
						
							
							
								
								Update generate_invite_token.ex  
							
							
							
						 
						
							2018-08-12 11:11:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								266b314051 
								
							 
						 
						
							
							
								
								relay: fix invoking federator, use a timer to sleep the mix task to force a context switch  
							
							
							
						 
						
							2018-08-06 08:22:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								99be3d3dcc 
								
							 
						 
						
							
							
								
								relay: add relay follow/unfollow tasks  
							
							
							
						 
						
							2018-08-06 08:22:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								0b1ca6a584 
								
							 
						 
						
							
							
								
								Token-generating task  
							
							
							
						 
						
							2018-06-17 14:30:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								3326205f95 
								
							 
						 
						
							
							
								
								set_moderator: ensureall applications are started.  
							
							
							
						 
						
							2018-06-12 15:42:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								3f42806b1b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'develop'  
							
							... 
							
							
							
							Dedupe uploads
See merge request pleroma/pleroma!115  
							
						 
						
							2018-06-12 08:26:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f34232da86 
								
							 
						 
						
							
							
								
								Update sample_config.eex  
							
							
							
						 
						
							2018-06-12 07:23:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3208611bfc 
								
							 
						 
						
							
							
								
								mix: add task for setting an account as locked or not  
							
							
							
						 
						
							2018-06-11 22:15:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								18837c2fed 
								
							 
						 
						
							
							
								
								make_moderator.ex: set cache on update  
							
							
							
						 
						
							2018-06-11 22:53:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sir_Boops 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f0440ac3c 
								
							 
						 
						
							
							
								
								Dedupe uploads  
							
							
							
						 
						
							2018-06-06 13:25:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ad563669c8 
								
							 
						 
						
							
							
								
								Merge branch 'feature/remote-user-deactivation' into 'develop'  
							
							... 
							
							
							
							remote user deactivation
See merge request pleroma/pleroma!154  
							
						 
						
							2018-05-19 09:30:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4bbec6b3 
								
							 
						 
						
							
							
								
								Fix User search.  
							
							... 
							
							
							
							Now uses a trigram based search. This is a lot faster and gives better
results. Closes  #185 . 
							
						 
						
							2018-05-16 17:55:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a6a6915aaf 
								
							 
						 
						
							
							
								
								add mix task for deactivating a user by nickname  
							
							
							
						 
						
							2018-05-13 19:05:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								aaacebd906 
								
							 
						 
						
							
							
								
								Fix unused variables, imports, and aliases  
							
							
							
						 
						
							2018-05-04 21:42:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0b4ff1bfe2 
								
							 
						 
						
							
							
								
								fix again  
							
							
							
						 
						
							2018-04-19 21:44:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7b96a756fb 
								
							 
						 
						
							
							
								
								fix again  
							
							
							
						 
						
							2018-04-19 13:04:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								77fc40d5d7 
								
							 
						 
						
							
							
								
								Fix generate config  
							
							
							
						 
						
							2018-04-19 12:52:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								e30a056476 
								
							 
						 
						
							
							
								
								Revert "Ask for proxy URL if proxy enabled."  
							
							... 
							
							
							
							The most common case is running it on the same server. 
							
						 
						
							2018-04-19 13:29:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								b586ead6b8 
								
							 
						 
						
							
							
								
								rm_user: also ensure that cache is running.  
							
							
							
						 
						
							2018-04-18 17:52:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								4e3fc530db 
								
							 
						 
						
							
							
								
								Fix rm_user task.  
							
							
							
						 
						
							2018-04-18 17:39:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phenethylamine 
								
							 
						 
						
							
							
							
							
								
							
							
								13a64b82e3 
								
							 
						 
						
							
							
								
								Switch to User.delete for rm_user task  
							
							
							
						 
						
							2018-04-12 14:30:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phenethylamine 
								
							 
						 
						
							
							
							
							
								
							
							
								4478b9115c 
								
							 
						 
						
							
							
								
								Add rm_user mix task  
							
							
							
						 
						
							2018-04-12 02:43:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b910483c16 
								
							 
						 
						
							
							
								
								Fix register_user task.  
							
							
							
						 
						
							2018-04-10 21:05:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6744710908 
								
							 
						 
						
							
							
								
								Fixes 4: In Da Hood.  
							
							
							
						 
						
							2018-02-24 10:58:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								42f30d67fa 
								
							 
						 
						
							
							
								
								Fixes Christmas Special  
							
							
							
						 
						
							2018-02-24 10:52:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								541a4cbbb6 
								
							 
						 
						
							
							
								
								Oh no! More fixes!  
							
							
							
						 
						
							2018-02-24 10:51:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1555b7fab5 
								
							 
						 
						
							
							
								
								Add AP fixup task.  
							
							
							
						 
						
							2018-02-21 22:59:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56cfe71858 
								
							 
						 
						
							
							
								
								Add moderator task.  
							
							
							
						 
						
							2018-02-21 18:33:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								765671a5b0 
								
							 
						 
						
							
							
								
								Add password reset task.  
							
							
							
						 
						
							2018-02-21 18:24:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								d56ab43609 
								
							 
						 
						
							
							
								
								Ask for proxy URL if proxy enabled.  
							
							... 
							
							
							
							Also change the true/false question to y/n 
							
						 
						
							2018-01-12 22:38:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sebastian Huebner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29b7e822fb 
								
							 
						 
						
							
							
								
								added question about activating mediaproxy to config generator  
							
							
							
						 
						
							2018-01-09 12:31:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								964e2dd2f0 
								
							 
						 
						
							
							
								
								unfuck  
							
							
							
						 
						
							2017-12-04 04:06:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								6b60f5f64a 
								
							 
						 
						
							
							
								
								made psql script compatible with migrations or generate_config reruns  
							
							
							
						 
						
							2017-12-04 03:56:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								071f518028 
								
							 
						 
						
							
							
								
								reverts config gen  
							
							
							
						 
						
							2017-12-04 03:56:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								a884e08271 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2017-12-04 03:56:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								4071403117 
								
							 
						 
						
							
							
								
								fixes  
							
							
							
						 
						
							2017-12-04 03:56:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								0673511d39 
								
							 
						 
						
							
							
								
								first version of safe DB setup  
							
							
							
						 
						
							2017-12-04 03:56:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Iwakura 
								
							 
						 
						
							
							
							
							
								
							
							
								44dc694882 
								
							 
						 
						
							
							
								
								Add configuration generation tool, update readme.  
							
							
							
						 
						
							2017-11-23 16:22:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								40706b4c4f 
								
							 
						 
						
							
							
								
								Use changeset in user registration mix task.  
							
							
							
						 
						
							2017-04-15 16:42:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								8c2aad1cab 
								
							 
						 
						
							
							
								
								Make new users follow themselves.  
							
							
							
						 
						
							2017-04-14 17:29:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								567ec494c5 
								
							 
						 
						
							
							
								
								Add user registration mix task.  
							
							
							
						 
						
							2017-04-05 12:27:25 +02:00