rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a1c4a5d7cf 
								
							 
						 
						
							
							
								
								Fix a migration wiping user info of users that don't have any mutes  
							
							... 
							
							
							
							And introduce safe_jsonb_set 
							
						 
						
							2019-10-18 14:11:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1e6aa10168 
								
							 
						 
						
							
							
								
								Remove in-db configuration references from 1.1  
							
							... 
							
							
							
							It's still too unstable to be used. 
							
						 
						
							2019-10-04 16:17:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f884987ace 
								
							 
						 
						
							
							
								
								Merge branch 'admin-config-description' into 'develop'  
							
							... 
							
							
							
							Admin config description
Closes  #1178  and #1209 
See merge request pleroma/pleroma!1611  
							
						 
						
							2019-09-13 12:36:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5a76d5d239 
								
							 
						 
						
							
							
								
								Add extended benchmark  
							
							
							
						 
						
							2019-09-11 11:13:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								38b29779c3 
								
							 
						 
						
							
							
								
								refactoring  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								57dc59d98d 
								
							 
						 
						
							
							
								
								little fix  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								8f5ee7db06 
								
							 
						 
						
							
							
								
								typo fix  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								6721301086 
								
							 
						 
						
							
							
								
								some changes  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								0559c82bdb 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								511d93fa54 
								
							 
						 
						
							
							
								
								mix docs generates config.md  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								43f02dfe38 
								
							 
						 
						
							
							
								
								Revert "Parallelize template rendering"  
							
							... 
							
							
							
							This reverts commit 1ad71592ad 
							
						 
						
							2019-09-10 22:01:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8340fe8fcc 
								
							 
						 
						
							
							
								
								Merge branch 'digest-template' into 'develop'  
							
							... 
							
							
							
							Improve digest email template
See merge request pleroma/pleroma!1565  
							
						 
						
							2019-08-20 12:55:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e652cef76b 
								
							 
						 
						
							
							
								
								removes duplicates from relay subscription list  
							
							
							
						 
						
							2019-08-19 13:39:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1ad71592ad 
								
							 
						 
						
							
							
								
								Parallelize template rendering  
							
							
							
						 
						
							2019-08-15 18:05:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a9e75fa6a4 
								
							 
						 
						
							
							
								
								Add a task to benchmark timeline rendering  
							
							
							
						 
						
							2019-08-15 00:43:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4b7f1c6995 
								
							 
						 
						
							
							
								
								Improve digest email template  
							
							
							
						 
						
							2019-08-14 20:46:05 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								af4cf35e20 
								
							 
						 
						
							
							
								
								Strip internal fields including likes from incoming and outgoing activities  
							
							
							
						 
						
							2019-08-10 18:47:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29807ef6a5 
								
							 
						 
						
							
							
								
								Merge branch 'feature/digest-email' into 'develop'  
							
							... 
							
							
							
							Feature/digest email
See merge request pleroma/pleroma!1078  
							
						 
						
							2019-08-08 14:38:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								cef3af5536 
								
							 
						 
						
							
							
								
								tasks: relay: add list task  
							
							
							
						 
						
							2019-08-03 23:17:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8815f07058 
								
							 
						 
						
							
							
								
								tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155 
