rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c47da0e65d 
								
							 
						 
						
							
							
								
								Add tests for poll view  
							
							
							
						 
						
							2019-06-02 23:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa588e357 
								
							 
						 
						
							
							
								
								Fix Credo issues  
							
							
							
						 
						
							2019-06-01 21:42:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								65db5e9f52 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							
							
						 
						
							2019-06-01 16:29:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								300d94c628 
								
							 
						 
						
							
							
								
								Add poll votes  
							
							... 
							
							
							
							Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects 
							
						 
						
							2019-06-01 16:17:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								2993361075 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix/leaking-lists' into 'develop'  
							
							... 
							
							
							
							Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222  
							
						 
						
							2019-05-31 13:26:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d9c0650ff9 
								
							 
						 
						
							
							
								
								Mastodon API: Fix lists leaking private posts  
							
							... 
							
							
							
							Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM 
							
						 
						
							2019-05-31 15:25:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a9eaa55885 
								
							 
						 
						
							
							
								
								Fix fix_explicit_addressing moving follower collection to cc and add tests for it  
							
							
							
						 
						
							2019-05-31 14:17:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								1690be991e 
								
							 
						 
						
							
							
								
								Replace missing non-nullable Card attributes with empty strings  
							
							
							
						 
						
							2019-05-30 21:03:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								91ac8b075b 
								
							 
						 
						
							
							
								
								Merge branch 'use-pleroma-config' into 'develop'  
							
							... 
							
							
							
							Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214  
							
						 
						
							2019-05-30 13:16:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								99f70c7e20 
								
							 
						 
						
							
							
								
								Use Pleroma.Config everywhere  
							
							
							
						 
						
							2019-05-30 15:33:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								db94294dfb 
								
							 
						 
						
							
							
								
								[ #936 ] fix tests  
							
							
							
						 
						
							2019-05-29 14:04:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								5bb843ceec 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/die-httpoison-die' into 'develop'  
							
							... 
							
							
							
							remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203  
							
						 
						
							2019-05-26 13:33:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								79503ce90f 
								
							 
						 
						
							
							
								
								mrf: simple policy: fix matching imported activitypub and ostatus statuses  
							
							
							
						 
						
							2019-05-26 02:01:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56fd7dbdd7 
								
							 
						 
						
							
							
								
								remove @websub and @ostatus module-level constants  
							
							
							
						 
						
							2019-05-25 04:43:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								80d55d428f 
								
							 
						 
						
							
							
								
								tests: websub: check only that signature validation succeeds or fails  
							
							
							
						 
						
							2019-05-25 04:34:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								9415932af5 
								
							 
						 
						
							
							
								
								Keep nodeinfo available when not federating  
							
							
							
						 
						
							2019-05-25 08:15:12 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8086c7aed6 
								
							 
						 
						
							
							
								
								tests: add tests for banner and avatar removal  
							
							
							
						 
						
							2019-05-22 18:53:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19c90d47c4 
								
							 
						 
						
							
							
								
								Normalize poll votes to Answer objects  
							
							
							
						 
						
							2019-05-22 21:17:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								620908a2db 
								
							 
						 
						
							
							
								
								[ #699 ] add worker to clean expired oauth tokens  
							
							
							
						 
						
							2019-05-22 15:44:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ff363f70b5 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/keys' into 'develop'  
							
							... 
							
							
							
							move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186  
							
						 
						
							2019-05-22 06:28:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cdac5efd10 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/account_view_source.note' into 'develop'  
							
							... 
							
							
							
							MastoAPI AccountView: fill source.note with plaintext version of note
Closes  #926 
See merge request pleroma/pleroma!1189  
							
						 
						
							2019-05-22 05:39:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e2c215a00 
								
							 
						 
						
							
							
								
								MastoAPI AccountView: fill source.note with plaintext version of note  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/926  
							
						 
						
							2019-05-22 07:22:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								79c2cef2fb 
								
							 
						 
						
							
							
								
								Merge branch 'mongooseim-support' into 'develop'  
							
							... 
							
							
							
							MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172  
							
						 
						
							2019-05-22 04:06:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								045803346d 
								
							 
						 
						
							
							
								
								move key generation functions into Pleroma.Keys module  
							
							
							
						 
						
							2019-05-22 03:58:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								f76268135c 
								
							 
						 
						
							
							
								
								Fix failing test  
							
							
							
						 
						
							2019-05-22 07:16:11 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								3ab9255eda 
								
							 
						 
						
							
							
								
								Respond with a 404 Not implemented JSON error message  
							
							... 
							
							
							
							when requested API is not implemented 
							
						 
						
							2019-05-22 07:15:52 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								a13d449b24 
								
							 
						 
						
							
							
								
								Add tests for fallback routes  
							
							
							
						 
						
							2019-05-22 05:39:29 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								63b0b7190c 
								
							 
						 
						
							
							
								
								MastoAPI: Add GET /api/v1/polls/:id  
							
							
							
						 
						
							2019-05-21 20:40:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0407ffe75f 
								
							 
						 
						
							
							
								
								Change validation error status codes to be more appropriate  
							
							
							
						 
						
							2019-05-21 17:12:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								aafe30d94e 
								
							 
						 
						
							
							
								
								Handle poll votes  
							
							
							
						 
						
							2019-05-21 14:12:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3f96b3e4b8 
								
							 
						 
						
							
							
								
								Enforce poll limits and add error handling for MastodonAPI's post endpoint  
							
							
							
						 
						
							2019-05-21 10:54:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								76a7429bef 
								
							 
						 
						
							
							
								
								Add poll limits to /api/v1/instance and initial state  
							
							
							
						 
						
							2019-05-21 09:13:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc916ba15f 
								
							 
						 
						
							
							
								
								Format mascot tests  
							
							
							
						 
						
							2019-05-20 12:58:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e81f0fc6d4 
								
							 
						 
						
							
							
								
								Add mascot get/set tests  
							
							
							
						 
						
							2019-05-20 12:58:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								2375e9a95b 
								
							 
						 
						
							
							
								
								Add report filtering to MRF.SimplePolicy  
							
							
							
						 
						
							2019-05-20 06:02:50 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5ece901af3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts and remove IO.inspects  
							
							
							
						 
						
							2019-05-18 13:37:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fd920c8973 
								
							 
						 
						
							
							
								
								Mastodon API: Add support for posting polls  
							
							
							
						 
						
							2019-05-18 13:29:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								dc08159538 
								
							 
						 
						
							
							
								
								also suppress link previews from posts marked #nsfw  
							
							
							
						 
						
							2019-05-17 22:13:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0da1233e8e 
								
							 
						 
						
							
							
								
								rich media: suppress link previews if post is marked as sensitive  
							
							
							
						 
						
							2019-05-17 18:49:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f959bf7aa6 
								
							 
						 
						
							
							
								
								MongooseIM: Add basic integration endpoints.  
							
							
							
						 
						
							2019-05-17 18:21:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								249b31ffe5 
								
							 
						 
						
							
							
								
								Fix specs.  
							
							
							
						 
						
							2019-05-17 11:49:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ed682213f 
								
							 
						 
						
							
							
								
								Fix/902 random compile failing  
							
							
							
						 
						
							2019-05-17 07:25:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								443cd68a4c 
								
							 
						 
						
							
							
								
								Add tests for MRF.SimplePolicy  
							
							
							
						 
						
							2019-05-17 09:02:34 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								bf84d50c76 
								
							 
						 
						
							
							
								
								Merge branch 'feature/890-add-report-uri' into 'develop'  
							
							... 
							
							
							
							Feature/890 add report uri
Closes  #890 
See merge request pleroma/pleroma!1164  
							
						 
						
							2019-05-16 20:11:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e2b3a27204 
								
							 
						 
						
							
							
								
								Add Reports to Admin API  
							
							
							
						 
						
							2019-05-16 19:09:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								e190b3022b 
								
							 
						 
						
							
							
								
								Merge branch 'fix/domain-unblocked-reblogs' into 'develop'  
							
							... 
							
							
							
							Fix domain-unblocked reblogs
Closes  #892 
See merge request pleroma/pleroma!1157  
							
						 
						
							2019-05-16 18:57:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ebb0482116 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into conversations-import  
							
							
							
						 
						
							2019-05-16 13:11:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								4711d8151c 
								
							 
						 
						
							
							
								
								try this  
							
							
							
						 
						
							2019-05-16 17:35:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								2b6119dfbf 
								
							 
						 
						
							
							
								
								Restrict reblogs of activities from blocked domains  
							
							
							
						 
						
							2019-05-16 05:53:51 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								64495b96e9 
								
							 
						 
						
							
							
								
								Add test for blocked domains  
							
							
							
						 
						
							2019-05-16 05:53:51 +08:00