kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								03c4ea44ad 
								
							 
						 
						
							
							
								
								Merge branch 'admin-configure-atom-keys' into 'develop'  
							
							 
							
							... 
							
							
							
							admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424  
							
						 
						
							2019-07-15 13:01:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c32384c1ea 
								
							 
						 
						
							
							
								
								tests for Pleroma.Signature  
							
							 
							
							
							
						 
						
							2019-07-15 13:01:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								c66044b923 
								
							 
						 
						
							
							
								
								atom keys with leading :  
							
							 
							
							
							
						 
						
							2019-07-15 11:00:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								de13c9bb8f 
								
							 
						 
						
							
							
								
								List messages must be visible for mentioned users  
							
							 
							
							
							
						 
						
							2019-07-15 14:54:40 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d86a97abfb 
								
							 
						 
						
							
							
								
								Add an explanation comment to Publisher.publish/2  
							
							 
							
							
							
						 
						
							2019-07-15 14:20:31 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							 
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a87c313309 
								
							 
						 
						
							
							
								
								Support list visibility in StatusView  
							
							 
							
							
							
						 
						
							2019-07-15 14:00:29 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								fa17879c20 
								
							 
						 
						
							
							
								
								added tests for Web.MediaProxy  
							
							 
							
							
							
						 
						
							2019-07-14 21:01:32 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								dce8ebc9ea 
								
							 
						 
						
							
							
								
								Unfollow should also unsubscribe  
							
							 
							
							
							
						 
						
							2019-07-14 19:25:03 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								739bbe0d3b 
								
							 
						 
						
							
							
								
								security: detect object containment violations at the IR level  
							
							 
							
							... 
							
							
							
							It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers.  OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph. 
							
						 
						
							2019-07-14 17:47:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								cef4337f95 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/llal-object-containment' into 'develop'  
							
							 
							
							... 
							
							
							
							Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414  
							
						 
						
							2019-07-14 16:39:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2592934480 
								
							 
						 
						
							
							
								
								Object.Fetcher: Keep the with-do block as per kaniini proposition  
							
							 
							
							
							
						 
						
							2019-07-14 17:28:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1c08a67d6 
								
							 
						 
						
							
							
								
								Object.Fetcher: Fallback to OStatus only if AP actually fails  
							
							 
							
							
							
						 
						
							2019-07-14 17:05:31 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							 
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								40d0a198e2 
								
							 
						 
						
							
							
								
								Object.Fetcher: Handle error on Containment.contain_origin/2  
							
							 
							
							
							
						 
						
							2019-07-14 14:58:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f4447d82b8 
								
							 
						 
						
							
							
								
								parsers configurable  
							
							 
							
							
							
						 
						
							2019-07-14 09:21:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								80c46d6d8b 
								
							 
						 
						
							
							
								
								nodeinfo: implement MRF transparency exclusions  
							
							 
							
							
							
						 
						
							2019-07-13 18:53:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								f4c001062e 
								
							 
						 
						
							
							
								
								Merge branch '1041-status-actions-rate-limit' into 'develop'  
							
							 
							
							... 
							
							
							
							Rate-limited status actions (per user and per user+status).
