kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7456338ed3 
								
							 
						 
						
							
							
								
								Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'  
							
							 
							
							... 
							
							
							
							Add OAuth tokens endpoint
See merge request pleroma/pleroma!805  
							
						 
						
							2019-02-18 04:02:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c23bd05737 
								
							 
						 
						
							
							
								
								Merge branch 'features/flavour-switching' into 'develop'  
							
							 
							
							... 
							
							
							
							[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807  
							
						 
						
							2019-02-18 04:01:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								cd019a5927 
								
							 
						 
						
							
							
								
								Merge branch 'follow-request-count' into 'develop'  
							
							 
							
							... 
							
							
							
							Follow request count
See merge request pleroma/pleroma!817  
							
						 
						
							2019-02-18 04:01:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3f38a05571 
								
							 
						 
						
							
							
								
								Merge branch 'csv-export' into 'develop'  
							
							 
							
							... 
							
							
							
							Add option to return all friends in twitter api.
Closes  #602 
See merge request pleroma/pleroma!833  
							
						 
						
							2019-02-18 03:59:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								fd17a0cc9b 
								
							 
						 
						
							
							
								
								Fix test  
							
							 
							
							
							
						 
						
							2019-02-18 00:10:48 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								79e503b3f5 
								
							 
						 
						
							
							
								
								Merge branch 'docker-speedup' into 'develop'  
							
							 
							
							... 
							
							
							
							Docker speedup
See merge request pleroma/pleroma!837  
							
						 
						
							2019-02-17 17:38:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72a4272d84 
								
							 
						 
						
							
							
								
								Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching  
							
							 
							
							
							
						 
						
							2019-02-16 19:52:46 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								dca6bee2f7 
								
							 
						 
						
							
							
								
								Rename test, add check for follower collection when delisting  
							
							 
							
							
							
						 
						
							2019-02-15 13:43:14 +01: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e031cc6473 
								
							 
						 
						
							
							
								
								tests: update tests for totalItems leak fix  
							
							 
							
							
							
						 
						
							2019-02-14 03:22:54 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								889ad95a2a 
								
							 
						 
						
							
							
								
								tests: add some reserialization tests based on IR differences  
							
							 
							
							
							
						 
						
							2019-02-14 00:59:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d54c483964 
								
							 
						 
						
							
							
								
								tests: add tests for endpoints  
							
							 
							
							
							
						 
						
							2019-02-13 19:48:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								62a45bdc11 
								
							 
						 
						
							
							
								
								Add revoke token  
							
							 
							
							
							
						 
						
							2019-02-13 12:59:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								61a4bc5095 
								
							 
						 
						
							
							
								
								Add OAuth tokens endpoint  
							
							 
							
							
							
						 
						
							2019-02-13 12:59:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								379d04692c 
								
							 
						 
						
							
							
								
								Filter summary in keywordpolicy  
							
							 
							
							
							
						 
						
							2019-02-11 21:35:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								ac72b578da 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/thread-muting  
							
							 
							
							
							
						 
						
							2019-02-11 12:10:49 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c01ef574c1 
								
							 
						 
						
							
							
								
								Refactor as per Rin's suggestions, add endpoint tests  
							
							 
							
							
							
						 
						
							2019-02-11 12:04:02 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74579115a7 
								
							 
						 
						
							
							
								
								test: Change lenght(…) == 0 to Enum.empty?(…)  
							
							 
							
							
							
						 
						
							2019-02-11 03:44:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bb7e19b38 
								
							 
						 
						
							
							
								
								test: de-group alias/es  
							
							 
							
							
							
						 
						
							2019-02-11 03:44:15 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								6a150de3bd 
								
							 
						 
						
							
							
								
								Add unique index and unique constraint check, uniqueness test fails  
							
							 
							
							
							
						 
						
							2019-02-09 20:52:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								478a05b4c9 
								
							 
						 
						
							
							
								
								Merged "check mute" test into the other two  
							
							 
							
							
							
						 
						
							2019-02-09 18:34:00 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								a0d732ec55 
								
							 
						 
						
							
							
								
								it works!!  
							
							 
							
							
							
						 
						
							2019-02-09 17:47:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								4430a0ad12 
								
							 
						 
						
							
							
								
								added another test  
							
							 
							
							
							
						 
						
							2019-02-09 14:34:42 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								09189c3a7c 
								
							 
						 
						
							
							
								
								Made a test!  
							
							 
							
							
							
						 
						
							2019-02-09 14:23:51 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b05a341187 
								
							 
						 
						
							
							
								
								oof  
							
							 
							
							
							
						 
						
							2019-02-09 08:12:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9a23f8f3ea 
								
							 
						 
						
							
							
								
								Add tests and fix a typo in docs  
							
							 
							
							
							
						 
						
							2019-02-08 20:23:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								74518d0b60 
								
							 
						 
						
							
							
								
								hide_followings was renamed to hide_followers in the FE, but never synced up in the BE  
							
							 
							
							... 
							
							
							
							This was a dirty regex replace which worked on my server 
							
						 
						
							2019-02-06 22:34:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								1220a17146 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/rich-media-card' into 'develop'  
							
							 
							
							... 
							
							
							
							rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785  
							
						 
						
							2019-02-06 18:39:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								26670b09a7 
								
							 
						 
						
							
							
								
								tests: add a rich media card that contains all relevant fields  
							
							 
							
							
							
						 
						
							2019-02-06 18:27:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6eb8c1eb92 
								
							 
						 
						
							
							
								
								test: add some regression tests for the rich media card rendering  
							
							 
							
							
							
						 
						
							2019-02-06 18:12:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								035eaeb9b8 
								
							 
						 
						
							
							
								
								Allow to configure visibility for admin and moderator badges  
							
							 
							
							
							
						 
						
							2019-02-06 06:18:05 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								398c81f9c8 
								
							 
						 
						
							
							
								
								Add is_admin and is_moderator boolean fields to the user view  
							
							 
							
							
							
						 
						
							2019-02-06 02:10:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								73e6a1f1dd 
								
							 
						 
						
							
							
								
								test: twitterapi: fix another possible test failure case  
							
							 
							
							
							
						 
						
							2019-02-05 20:08:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								eb2b1960e0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network-v2' into 'develop'  
							
							 
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765  
							
						 
						
							2019-02-05 18:56:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c4d317ccb6 
								
							 
						 
						
							
							
								
								test: twitterapi: fix the test breakage for real  
							
							 
							
							
							
						 
						
							2019-02-05 18:49:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								16ce129e38 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings (fixed)  
							
							 
							
							
							
						 
						
							2019-02-03 21:55:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								69a38644bc 
								
							 
						 
						
							
							
								
								Merge branch '589-fix-cache' into 'develop'  
							
							 
							
							... 
							
							
							
							Resolve "Update object cache on favs/boosts"
Closes  #589 
See merge request pleroma/pleroma!764  
							
						 
						
							2019-02-03 18:19:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e61f0be951 
								
							 
						 
						
							
							
								
								Unbreak all the tests.  
							
							 
							
							
							
						 
						
							2019-02-03 18:54:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								505a084058 
								
							 
						 
						
							
							
								
								Still do caching in tests.  
							
							 
							
							
							
						 
						
							2019-02-03 18:28:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3913b0196e 
								
							 
						 
						
							
							
								
								[ #582 ] Made single-pub task call Instance.set_reachable/1 if set_reachable is not specified.  
							
							 
							
							... 
							
							
							
							Added tests. 
							
						 
						
							2019-02-03 13:28:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b40b4bc4e5 
								
							 
						 
						
							
							
								
								[ #582 ] Optimized federation retirement by reducing the number of SQL calls  
							
							 
							
							... 
							
							
							
							(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`). 
							
						 
						
							2019-02-03 12:41:27 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								486749064f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/split-hide-network' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !733  
							
						 
						
							2019-02-01 20:22:58 +00:00