lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fbc187ac15
								
							
						 | 
						
							
							
								
								Switch to Jason for json handling.
							
							
							
							
							
							
							
							It's twice as fast and will be the standard in the coming ecto. 
							
						 | 
						
							2018-03-27 16:09:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								611ca385de
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/activitypub
							
							
							
							
							
						 | 
						
							2018-03-08 12:37:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e20d5529a
								
							
						 | 
						
							
							
								
								Add way to disable federation.
							
							
							
							
							
						 | 
						
							2018-03-05 09:26:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								13ea3eafe5
								
							
						 | 
						
							
							
								
								Longer header lenght.
							
							
							
							
							
						 | 
						
							2018-02-24 18:33:44 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								52200998c9
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/activitypub
							
							
							
							
							
						 | 
						
							2018-02-11 09:50:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0745148a3
								
							
						 | 
						
							
							
								
								Add config option for enabling/disabling chat.
							
							
							
							
							
						 | 
						
							2018-02-03 13:42:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								15cb3f2b01
								
							
						 | 
						
							
							
								
								Revert renaming emoji.txt
							
							
							
							
							
						 | 
						
							2018-01-31 23:47:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab8b9ababa
								
							
						 | 
						
							
							
								
								Split emoji to default and custom.
							
							
							
							
							
						 | 
						
							2018-01-31 16:29:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f23ae5b68
								
							
						 | 
						
							
							
								
								Merge branch 'pr-upstream-http-proxy' into 'develop'
							
							
							
							
							
							
							
							Pr upstream http proxy
See merge request pleroma/pleroma!43 
							
						 | 
						
							2018-01-30 08:16:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeff Becker
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								066fe1a697
								
							
						 | 
						
							
							
								
								use nil instead of empty string
							
							
							
							
							
						 | 
						
							2018-01-29 10:06:16 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								8db83c3dc0
								
							
						 | 
						
							
							
								
								Merge branch 'feature/longfox' into 'develop'
							
							
							
							
							
							
							
							add longfox emojis
See merge request pleroma/pleroma!53 
							
						 | 
						
							2018-01-27 11:57:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e1d4819ca
								
							
						 | 
						
							
							
								
								add longfox emojis
							
							
							
							
							
						 | 
						
							2018-01-27 08:38:48 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeff Becker
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								dffde6631d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
							
							
							
							
							
						 | 
						
							2018-01-24 13:15:54 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								048f61d7f8
								
							
						 | 
						
							
							
								
								#95 Correct prod.exs
							
							
							
							
							
						 | 
						
							2018-01-14 08:54:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeff Becker
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								658c4754ff
								
							
						 | 
						
							
							
								
								docs
							
							
							
							
							
						 | 
						
							2017-12-30 13:08:43 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeff Becker
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5ddd15d794
								
							
						 | 
						
							
							
								
								make httppoison use configurable http proxy
							
							
							
							
							
						 | 
						
							2017-12-30 13:08:36 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5599c5920c
								
							
						 | 
						
							
							
								
								Basic incoming AP support.
							
							
							
							
							
						 | 
						
							2017-12-11 10:37:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1cb5cbdc6c
								
							
						 | 
						
							
							
								
								Improve error handling, add configuration
							
							
							
							
							
						 | 
						
							2017-11-28 21:44:25 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								44dc694882
								
							
						 | 
						
							
							
								
								Add configuration generation tool, update readme.
							
							
							
							
							
						 | 
						
							2017-11-23 16:22:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5794558077
								
							
						 | 
						
							
							
								
								Read variable for testing db.
							
							
							
							
							
						 | 
						
							2017-11-02 17:45:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c82b82197
								
							
						 | 
						
							
							
								
								Make emoji configurable in files.
							
							
							
							
							
						 | 
						
							2017-09-16 16:49:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								c20530e708
								
							
						 | 
						
							
							
								
								Add configuration option for registrations.
							
							
							
							
							
						 | 
						
							2017-09-15 14:39:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								50409326a8
								
							
						 | 
						
							
							
								
								Refactor posting and make character limit configurable.
							
							
							
							
							
						 | 
						
							2017-09-15 14:17:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac2893a945
								
							
						 | 
						
							
							
								
								Add instance config options.
							
							
							
							
							
						 | 
						
							2017-09-15 10:26:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d982f04a65
								
							
						 | 
						
							
							
								
								Mock HTTPoison in testing.
							
							
							
							
							
						 | 
						
							2017-05-05 14:16:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								1422e7aa84
								
							
						 | 
						
							
							
								
								Handle incoming websub subscriptions.
							
							
							
							
							
						 | 
						
							2017-04-28 15:45:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								8fb73c28bb
								
							
						 | 
						
							
							
								
								Only have one subscription per callback.
							
							
							
							
							
						 | 
						
							2017-04-22 13:44:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce6cc84a4a
								
							
						 | 
						
							
							
								
								Add basic webfinger.
							
							
							
							
							
						 | 
						
							2017-04-17 13:44:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7dc39e40c
								
							
						 | 
						
							
							
								
								Basic file uploading via TwAPI.
							
							
							
							
							
						 | 
						
							2017-03-29 02:07:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								08fdbd6f3a
								
							
						 | 
						
							
							
								
								Add Uploads.
							
							
							
							
							
						 | 
						
							2017-03-29 01:39:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								e32dbfc9a5
								
							
						 | 
						
							
							
								
								Add basic auth.
							
							
							
							
							
						 | 
						
							2017-03-20 17:56:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a93f3421a7
								
							
						 | 
						
							
							
								
								Phoenix skeleton
							
							
							
							
							
						 | 
						
							2017-03-17 17:09:58 +01:00 | 
						
						
							
							
							
								
							
							
						 |