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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								39c7bbe18f 
								
							 
						 
						
							
							
								
								Remove longfox emoji set  
							
							 
							
							
							
						 
						
							2019-08-04 04:32:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ashlynn Anderson 
								
							 
						 
						
							
							
							
							
								
							
							
								4007717534 
								
							 
						 
						
							
							
								
								Run mix format  
							
							 
							
							
							
						 
						
							2019-08-03 13:42:57 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ashlynn Anderson 
								
							 
						 
						
							
							
							
							
								
							
							
								4a418698db 
								
							 
						 
						
							
							
								
								Create docker.exs and docker-entrypoint + round out Dockerfile  
							
							 
							
							... 
							
							
							
							At this point, the implementation is completely working and has been
tested running live and federating with other instances. 
							
						 
						
							2019-08-03 00:21:54 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4f34fbcb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-08-02 18:16:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c88a5d3251 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/hide-follows-remote  
							
							 
							
							
							
						 
						
							2019-07-31 14:12:29 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								242f5c585e 
								
							 
						 
						
							
							
								
								add account confirmation email resend in mastodon api  
							
							 
							
							
							
						 
						
							2019-07-28 20:30:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								196cad46f3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							 
							
							
							
						 
						
							2019-07-20 22:04:47 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								36049f08ef 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-07-20 01:03:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								33729bbb28 
								
							 
						 
						
							
							
								
								Merge branch 'feature/richmedia-ttl' into 'develop'  
							
							 
							
							... 
							
							
							
							add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438  
							
						 
						
							2019-07-19 21:36:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								1345e0c2bf 
								
							 
						 
						
							
							
								
								tests: add tests for signed object fetches  
							
							 
							
							
							
						 
						
							2019-07-17 23:06:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b2a8ccf37f 
								
							 
						 
						
							
							
								
								config: add sign_object_fetches option  
							
							 
							
							
							
						 
						
							2019-07-17 21:38:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								10f82c88b8 
								
							 
						 
						
							
							
								
								mastoapi password reset  
							
							 
							
							... 
							
							
							
							added rate limit to password reset
