csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								4dfb40a546 
								
							 
						 
						
							
							
								
								Handle cases where a to/cc field is absent on a status  
							
							
							
						 
						
							2018-05-14 21:54:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								2ce48c1a42 
								
							 
						 
						
							
							
								
								Formatting  
							
							
							
						 
						
							2018-05-13 15:36:41 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								9aabff4883 
								
							 
						 
						
							
							
								
								Fix tests.  
							
							
							
						 
						
							2018-05-13 15:33:59 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								c8d418acdd 
								
							 
						 
						
							
							
								
								api/v1/timelines/direct implementation  
							
							
							
						 
						
							2018-05-12 21:50:59 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								392bd9ef56 
								
							 
						 
						
							
							
								
								Stream function to handle direct messages.  
							
							
							
						 
						
							2018-05-12 17:40:59 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								c60a5405db 
								
							 
						 
						
							
							
								
								Detect and try to stream incoming "direct" messages  
							
							
							
						 
						
							2018-05-12 17:40:59 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ffe028cd73 
								
							 
						 
						
							
							
								
								More warning fixes.  
							
							
							
						 
						
							2018-05-07 18:11:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								6c2903d9a1 
								
							 
						 
						
							
							
								
								Merge branch 'feld-warnings' into 'develop'  
							
							... 
							
							
							
							Clean up warnings
See merge request pleroma/pleroma!144  
							
						 
						
							2018-05-06 18:42:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								bfad57c7c9 
								
							 
						 
						
							
							
								
								Get rid of unsafe variables.  
							
							
							
						 
						
							2018-05-06 09:58:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9810153aeb 
								
							 
						 
						
							
							
								
								Streamer: Don't send out stream events for blocked users.  
							
							
							
						 
						
							2018-05-05 13:40:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								96add86b50 
								
							 
						 
						
							
							
								
								Unify wss uri generation.  
							
							
							
						 
						
							2018-05-05 13:40:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c464355d1a 
								
							 
						 
						
							
							
								
								Idempotency: Use special cache, keep for 6 hours.  
							
							
							
						 
						
							2018-05-05 11:15:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7a884d70d8 
								
							 
						 
						
							
							
								
								Group def renders here as well  
							
							
							
						 
						
							2018-05-04 22:31:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								31ea9cbcd8 
								
							 
						 
						
							
							
								
								Group def renders together to fix warning  
							
							
							
						 
						
							2018-05-04 22:28:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								14c0c6d16b 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2018-05-04 22:03:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2a402fb395 
								
							 
						 
						
							
							
								
								Group response declarations together  
							
							
							
						 
						
							2018-05-04 21:59:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a24eed0f57 
								
							 
						 
						
							
							
								
								That last change was stupid. Multiline comments in Elixir don't really exist.  
							
							... 
							
							
							
							Instead we'll just pad with # intstead of playing stupid games with the compiler. 
							
						 
						
							2018-05-04 21:53:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								79d41aa12e 
								
							 
						 
						
							
							
								
								Dirty hack to remove the warning  
							
							... 
							
							
							
							warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings)
  lib/pleroma/web/activity_pub/transmogrifier.ex 
							
						 
						
							2018-05-04 21:48:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								aaacebd906 
								
							 
						 
						
							
							
								
								Fix unused variables, imports, and aliases  
							
							
							
						 
						
							2018-05-04 21:42:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								42f1a098aa 
								
							 
						 
						
							
							
								
								Fix build. Too eager with the fixing of unused variables.  
							
							... 
							
							
							
							== Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex ==
** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0
    (stdlib) lists.erl:1338: :lists.foreach/2
    (stdlib) erl_eval.erl:670: :erl_eval.do_apply/6 
							
						 
						
							2018-05-04 21:26:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								943820ae29 
								
							 
						 
						
							
							
								
								More unused variables  
							
							
							
						 
						
							2018-05-04 21:16:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4aa5720a 
								
							 
						 
						
							
							
								
								Fix a bunch of unused variable warnings  
							
							
							
						 
						
							2018-05-04 20:59:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								11a1241d41 
								
							 
						 
						
							
							
								
								Merge branch 'feature/nodeinfo' into 'develop'  
							
							... 
							
							
							
							Implements the nodeinfo endpoints
