Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								fe511a6c65 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/788-separate-email-addresses  
							
							
							
						 
						
							2019-04-10 18:06:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								fe13a1d78c 
								
							 
						 
						
							
							
								
								adding notify_email setting for trigger emails  
							
							
							
						 
						
							2019-04-10 17:57:41 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								012bb5dcc9 
								
							 
						 
						
							
							
								
								renaming expire_at -> expires_at  
							
							... 
							
							
							
							keyword style change 
							
						 
						
							2019-04-08 16:01:28 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								ce8d457132 
								
							 
						 
						
							
							
								
								little channges  
							
							
							
						 
						
							2019-04-06 22:38:35 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								47b07cec49 
								
							 
						 
						
							
							
								
								token -> invite renaming  
							
							
							
						 
						
							2019-04-06 20:24:22 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								0484f3a8b1 
								
							 
						 
						
							
							
								
								generating tokens with mix  
							
							
							
						 
						
							2019-04-06 16:58:22 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								cd41584ac4 
								
							 
						 
						
							
							
								
								Generate permissive or restrictive robots.txt in the config generator  
							
							
							
						 
						
							2019-04-03 22:12:58 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ce9284b36f 
								
							 
						 
						
							
							
								
								Merge branch 'remove-user-activities' into 'develop'  
							
							... 
							
							
							
							[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008  
							
						 
						
							2019-04-02 12:45:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1b3d921921 
								
							 
						 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)  
							
							
							
						 
						
							2019-04-02 17:01:26 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a14742f495 
								
							 
						 
						
							
							
								
								add user delete_activities mix task  
							
							
							
						 
						
							2019-04-02 16:30:11 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a1869f5272 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into remove-user-activities  
							
							
							
						 
						
							2019-04-02 15:41:30 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pearson 
								
							 
						 
						
							
							
							
							
								
							
							
								3dadaa4432 
								
							 
						 
						
							
							
								
								robots.txt  
							
							... 
							
							
							
							Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task. 
							
						 
						
							2019-03-15 02:28:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b73ca638e 
								
							 
						 
						
							
							
								
								[Credo][CI] Add readability as it’s fixed  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								16e598ec11 
								
							 
						 
						
							
							
								
								fix wording  
							
							
							
						 
						
							2019-03-12 22:12:05 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d013b58e84 
								
							 
						 
						
							
							
								
								add mix pleroma.user delete_activities NICKNAME task  
							
							
							
						 
						
							2019-03-12 22:04:08 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6ca633ddd3 
								
							 
						 
						
							
							
								
								Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)  
							
							
							
						 
						
							2019-02-09 16:31:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251 
								
							 
						 
						
							
							
								
								de-group alias/es  
							
							
							
						 
						
							2019-02-09 16:31:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd9b5fffbc 
								
							 
						 
						
							
							
								
								Mix.Tasks.Pleroma.Uploads: Fix typo in documentation  
							
							
							
						 
						
							2019-02-09 14:59:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bcfac93a8 
								
							 
						 
						
							
							
								
								Make credo happy  
							
							
							
						 
						
							2019-02-09 14:59:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								93e136d70b 
								
							 
						 
						
							
							
								
								mix: add user tag/untag task  
							
							
							
						 
						
							2019-02-04 17:04:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f94cc6d824 
								
							 
						 
						
							
							
								
								Mix.Tasks.Pleroma.Instance: Generate signing_salt  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/533  
							
						 
						
							2019-01-21 01:16:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									spctrl 
								
							 
						 
						
							
							
							
							
								
							
							
								4aa977d3b3 
								
							 
						 
						
							
							
								
								fix 486: Add option --assume-yes to allow it to work non-interactive  
							
							
							
						 
						
							2019-01-04 22:11:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									spctrl 
								
							 
						 
						
							
							
							
							
								
							
							
								ab9cda315f 
								
							 
						 
						
							
							
								
								Change 'name' to 'instance_name' so option is used when running non-interactive  
							
							
							
						 
						
							2018-12-29 12:43:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								69ad1039ba 
								
							 
						 
						
							
							
								
								mix tasks: add legal boilerplate  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b096e30cff 
								
							 
						 
						
							
							
								
								[ #114 ] Added email confirmation resend action. Added tests  
							
							... 
							
							
							
							for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users. 
							
						 
						
							2018-12-18 17:22:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									link0ff 
								
							 
						 
						
							
							
							
							
								
							
							
								22d483d4f7 
								
							 
						 
						
							
							
								
								Use bindings dbuser and dbname in sample_psql.eex  
							
							
							
						 
						
							2018-12-16 18:25:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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