Closes  #1041 
See merge request pleroma/pleroma!1410  
							
						 
						
							2019-07-13 14:17:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d72876c57d 
								
							 
						 
						
							
							
								
								[ #1041 ] Minor refactoring.  
							
							 
							
							
							
						 
						
							2019-07-13 15:21:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								9497d14f09 
								
							 
						 
						
							
							
								
								Merge branch 'fix/hackney-global-options' into 'develop'  
							
							 
							
							... 
							
							
							
							Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues
See merge request pleroma/pleroma!1409  
							
						 
						
							2019-07-13 11:55:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								369e9bb42f 
								
							 
						 
						
							
							
								
								[ #1041 ] Rate-limited status actions (per user and per user+status).  
							
							 
							
							
							
						 
						
							2019-07-13 14:49:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b001b8891a 
								
							 
						 
						
							
							
								
								Merge the default options with custom ones in ReverseProxy and  
							
							 
							
							... 
							
							
							
							Pleroma.HTTP 
							
						 
						
							2019-07-12 23:52:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								095117a58c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/ap-hide-follows  
							
							 
							
							
							
						 
						
							2019-07-12 21:43:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								97b79efbcd 
								
							 
						 
						
							
							
								
								ActivityPub Controller: Actually pass for_user to following/followers  
							
							 
							
							... 
							
							
							
							views and give 403 errors when trying to request hidden follower pages
when unauthenticated 
							
						 
						
							2019-07-12 20:54:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								92055941bd 
								
							 
						 
						
							
							
								
								Pleroma.Web.Metadata - tests  
							
							 
							
							
							
						 
						
							2019-07-12 16:42:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1f6ac7680d 
								
							 
						 
						
							
							
								
								ActivityPub User view: Following/Followers refactoring  
							
							 
							
							... 
							
							
							
							- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it 
							
						 
						
							2019-07-12 19:41:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								360e4cdaa2 
								
							 
						 
						
							
							
								
								Move these to pleroma namespace in Mastodon API  
							
							 
							
							
							
						 
						
							2019-07-12 11:25:58 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								6a6c4d134b 
								
							 
						 
						
							
							
								
								preserve the original path/filename (no encoding/decoding) for proxy  
							
							 
							
							
							
						 
						
							2019-07-12 21:05:01 +05:45  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4198c3ac39 
								
							 
						 
						
							
							
								
								Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel  
							
							 
							
							
							
						 
						
							2019-07-11 13:55:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								846ad9a463 
								
							 
						 
						
							
							
								
								admin api configure changes  
							
							 
							
							
							
						 
						
							2019-07-11 13:02:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e4e3fd7e55 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1019-refactor' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix/1019 refactor
See merge request pleroma/pleroma!1397  
							
						 
						
							2019-07-11 13:01:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9e06873d58 
								
							 
						 
						
							
							
								
								Add list to Visibility  
							
							 
							
							
							
						 
						
							2019-07-11 19:29:24 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								958fb9aa80 
								
							 
						 
						
							
							
								
								Add "listMessage"  
							
							 
							
							
							
						 
						
							2019-07-11 16:36:08 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								182f7bbb11 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/addressable-lists  
							
							 
							
							
							
						 
						
							2019-07-11 13:26:59 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a237c6a2d4 
								
							 
						 
						
							
							
								
								support for idna domains  
							
							 
							
							
							
						 
						
							2019-07-10 15:23:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								252e129b1e 
								
							 
						 
						
							
							
								
								MastoAPI: Add categories to custom emojis  
							
							 
							
							... 
							
							
							
							Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch. 
							
						 
						
							2019-07-10 17:02:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								beba7bbc85 
								
							 
						 
						
							
							
								
								removing synchronization worker  
							
							 
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f8786fa6f2 
								
							 
						 
						
							
							
								
								adding following_address field to user  
							
							 
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								ff55e3c16f 
								
							 
						 
						
							
							
								
								Create mentions only for explicitly mentioned users  
							
							 
							
							
							
						 
						
							2019-07-10 13:29:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ed8ce21a22 
								
							 
						 
						
							
							
								
								Fix unused import warning  
							
							 
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a42da8f311 
								
							 
						 
						
							
							
								
								Fix response  
							
							 
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5104f65b69 
								
							 
						 
						
							
							
								
								Wrap error messages into gettext helpers  
							
							 
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								26a6871609 
								
							 
						 
						
							
							
								
								Add translation helpers  
							
							 
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0d54a571ca 
								
							 
						 
						
							
							
								
								Add SetLocalePlug  
							
							 
							
							
							
						 
						
							2019-07-10 18:08:03 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								008c55e4e9 
								
							 
						 
						
							
							
								
								add test for search_controller/ 100% coverage  
							
							 
							
							
							
						 
						
							2019-07-10 08:28:03 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								12b1454245 
								
							 
						 
						
							
							
								
								[ #1062 ] added option to disable send email  
							
							 
							
							
							
						 
						
							2019-07-10 05:34:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								2d2b50ccca 
								
							 
						 
						
							
							
								
								Send and handle "Delete" activity for deleted users  
							
							 
							
							
							
						 
						
							2019-07-10 05:16:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								93a0eeab16 
								
							 
						 
						
							
							
								
								Add license/copyright to all project files  
							
							 
							
							
							
						 
						
							2019-07-10 05:13:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								bb8065a1fd 
								
							 
						 
						
							
							
								
								tests MRF filters  
							
							 
							
							
							
						 
						
							2019-07-10 05:12:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								829e997223 
								
							 
						 
						
							
							
								
								[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs 
							
						 
						
							2019-07-09 21:46:16 +03:00