See merge request pleroma/pleroma!140  
							
						 
						
							2018-05-04 19:17:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								90c4bed0af 
								
							 
						 
						
							
							
								
								Don't expire idempotency cache for five minutes.  
							
							
							
						 
						
							2018-05-04 21:15:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fcd3eca167 
								
							 
						 
						
							
							
								
								MastodonAPI: Support idempotency key.  
							
							
							
						 
						
							2018-05-04 20:30:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3f9e24c70 
								
							 
						 
						
							
							
								
								Use a variable for stats to avoid double call  
							
							
							
						 
						
							2018-05-03 15:31:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								724f096ac7 
								
							 
						 
						
							
							
								
								Add metadata.nodeName  
							
							
							
						 
						
							2018-05-03 10:52:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								804497542d 
								
							 
						 
						
							
							
								
								Return the right content-type for the schema call  
							
							
							
						 
						
							2018-05-03 10:50:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e448734952 
								
							 
						 
						
							
							
								
								Explicit error message  
							
							
							
						 
						
							2018-05-02 22:45:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fd0bf3aa71 
								
							 
						 
						
							
							
								
								Simplify version and fix typo  
							
							
							
						 
						
							2018-05-02 22:44:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b8789cc8b6 
								
							 
						 
						
							
							
								
								Add localPosts count, also set to 0 if null  
							
							
							
						 
						
							2018-05-02 22:36:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								abeb009acc 
								
							 
						 
						
							
							
								
								Change path of nodeinfo to use .json format  
							
							
							
						 
						
							2018-05-02 22:16:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65168393d8 
								
							 
						 
						
							
							
								
								Format files  
							
							
							
						 
						
							2018-05-02 21:43:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67dadd954e 
								
							 
						 
						
							
							
								
								Add first try at nodeinfo  
							
							
							
						 
						
							2018-05-02 21:31:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bc215f5684 
								
							 
						 
						
							
							
								
								Fix format.  
							
							
							
						 
						
							2018-04-29 11:28:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								b7584edcea 
								
							 
						 
						
							
							
								
								Merge branch 'patch-bio' into 'develop'  
							
							... 
							
							
							
							replace newlines in profiles with <br>
See merge request pleroma/pleroma!136  
							
						 
						
							2018-04-29 09:26:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4d55d7c95e 
								
							 
						 
						
							
							
								
								Insert object after being rewritten.  
							
							
							
						 
						
							2018-04-28 16:10:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								a7a40bb8f1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/blocked-user-boosts' into 'develop'  
							
							... 
							
							
							
							ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111  
							
						 
						
							2018-04-28 13:49:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								634c0c52a1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into patch-bio  
							
							
							
						 
						
							2018-04-28 11:59:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								39c80a3667 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'  
							
							... 
							
							
							
							ActivityPub MRF SimplePolicy: fix media stripping
See merge request pleroma/pleroma!133  
							
						 
						
							2018-04-27 05:49:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								90bbd94614 
								
							 
						 
						
							
							
								
								ActivityPub MRF SimplePolicy: fix media stripping  
							
							
							
						 
						
							2018-04-25 16:28:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								845bd56c9c 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' into 'develop'  
							
							... 
							
							
							
							Fix typo in MastoFE login page.
See merge request pleroma/pleroma!132  
							
						 
						
							2018-04-25 14:35:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a7eb148d61 
								
							 
						 
						
							
							
								
								Optionally deactivate public timelines.  
							
							
							
						 
						
							2018-04-25 16:11:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								279b1d19f0 
								
							 
						 
						
							
							
								
								Align local bio limits to remote limit.  
							
							
							
						 
						
							2018-04-25 15:41:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Normandy 
								
							 
						 
						
							
							
							
							
								
							
							
								715c90e54f 
								
							 
						 
						
							
							
								
								Fix typo in MastoFE login page.  
							
							... 
							
							
							
							see https://git.pleroma.social/pleroma/mastofe/issues/13  
							
						 
						
							2018-04-24 21:58:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c78e7d8b11 
								
							 
						 
						
							
							
								
								Fix formatting.  
							
							
							
						 
						
							2018-04-24 21:25:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								7a52c4549c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/message-rewrite-facility' into 'develop'  
							
							... 
							
							
							
							message rewrite facility
See merge request pleroma/pleroma!112  
							
						 
						
							2018-04-24 17:21:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								7517155544 
								
							 
						 
						
							
							
								
								Changed to support \r\n and \n  
							
							
							
						 
						
							2018-04-24 13:28:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								52ee91efce 
								
							 
						 
						
							
							
								
								Patch to replace newlines with <br> tags in bio  
							
							
							
						 
						
							2018-04-24 13:20:17 +01:00