configure rate limit in runtime 
							
						 
						
							2019-07-16 21:44:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								18234cc44e 
								
							 
						 
						
							
							
								
								add the rich media ttl based on image exp time  
							
							 
							
							
							
						 
						
							2019-07-17 00:20:34 +05:45  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								889dc17abd 
								
							 
						 
						
							
							
								
								[ #1094 ] Rate-limited follow & unfollow actions.  
							
							 
							
							
							
						 
						
							2019-07-16 19:18:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c729883936 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-07-14 21:43:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f4447d82b8 
								
							 
						 
						
							
							
								
								parsers configurable  
							
							 
							
							
							
						 
						
							2019-07-14 09:21:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								80c46d6d8b 
								
							 
						 
						
							
							
								
								nodeinfo: implement MRF transparency exclusions  
							
							 
							
							
							
						 
						
							2019-07-13 18:53:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e8fa477793 
								
							 
						 
						
							
							
								
								Refactor Follows/Followers counter syncronization  
							
							 
							
							... 
							
							
							
							- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page 
							
						 
						
							2019-07-13 19:27:49 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								f4c001062e 
								
							 
						 
						
							
							
								
								Merge branch '1041-status-actions-rate-limit' into 'develop'  
							
							 
							
							... 
							
							
							
							Rate-limited status actions (per user and per user+status).
Closes  #1041 
See merge request pleroma/pleroma!1410  
							
						 
						
							2019-07-13 14:17:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								369e9bb42f 
								
							 
						 
						
							
							
								
								[ #1041 ] Rate-limited status actions (per user and per user+status).  
							
							 
							
							
							
						 
						
							2019-07-13 14:49:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fa7e0c4262 
								
							 
						 
						
							
							
								
								Workaround for remote server certificate chain issues  
							
							 
							
							
							
						 
						
							2019-07-12 23:53:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eae991b06a 
								
							 
						 
						
							
							
								
								merge develop  
							
							 
							
							
							
						 
						
							2019-07-12 18:08:27 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4198c3ac39 
								
							 
						 
						
							
							
								
								Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel  
							
							 
							
							
							
						 
						
							2019-07-11 13:55:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								59e16fc45a 
								
							 
						 
						
							
							
								
								enable synchronization by default  
							
							 
							
							
							
						 
						
							2019-07-10 18:55:11 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								beba7bbc85 
								
							 
						 
						
							
							
								
								removing synchronization worker  
							
							 
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								12b1454245 
								
							 
						 
						
							
							
								
								[ #1062 ] added option to disable send email  
							
							 
							
							
							
						 
						
							2019-07-10 05:34:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-07-09 21:21:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b0fce6e9 
								
							 
						 
						
							
							
								
								Fix/1019 correct count remote users  
							
							 
							
							
							
						 
						
							2019-07-09 17:36:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								4e6e5d8042 
								
							 
						 
						
							
							
								
								reverse proxy tests  
							
							 
							
							
							
						 
						
							2019-07-09 16:54:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								1ab4e35f27 
								
							 
						 
						
							
							
								
								Merge branch 'enable-ogp-by-default' into 'develop'  
							
							 
							
							... 
							
							
							
							Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes  #1034 
See merge request pleroma/pleroma!1388  
							
						 
						
							2019-07-09 16:07:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								95c085174d 
								
							 
						 
						
							
							
								
								Merge branch 'test-speedup' into 'develop'  
							
							 
							
							... 
							
							
							
							Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391  
							
						 
						
							2019-07-09 15:35:28 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								abe2e8881f 
								
							 
						 
						
							
							
								
								Testing: Don't federate in testing.  
							
							 
							
							
							
						 
						
							2019-07-09 15:30:51 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								682f1897b7 
								
							 
						 
						
							
							
								
								Enable OpenGraph and TwitterCard by default  
							
							 
							
							... 
							
							
							
							Closes  #1034  
							
						 
						
							2019-07-08 13:00:45 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b9d914089 
								
							 
						 
						
							
							
								
								[ #161 ] Refactoring, documentation.  
							
							 
							
							
							
						 
						
							2019-06-30 15:58:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							 
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f8ec3e129f 
								
							 
						 
						
							
							
								
								In my experience syslog tags are usually lowercase  
							
							 
							
							
							
						 
						
							2019-06-27 13:00:22 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9f8e645dce 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configurable-pack-extensions' into 'develop'  
							
							 
							
							... 
							
							
							
							Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338  
							
						 
						
							2019-06-26 05:34:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								41e4752950 
								
							 
						 
						
							
							
								
								Make default pack extensions configurable and default to png and gif  
							
							 
							
							
							
						 
						
							2019-06-26 06:48:59 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad15ad2a9 
								
							 
						 
						
							
							
								
								add ignore hosts and TLDs for rich_media  
							
							 
							
							
							
						 
						
							2019-06-25 22:25:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								875100de01 
								
							 
						 
						
							
							
								
								Bind to 127.0.0.1 instead of 0.0.0.0 by default  
							
							 
							
							
							
						 
						
							2019-06-23 09:31:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								32320c1ee9 
								
							 
						 
						
							
							
								
								Fixes for dynamic configuration  
							
							 
							
							
							
						 
						
							2019-06-20 17:43:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f30a3241d2 
								
							 
						 
						
							
							
								
								Deps: Update auto_linker  
							
							 
							
							
							
						 
						
							2019-06-18 16:08:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								c2ca1f22a2 
								
							 
						 
						
							
							
								
								it is changed in compile time  
							
							 
							
							... 
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 
						
							2019-06-14 15:45:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ce823fa88e 
								
							 
						 
						
							
							
								
								Fix rate limit test  
							
							 
							
							
							
						 
						
							2019-06-14 19:24:31 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ac3d43e620 
								
							 
						 
						
							
							
								
								Set instance static/uploads to be outside of application directory in release config  
							
							 
							
							... 
							
							
							
							In case of releases the application directory changes with each version
so the contents will not be accessible 
							
						 
						
							2019-06-14 01:42:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								822a9f28d0 
								
							 
						 
						
							
							
								
								Merge branch 'release-config-import' into 'develop'  
							
							 
							
							... 
							
							
							
							Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing
See merge request pleroma/pleroma!1269  
							
						 
						
							2019-06-12 09:58:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f0d96534a4 
								
							 
						 
						
							
							
								
								Import release config from env variable or /etc/pleroma/config.exs and  
							
							 
							
							... 
							
							
							
							warn if the file is missing 
							
						 
						
							2019-06-11 18:55:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6f29865d43 
								
							 
						 
						
							
							
								
								Add option to restrict all users to local content  
							
							 
							
							
							
						 
						
							2019-06-11 21:25:53 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								5d5a9a3a35 
								
							 
						 
						
							
							
								
								Better default parameters for suggestion  
							
							 
							
							
							
						 
						
							2019-06-11 11:34:22 +00:00