Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								6160a1b3c0 
								
							 
						 
						
							
							
								
								mix format  
							
							
							
						 
						
							2018-06-24 15:24:41 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								1299bccc7d 
								
							 
						 
						
							
							
								
								return unquoted empty array from /api/qvitter/mutes.json  
							
							
							
						 
						
							2018-06-23 23:20:30 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								6316003946 
								
							 
						 
						
							
							
								
								fixes- found that TwitterAPI.Controller adds .json suffix already  
							
							
							
						 
						
							2018-06-23 23:05:54 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								f2badd4424 
								
							 
						 
						
							
							
								
								return empty array for api/qvitter/mutes.json queries instead of html  
							
							
							
						 
						
							2018-06-23 22:21:39 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								60d6038be5 
								
							 
						 
						
							
							
								
								mrf simple: add accept lists  
							
							... 
							
							
							
							accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space. 
							
						 
						
							2018-06-19 21:28:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								90cf75f4a7 
								
							 
						 
						
							
							
								
								Merge branch 'features/column_media_streaming' into 'develop'  
							
							... 
							
							
							
							Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225  
							
						 
						
							2018-06-19 09:50:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								be800d7936 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/block-follow-relationships' into 'develop'  
							
							... 
							
							
							
							fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230  
							
						 
						
							2018-06-19 09:42:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								056305dfa7 
								
							 
						 
						
							
							
								
								user: add helper function to fetch a user given only an ap_id (fix tests)  
							
							
							
						 
						
							2018-06-19 08:31:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								db0731b6ac 
								
							 
						 
						
							
							
								
								Merge branch 'feature/exclude-replies-filter' into 'develop'  
							
							... 
							
							
							
							activitypub: support filtering activities by whether or not they are a reply (closes  #109 )
Closes  #109 
See merge request pleroma/pleroma!226  
							
						 
						
							2018-06-19 05:15:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								320ca7b11e 
								
							 
						 
						
							
							
								
								user: when processing a block in User.block(), ensure all follow relationships are broken  
							
							... 
							
							
							
							this is needed for activitypub conformance
ref #213  
							
						 
						
							2018-06-19 00:59:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c95941e64d 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: fix handling of contentMap.  
							
							
							
						 
						
							2018-06-18 22:14:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4f589998ee 
								
							 
						 
						
							
							
								
								activitypub: support filtering activities by whether or not they are a reply ( closes   #109 )  
							
							
							
						 
						
							2018-06-18 03:21:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b670d4d683 
								
							 
						 
						
							
							
								
								MastodonAPI: Add streaming to media tabs of federated and local TLs  
							
							
							
						 
						
							2018-06-17 16:17:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								1ea4a18ad8 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'  
							
							... 
							
							
							
							Configs for mrf_rejectnonpublic
See merge request pleroma/pleroma!205  
							
						 
						
							2018-06-16 10:39:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								a938d07df1 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mastofe_thread_render' into 'develop'  
							
							... 
							
							
							
							lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223  
							
						 
						
							2018-06-15 20:43:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72c2915ecd 
								
							 
						 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads  
							
							
							
						 
						
							2018-06-15 22:14:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00d7d109ef 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2018-06-15 22:01:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								de20c8d620 
								
							 
						 
						
							
							
								
								Merge branch 'fix/missing-file-extension' into 'develop'  
							
							... 
							
							
							
							Add missing file extension if file does not have one
See merge request pleroma/pleroma!222  
							
						 
						
							2018-06-14 19:11:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								0a95b5594b 
								
							 
						 
						
							
							
								
								Add missing file extension if file does not have one  
							
							
							
						 
						
							2018-06-14 12:16:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								12c7a023de 
								
							 
						 
						
							
							
								
								upload.ex: add MPEG Layer 3 file header.  
							
							
							
						 
						
							2018-06-14 16:41:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								2723fb5150 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mrf-orphaning' into 'develop'  
							
							... 
							
							
							
							activitypub transmogrifier: handle activity lookup failure
Closes  #156 
See merge request pleroma/pleroma!216  
							
						 
						
							2018-06-14 07:20:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								8c7fdcb31b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/twitterapi-unrepeat' into 'develop'  
							
							... 
							
							
							
							Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218  
							
						 
						
							2018-06-14 07:19:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								2c303b3302 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/oauth2-param-name' into 'develop'  
							
							... 
							
							
							
							oauth: support either name or username parameter with grant_type=password
Closes  #180 
See merge request pleroma/pleroma!219  
							
						 
						
							2018-06-14 07:14:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								280ac243aa 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/oauth-password-with-email' into 'develop'  
							
							... 
							
							
							
							oauth: fix password-based login when username is email address
Closes  #199 
See merge request pleroma/pleroma!220  
							
						 
						
							2018-06-14 07:13:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5442466569 
								
							 
						 
						
							
							
								
								oauth: fix password-based login when username is email address  
							
							... 
							
							
							
							closes  #199  
						
							2018-06-14 02:32:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4894b88b1b 
								
							 
						 
						
							
							
								
								oauth: support either name or username parameter with grant_type=password  
							
							... 
							
							
							
							closes  #180  
						
							2018-06-14 02:07:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								1555c66650 
								
							 
						 
						
							
							
								
								Add unretweet TwAPI endpoint and cleanup AP.unannounce  
							
							
							
						 
						
							2018-06-13 21:33:36 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								401e8af943 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: handle activity lookup failure  
							
							... 
							
							
							
							with the introduction of MRF, it is possible that an activity may be orphaned from it's parent, if
an activity in the chain was rejected by the active MRF policies.  accordingly, handle this in the
same way as any other orphaned activity.
closes  #156  
							
						 
						
							2018-06-13 22:19:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b5bc08fac3 
								
							 
						 
						
							
							
								
								streamer: don't relay boosts of messages which would otherwise be blocked  
							
							
							
						 
						
							2018-06-13 21:59:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ea42ba603f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'  
							
							... 
							
							
							
							webfinger: send JRD by default instead of XRD
See merge request pleroma/pleroma!211  
							
						 
						
							2018-06-13 07:18:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3d402a9e20 
								
							 
						 
						
							
							
								
								webfinger: send JRD by default instead of XRD  
							
							... 
							
							
							
							JRD being the default representation for WebFinger responses was standardized 5 years ago in
RFC 7033. 
							
						 
						
							2018-06-13 07:03:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								59f95a7095 
								
							 
						 
						
							
							
								
								webfinger: refactor webfinger() functions  
							
							... 
							
							
							
							- remove code duplication
- move user lookup to parent with statement
- tighten both user lookup by nickname and activitypub URI with a type constraint 
							
						 
						
							2018-06-13 06:42:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								3326205f95 
								
							 
						 
						
							
							
								
								set_moderator: ensureall applications are started.  
							
							
							
						 
						
							2018-06-12 15:42:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								3f42806b1b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'develop'  
							
							... 
							
							
							
							Dedupe uploads
See merge request pleroma/pleroma!115  
							
						 
						
							2018-06-12 08:26:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f34232da86 
								
							 
						 
						
							
							
								
								Update sample_config.eex  
							
							
							
						 
						
							2018-06-12 07:23:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								564c73ab24 
								
							 
						 
						
							
							
								
								Merge branch 'feature/list-streaming' into 'develop'  
							
							... 
							
							
							
							MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183  
							
						 
						
							2018-06-12 07:19:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9810471237 
								
							 
						 
						
							
							
								
								router: remove stub /domain_blocks entry  
							
							
							
						 
						
							2018-06-11 23:40:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f8e0942745 
								
							 
						 
						
							
							
								
								twitter api: add approve/deny endpoints  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e08cf21e5b 
								
							 
						 
						
							
							
								
								twitter api: add friend requests list api  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ba8dab7542 
								
							 
						 
						
							
							
								
								twitterapi: user view: return if an account is locked or not  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d96377f359 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5eed1ea181 
								
							 
						 
						
							
							
								
								run mix format  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								993312cdb3 
								
							 
						 
						
							
							
								
								twitterapi: add profile setting for locked/unlocked accounts  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4084889a2d 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: remove debug code  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1452b2823f 
								
							 
						 
						
							
							
								
								user: add a workaround for situations where Pleroma may believe a followee is followed  
							
							... 
							
							
							
							this was caused by lack of Undo follows in the early days, and can likely be eventually removed 
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								76f80ba8c2 
								
							 
						 
						
							
							
								
								activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a2c4a5a75b 
								
							 
						 
						
							
							
								
								mastodon api: allow setting an account locked or not  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ad7188fe92 
								
							 
						 
						
							
							
								
								user: use Enum.uniq on the follow request query  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f328de8eb7 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: send Rejects in the format Mastodon wants  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								876ad6aa38 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: send @context on accept activities  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00