lain 
								
							 
						 
						
							
							
							
							
								
							
							
								71c8c60ded 
								
							 
						 
						
							
							
								
								More speedup, test fixes.  
							
							
							
						 
						
							2019-02-17 17:47:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d0a94f98e0 
								
							 
						 
						
							
							
								
								more tests for HellthreadPolicy  
							
							
							
						 
						
							2019-02-17 14:33:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d3fe2c8ec6 
								
							 
						 
						
							
							
								
								[ #468 ] Formatting fix.  
							
							
							
						 
						
							2019-02-17 14:07:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bc4f77b10b 
								
							 
						 
						
							
							
								
								[ #468 ] Merged upstream/develop, resolved conflicts.  
							
							
							
						 
						
							2019-02-17 14:07:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								dcf24a3233 
								
							 
						 
						
							
							
								
								[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.  
							
							
							
						 
						
							2019-02-17 13:49:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fa191a658b 
								
							 
						 
						
							
							
								
								Speed up docker postgres.  
							
							
							
						 
						
							2019-02-17 11:46:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8f98d970c1 
								
							 
						 
						
							
							
								
								Fix recipient count in hellthread policy  
							
							
							
						 
						
							2019-02-17 13:46:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ccd30a1875 
								
							 
						 
						
							
							
								
								Fix formating  
							
							
							
						 
						
							2019-02-17 12:07:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								006bec8c6a 
								
							 
						 
						
							
							
								
								Add differences in MastoAPI responses to mix.exs extras  
							
							
							
						 
						
							2019-02-17 10:34:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72a4272d84 
								
							 
						 
						
							
							
								
								Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching  
							
							
							
						 
						
							2019-02-16 19:52:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4df455f69b 
								
							 
						 
						
							
							
								
								[MastoAPI] Add switching of frontend flavours  
							
							
							
						 
						
							2019-02-16 19:50:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								25ab90edea 
								
							 
						 
						
							
							
								
								mix.exs: Add docs/Clients.md to docs.extras  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-02-16 19:39:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c788f1543c 
								
							 
						 
						
							
							
								
								Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too  
							
							
							
						 
						
							2019-02-16 21:14:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3b14119471 
								
							 
						 
						
							
							
								
								Merge branch 'welcome-message' into 'develop'  
							
							... 
							
							
							
							Add optional welcome message.
See merge request pleroma/pleroma!832  
							
						 
						
							2019-02-16 17:39:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								96c725328b 
								
							 
						 
						
							
							
								
								Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon  
							
							
							
						 
						
							2019-02-16 20:38:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								27375e5575 
								
							 
						 
						
							
							
								
								WelcomeMessage: specify that the user has to be local.  
							
							
							
						 
						
							2019-02-16 17:25:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								269d3e1ca6 
								
							 
						 
						
							
							
								
								WelcomeMessage: Get rid of Ecto reference.  
							
							
							
						 
						
							2019-02-16 17:24:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f469a8610f 
								
							 
						 
						
							
							
								
								Check that the welcome message is sent from the correct user.  
							
							
							
						 
						
							2019-02-16 17:24:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								38e15930cb 
								
							 
						 
						
							
							
								
								Add option to return all friends in twitter api.  
							
							... 
							
							
							
							Mainly useful for user export. 
							
						 
						
							2019-02-16 17:01:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d812a347ca 
								
							 
						 
						
							
							
								
								Add optional welcome message.  
							
							
							
						 
						
							2019-02-16 16:42:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2a4a4f3342 
								
							 
						 
						
							
							
								
								[ #468 ] Defined OAuth restrictions for all applicable routes.  
							
							... 
							
							
							
							Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize. 
							
						 
						
							2019-02-15 19:54:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								1ce1b7b58d 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/oauth-token-padding' into 'develop'  
							
							... 
							
							
							
							oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825  
							
						 
						
							2019-02-15 14:58:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								921571c19b 
								
							 
						 
						
							
							
								
								Merge branch 'hellthread-filter-fix' into 'develop'  
							
							... 
							
							
							
							Hellthread filter fix
Closes  #634 
See merge request pleroma/pleroma!831  
							
						 
						
							2019-02-15 13:18:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c2e0a0c8d4 
								
							 
						 
						
							
							
								
								Readd threshold is not 0 check, optmization?  
							
							
							
						 
						
							2019-02-15 14:05:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								dca6bee2f7 
								
							 
						 
						
							
							
								
								Rename test, add check for follower collection when delisting  
							
							
							
						 
						
							2019-02-15 13:43:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b63a5e309d 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/actor-containment' into 'develop'  
							
							... 
							
							
							
							activitypub: correctly handle bare URIs in user lookup
Closes  #645 
See merge request pleroma/pleroma!829  
							
						 
						
							2019-02-15 12:27:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								d943c90249 
								
							 
						 
						
							
							
								
								Add tests, change default config values, fix a bug  
							
							
							
						 
						
							2019-02-15 12:47:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								ecdf0657ba 
								
							 
						 
						
							
							
								
								Add logic for keeping follow_request_count up-to-date on the follow,  
							
							... 
							
							
							
							`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view. 
							
						 
						
							2019-02-15 12:20:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								32b1649434 
								
							 
						 
						
							
							
								
								test: user: add a test for whether user search returns a user or not  
							
							
							
						 
						
							2019-02-14 20:05:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								da44cdd381 
								
							 
						 
						
							
							
								
								user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()  
							
							... 
							
							
							
							get_or_fetch() handles the nickname verses URI differences transparently. 
							
						 
						
							2019-02-14 20:00:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ea2698beb7 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/activitypub-reserialization' into 'develop'  
							
							... 
							
							
							
							activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826  
							
						 
						
							2019-02-14 19:54:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56862f4ce1 
								
							 
						 
						
							
							
								
								activitypub: clean up logging statements a little  
							
							
							
						 
						
							2019-02-14 19:42:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								04b1c13554 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into patch-image-description  
							
							
							
						 
						
							2019-02-14 16:41:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								027adbc9e5 
								
							 
						 
						
							
							
								
								[ #468 ] Refactored OAuth scopes parsing / defaults handling.  
							
							
							
						 
						
							2019-02-14 17:03:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								949e35e26d 
								
							 
						 
						
							
							
								
								[ #468 ] OAuth scopes-related data migration simplification.  
							
							
							
						 
						
							2019-02-14 14:28:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								1d17082ab2 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mediaproxy-s3' into 'develop'  
							
							... 
							
							
							
							Fix S3 links encoding in Mediaproxy
Closes  #580 
See merge request pleroma/pleroma!828  
							
						 
						
							2019-02-14 10:10:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								3f32d7b937 
								
							 
						 
						
							
							
								
								Fix queue name  
							
							
							
						 
						
							2019-02-14 17:02:47 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								907306174b 
								
							 
						 
						
							
							
								
								fix S3 links encoding in Mediaproxy  
							
							
							
						 
						
							2019-02-14 15:55:21 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								19756d68f2 
								
							 
						 
						
							
							
								
								Merge branch 'fix/credo-issues-test' into 'develop'  
							
							... 
							
							
							
							Fix credo issues in ./test
See merge request pleroma/pleroma!808  
							
						 
						
							2019-02-14 03:55:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6652389e80 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'  
							
							... 
							
							
							
							activitypub: user inbox/outbox: `totalItems` removal
See merge request pleroma/pleroma!827  
							
						 
						
							2019-02-14 03:40:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e031cc6473 
								
							 
						 
						
							
							
								
								tests: update tests for totalItems leak fix  
							
							
							
						 
						
							2019-02-14 03:22:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								72ba5b4ab7 
								
							 
						 
						
							
							
								
								activitypub: user view: formatting  
							
							
							
						 
						
							2019-02-14 03:13:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5307c211b8 
								
							 
						 
						
							
							
								
								activitypub: user view: report totalItems=0 for follows/followers when hidden  
							
							
							
						 
						
							2019-02-14 03:10:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6542b86292 
								
							 
						 
						
							
							
								
								activitypub: user view: remove totalItems from user outbox  
							
							... 
							
							
							
							(this is based on a counter in User.Info, but the counter is not reliable.) 
							
						 
						
							2019-02-14 03:02:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ee2fa1a314 
								
							 
						 
						
							
							
								
								activitypub: user view: remove totalInbox from user inbox view  
							
							... 
							
							
							
							It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway. 
							
						 
						
							2019-02-14 03:01:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								bc9e5e6b65 
								
							 
						 
						
							
							
								
								Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'  
							
							... 
							
							
							
							ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821  
							
						 
						
							2019-02-14 02:50:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								64620d8980 
								
							 
						 
						
							
							
								
								activitypub: user view: do not expose oAuth endpoints for instance users  
							
							
							
						 
						
							2019-02-14 02:41:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e9ef4b8da6 
								
							 
						 
						
							
							
								
								oauth: never use base64 padding when returning tokens to applications  
							
							... 
							
							
							
							The normal Base64 alphabet uses the equals sign (=) as a padding character.  Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place. 
							
						 
						
							2019-02-14 01:10:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								889ad95a2a 
								
							 
						 
						
							
							
								
								tests: add some reserialization tests based on IR differences  
							
							
							
						 
						
							2019-02-14 00:59:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e05bf2940f 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: correctly handle nil inReplyTo value  
							
							
							
						 
						
							2019-02-14 00:35:54 +00:00