Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								00abe099cd 
								
							 
						 
						
							
							
								
								added tests for ActivityPub.like\unlike  
							
							
							
						 
						
							2019-08-27 16:21:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5e7098cf69 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'  
							
							... 
							
							
							
							Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598  
							
						 
						
							2019-08-25 16:12:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20c3f613d8 
								
							 
						 
						
							
							
								
								HttpRequestMock: Remove useless error = error  
							
							
							
						 
						
							2019-08-25 08:55:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								211e163770 
								
							 
						 
						
							
							
								
								Implement missing mocks for rel=me  
							
							
							
						 
						
							2019-08-25 08:03:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e22737ffb5 
								
							 
						 
						
							
							
								
								HttpRequestMock: Improve non-implemented error message  
							
							
							
						 
						
							2019-08-25 07:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								18668447d2 
								
							 
						 
						
							
							
								
								HttpRequestMock: Log mock errors as warnings  
							
							
							
						 
						
							2019-08-25 07:33:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6c0b4ba6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration  
							
							
							
						 
						
							2019-08-24 15:48:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								a320358703 
								
							 
						 
						
							
							
								
								added test helpers to clear config after tests  
							
							
							
						 
						
							2019-08-19 15:34:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								4244e17de0 
								
							 
						 
						
							
							
								
								fix credo  
							
							
							
						 
						
							2019-08-13 22:36:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								dd0b71ea6d 
								
							 
						 
						
							
							
								
								tests: add tests for MRF.describe()  
							
							
							
						 
						
							2019-08-13 22:19:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								7089400675 
								
							 
						 
						
							
							
								
								test: add mock MRF module for describe() testing  
							
							
							
						 
						
							2019-08-13 21:29:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29807ef6a5 
								
							 
						 
						
							
							
								
								Merge branch 'feature/digest-email' into 'develop'  
							
							... 
							
							
							
							Feature/digest email
See merge request pleroma/pleroma!1078  
							
						 
						
							2019-08-08 14:38:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e8ad116c2a 
								
							 
						 
						
							
							
								
								Do not add the "next" key to likes.json if there is no more items  
							
							
							
						 
						
							2019-08-04 17:13:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4f34fbcb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-08-02 18:16:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5ff8f07ca9 
								
							 
						 
						
							
							
								
								Merge branch 'feature/hide-follows-remote' into 'develop'  
							
							... 
							
							
							
							Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411  
							
						 
						
							2019-08-02 11:23:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								301ea0dc04 
								
							 
						 
						
							
							
								
								Add tests for counters being updated on follow  
							
							
							
						 
						
							2019-07-31 21:09:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								58443d0cd6 
								
							 
						 
						
							
							
								
								tests for TwitterApi/UtilController  
							
							
							
						 
						
							2019-07-31 15:14:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								19835be067 
								
							 
						 
						
							
							
								
								Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'  
							
							... 
							
							
							
							Fix remote follow from /ostatus_subscribe
Closes  #1103 
See merge request pleroma/pleroma!1472  
							
						 
						
							2019-07-24 19:29:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								b20020da16 
								
							 
						 
						
							
							
								
								Show the url advertised in the Activity in the Status JSON response  
							
							
							
						 
						
							2019-07-24 19:28:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d9f43e1d1 
								
							 
						 
						
							
							
								
								Add WebFinger test for AP-only account  
							
							
							
						 
						
							2019-07-25 01:27:34 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								55341ac717 
								
							 
						 
						
							
							
								
								tests WebFinger  
							
							
							
						 
						
							2019-07-24 15:13:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d2da3d30f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-07-24 16:37:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								36012ef6c1 
								
							 
						 
						
							
							
								
								Require that ephemeral posts live for at least one hour  
							
							... 
							
							
							
							If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them. 
							
						 
						
							2019-07-24 14:46:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								704960b3c1 
								
							 
						 
						
							
							
								
								Add support for activity expiration to common and Masto API  
							
							... 
							
							
							
							The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not. 
							
						 
						
							2019-07-24 14:45:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								666514194a 
								
							 
						 
						
							
							
								
								Add activity expirations table  
							
							... 
							
							
							
							Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted. 
							
						 
						
							2019-07-24 13:14:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f46805bb40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-24 02:42:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c49a09ed88 
								
							 
						 
						
							
							
								
								tests for Pleroma.Web.ActivityPub.Publisher  
							
							
							
						 
						
							2019-07-23 19:15:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								14ab2fd0f4 
								
							 
						 
						
							
							
								
								remove pry  
							
							
							
						 
						
							2019-07-23 12:30:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								36049f08ef 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-20 01:03:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								9570a5be40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-18 23:38:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								b6b748d3e7 
								
							 
						 
						
							
							
								
								tests for Uploader with webhook  
							
							
							
						 
						
							2019-07-18 12:30:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c729883936 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-07-14 21:43:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f00562ed6b 
								
							 
						 
						
							
							
								
								HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site  
							
							
							
						 
						
							2019-07-14 13:55:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								efa9a13d4e 
								
							 
						 
						
							
							
								
								HttpRequestMock: Add missing mocks for object containment tests  
							
							
							
						 
						
							2019-07-14 13:55:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								a9459ff98f 
								
							 
						 
						
							
							
								
								Admin API: Endpoint for fetching latest user's statuses  
							
							
							
						 
						
							2019-07-14 00:37:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eae991b06a 
								
							 
						 
						
							
							
								
								merge develop  
							
							
							
						 
						
							2019-07-12 18:08:27 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a237c6a2d4 
								
							 
						 
						
							
							
								
								support for idna domains  
							
							
							
						 
						
							2019-07-10 15:23:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								beba7bbc85 
								
							 
						 
						
							
							
								
								removing synchronization worker  
							
							
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-09 21:21:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b0fce6e9 
								
							 
						 
						
							
							
								
								Fix/1019 correct count remote users  
							
							
							
						 
						
							2019-07-09 17:36:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4948117fcf 
								
							 
						 
						
							
							
								
								Merge branch 'remove-swift' into 'develop'  
							
							... 
							
							
							
							Remove Uploaders.Swift and `httpoison` dependency
Closes  #1051 
See merge request pleroma/pleroma!1374  
							
						 
						
							2019-07-09 16:54:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								46cf81a544 
								
							 
						 
						
							
							
								
								[ #878 ] Formatting fix.  
							
							
							
						 
						
							2019-07-08 20:05:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								daff85a985 
								
							 
						 
						
							
							
								
								[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.  
							
							
							
						 
						
							2019-07-08 19:53:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6dadf5d6f4 
								
							 
						 
						
							
							
								
								[ #1043 ] fix search accounts.  
							
							
							
						 
						
							2019-07-05 04:22:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								11143c542a 
								
							 
						 
						
							
							
								
								Remove httpoison from dependencies  
							
							
							
						 
						
							2019-07-03 14:42:24 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad15ad2a9 
								
							 
						 
						
							
							
								
								add ignore hosts and TLDs for rich_media  
							
							
							
						 
						
							2019-06-25 22:25:37 +03:00