Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								2c82d8603b 
								
							 
						 
						
							
							
								
								common api: implement scrobbling  
							
							
							
						 
						
							2019-09-30 10:39:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								95c948110c 
								
							 
						 
						
							
							
								
								Add rel="ugc" to hashtags and mentions  
							
							
							
						 
						
							2019-09-19 14:56:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								cf3041220a 
								
							 
						 
						
							
							
								
								Add support for rel="ugc"  
							
							
							
						 
						
							2019-09-19 14:56:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								447514dfa2 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed in 2019  
							
							... 
							
							
							
							Done via the following command:
git diff 1e6c102bfc 
							
						 
						
							2019-09-18 23:21:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								efb8818e9e 
								
							 
						 
						
							
							
								
								Activity Expiration: Switch to 'expires_in' system.  
							
							
							
						 
						
							2019-08-24 17:22:48 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a2b98f6d58 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pleroma-conversations  
							
							
							
						 
						
							2019-08-08 16:04:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								bdc9a7222c 
								
							 
						 
						
							
							
								
								tests for CommonApi/Utils  
							
							
							
						 
						
							2019-08-05 15:37:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b64b6fee2a 
								
							 
						 
						
							
							
								
								CommonAPI: Replies to conversations also get the correct context id.  
							
							
							
						 
						
							2019-08-05 15:33:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eee98aaa73 
								
							 
						 
						
							
							
								
								Pleroma API: Add endpoint to get conversation statuses.  
							
							
							
						 
						
							2019-08-02 19:53:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56b1c3af13 
								
							 
						 
						
							
							
								
								CommonAPI: Extend api with conversation replies.  
							
							
							
						 
						
							2019-08-02 15:05:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6eb33e7303 
								
							 
						 
						
							
							
								
								test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id  
							
							
							
						 
						
							2019-07-31 18:35:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5835069215 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1504  
							
						 
						
							2019-07-29 19:42:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5795a890e9 
								
							 
						 
						
							
							
								
								markdown: clean up html generated by earmark  
							
							
							
						 
						
							2019-07-29 19:09:58 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								b74300bc7a 
								
							 
						 
						
							
							
								
								Add more tests for MastodonAPIController and CommonAPI  
							
							
							
						 
						
							2019-07-15 19:47:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								dce8ebc9ea 
								
							 
						 
						
							
							
								
								Unfollow should also unsubscribe  
							
							
							
						 
						
							2019-07-14 19:25:03 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c60a562a7 
								
							 
						 
						
							
							
								
								Fix not being able to pin unlisted posts  
							
							... 
							
							
							
							Closes  #1038  
						
							2019-06-29 22:27:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								d53fb55bb7 
								
							 
						 
						
							
							
								
								Return correct response when reply to a direct message is not direct itself  
							
							
							
						 
						
							2019-06-26 10:59:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								827a51e777 
								
							 
						 
						
							
							
								
								CommonAPI: Add test for accept_follow_request.  
							
							
							
						 
						
							2019-06-05 15:45:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa5572d28 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-05 17:53:15 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								804b6a4d8f 
								
							 
						 
						
							
							
								
								CommonAPI.Utils: Add tests.  
							
							
							
						 
						
							2019-06-03 19:08:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								80d4d83aac 
								
							 
						 
						
							
							
								
								CommonAPI: Add explicit addressing.  
							
							
							
						 
						
							2019-06-03 18:17:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								557f0e33a7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-17 19:57:14 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f2936e0a07 
								
							 
						 
						
							
							
								
								Add ap_id to List  
							
							
							
						 
						
							2019-05-17 19:56:37 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								fc7246d715 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-16 17:54:24 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								4711d8151c 
								
							 
						 
						
							
							
								
								try this  
							
							
							
						 
						
							2019-05-16 17:35:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb3451023 
								
							 
						 
						
							
							
								
								CommonAPI: Refactor visibility, forbid public to private replies.  
							
							
							
						 
						
							2019-05-15 16:30:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d474995efa 
								
							 
						 
						
							
							
								
								Add Tests  
							
							
							
						 
						
							2019-05-14 20:12:47 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ef52aa0e66 
								
							 
						 
						
							
							
								
								tests: fix up for changed bbcode library output and verify html is properly escaped  
							
							
							
						 
						
							2019-04-26 22:45:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								501af917b5 
								
							 
						 
						
							
							
								
								add support for bbcode  
							
							
							
						 
						
							2019-04-26 22:35:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								aef3a3ca46 
								
							 
						 
						
							
							
								
								Fix tests that used finmoji  
							
							
							
						 
						
							2019-04-20 11:34:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ff8d76c670 
								
							 
						 
						
							
							
								
								Refactor all tests that acessed the embeded object  
							
							
							
						 
						
							2019-04-17 15:46:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ad681877df 
								
							 
						 
						
							
							
								
								Make credo happy  
							
							
							
						 
						
							2019-04-17 14:52:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								627e5a0a49 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							
							
						 
						
							2019-04-17 12:22:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3db9235150 
								
							 
						 
						
							
							
								
								Ignore dates in wrong formats  
							
							
							
						 
						
							2019-04-02 11:32:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6f9f7b8aa 
								
							 
						 
						
							
							
								
								Handle dates in the Unix timestamp format ( Fixes   #763 )  
							
							
							
						 
						
							2019-04-01 22:45:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1c3d3d0c2b 
								
							 
						 
						
							
							
								
								Merge branch 'safe-mentions' into 'develop'  
							
							... 
							
							
							
							Add safe dm mode option.
See merge request pleroma/pleroma!958  
							
						 
						
							2019-03-22 00:50:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a223e65f35 
								
							 
						 
						
							
							
								
								tests: fixup  
							
							
							
						 
						
							2019-03-21 23:56:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fea3696799 
								
							 
						 
						
							
							
								
								common api: move context functions from twitterapi  
							
							
							
						 
						
							2019-03-21 23:24:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8468f3f6d4 
								
							 
						 
						
							
							
								
								Add safe dm mode option.  
							
							
							
						 
						
							2019-03-20 21:09:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								da53c079db 
								
							 
						 
						
							
							
								
								Refactor to store user ap_id, add tests  
							
							
							
						 
						
							2019-03-15 14:20:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00