[ci skip] 
							
						 
						
							2019-08-02 23:38:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4f34fbcb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-08-02 18:16:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								51b3b6d816 
								
							 
						 
						
							
							
								
								Admin changes  
							
							
							
						 
						
							2019-07-30 16:36:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b93498eb52 
								
							 
						 
						
							
							
								
								constants: add as_public constant and use it everywhere  
							
							
							
						 
						
							2019-07-29 02:43:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								36049f08ef 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-20 01:03:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								9a8eb2c94d 
								
							 
						 
						
							
							
								
								mix: add pleroma.user unsubscribe_all_from_instance  
							
							
							
						 
						
							2019-07-19 19:25:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9bca70b10a 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-16 16:19:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								b8607c151c 
								
							 
						 
						
							
							
								
								migrating task refactor  
							
							
							
						 
						
							2019-07-15 15:45:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								c66044b923 
								
							 
						 
						
							
							
								
								atom keys with leading :  
							
							
							
						 
						
							2019-07-15 11:00:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b052a9d4d0 
								
							 
						 
						
							
							
								
								Update DigestEmailWorker to compile and send emails via queue  
							
							
							
						 
						
							2019-07-14 22:32:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eae991b06a 
								
							 
						 
						
							
							
								
								merge develop  
							
							
							
						 
						
							2019-07-12 18:08:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								75be90a6d1 
								
							 
						 
						
							
							
								
								Merge branch 'release/listener' into 'develop'  
							
							... 
							
							
							
							add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393  
							
						 
						
							2019-07-10 05:14:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								93a0eeab16 
								
							 
						 
						
							
							
								
								Add license/copyright to all project files  
							
							
							
						 
						
							2019-07-10 05:13:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								6d0ae264fc 
								
							 
						 
						
							
							
								
								add listener port and ip option for 'pleroma.instance gen' and enable its test  
							
							
							
						 
						
							2019-07-10 01:46:49 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-09 21:21:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								4e6e5d8042 
								
							 
						 
						
							
							
								
								reverse proxy tests  
							
							
							
						 
						
							2019-07-09 16:54:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								977c2d0448 
								
							 
						 
						
							
							
								
								tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058  
							
						 
						
							2019-07-05 06:19:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2286f62a36 
								
							 
						 
						
							
							
								
								Merge branch 'release-docs' into 'develop'  
							
							... 
							
							
							
							Docs on OTP releases
See merge request pleroma/pleroma!1315  
							
						 
						
							2019-06-28 15:26:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								c6705144a2 
								
							 
						 
						
							
							
								
								don't delete config settings on admin update  
							
							
							
						 
						
							2019-06-27 04:19:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c4ebb4d7 
								
							 
						 
						
							
							
								
								[ #184 ] small refactoring  reset password  
							
							
							
						 
						
							2019-06-24 19:01:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								8b7860f12f 
								
							 
						 
						
							
							
								
								Merge branch 'admin-config' into 'develop'  
							
							... 
							
							
							
							Admin config
See merge request pleroma/pleroma!1328  
							
						 
						
							2019-06-23 05:42:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								982cad0268 
								
							 
						 
						
							
							
								
								support for config groups  
							
							
							
						 
						
							2019-06-23 08:16:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3ac5ecbac1 
								
							 
						 
						
							
							
								
								Support RUM indexes in the config generator  
							
							
							
						 
						
							2019-06-22 12:54:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								51760c84b9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into release-docs  
							
							
							
						 
						
							2019-06-22 12:44:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ebee9f59d8 
								
							 
						 
						
							
							
								
								Ecto tasks: Resolve relative path using the application directory  
							
							... 
							
							
							
							instead of cwd and load the application before doing anything
In OTP releases cwd != app directory and the configuration is read
only if the application is loaded 
							
						 
						
							2019-06-22 04:17:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ee4e7c6570 
								
							 
						 
						
							
							
								
								Remove the getting started steps from pleroma.instance gen task  
							
							... 
							
							
							
							They are not compatible with every platform, different for OTP releases
and may become outdated. We are better off just telling people to refer
to the installation guides for their particular platform 
							
						 
						
							2019-06-22 02:07:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								452d5d3231 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into release-docs  
							
							
							
						 
						
							2019-06-22 02:00:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e76115989a 
								
							 
						 
						
							
							
								
								Move config templates to priv so they can be found in releases  
							
							
							
						 
						
							2019-06-21 19:54:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								89fead9250 
								
							 
						 
						
							
							
								
								Default DB configuration to false and set the default database name to  
							
							... 
							
							
							
							`pleroma` instead of `pleroma_dev` 
							
						 
						
							2019-06-21 06:42:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2437f51284 
								
							 
						 
						
							
							
								
								Merge branch 'fix/config-gen-releases' into 'develop'  
							
							... 
							
							
							
							Refactor mix tasks a bit and make config generator work with releases
See merge request pleroma/pleroma!1312  
							
						 
						
							2019-06-20 21:25:34 +00:00