kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1c9e539b47 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mastodon_api_2.4.x' into 'develop'  
							
							... 
							
							
							
							Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266  
							
						 
						
							2018-09-03 12:33:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Will Pearson 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2a0e3551 
								
							 
						 
						
							
							
								
								Specify default scope in verify_credentials  
							
							... 
							
							
							
							Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value. 
							
						 
						
							2018-08-31 21:04:46 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9cac7c957c 
								
							 
						 
						
							
							
								
								test: add testcase proving lists system does not leak non-public posts  
							
							
							
						 
						
							2018-08-29 08:50:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e030129fb 
								
							 
						 
						
							
							
								
								[MastodonAPI] Add filters  
							
							
							
						 
						
							2018-08-27 15:09:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								489453c246 
								
							 
						 
						
							
							
								
								tests: verify media description api support is working  
							
							
							
						 
						
							2018-07-17 03:40:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c5b42e29 
								
							 
						 
						
							
							
								
								tests: assert the state prior to mutating it as well as afterward  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c99b9b9d92 
								
							 
						 
						
							
							
								
								testsuite: add mastodon api tests  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								7f79b467b1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/domain-blocks' into 'develop'  
							
							... 
							
							
							
							Domain blocks
See merge request pleroma/pleroma!190  
							
						 
						
							2018-06-11 11:19:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								4856962434 
								
							 
						 
						
							
							
								
								MastoAPI: add domain blocking.  
							
							
							
						 
						
							2018-06-03 22:21:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4856ba596f 
								
							 
						 
						
							
							
								
								Better error handling for MastodonApiController.  
							
							
							
						 
						
							2018-06-03 19:28:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								841ee8e3e4 
								
							 
						 
						
							
							
								
								Simplify DM query.  
							
							... 
							
							
							
							Should also use indexes better. 
							
						 
						
							2018-05-26 16:25:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3ec53514 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api  
							
							
							
						 
						
							2018-05-26 16:00:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0a6c897c94 
								
							 
						 
						
							
							
								
								Formatting.  
							
							
							
						 
						
							2018-05-26 15:11:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f3a71f2986 
								
							 
						 
						
							
							
								
								Merge branch 'feature/lists' into 'develop'  
							
							... 
							
							
							
							Mastodon List API
See merge request pleroma/pleroma!138  
							
						 
						
							2018-05-24 20:22:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								3dbd9809d4 
								
							 
						 
						
							
							
								
								MastoAPI: add lists.  
							
							
							
						 
						
							2018-05-24 15:34:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								4fd9df100f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/mstdn-direct-api  
							
							
							
						 
						
							2018-05-21 20:19:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								434601a5c3 
								
							 
						 
						
							
							
								
								Return private / direct posts on user timelines, too.  
							
							
							
						 
						
							2018-05-20 16:15:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4bbec6b3 
								
							 
						 
						
							
							
								
								Fix User search.  
							
							... 
							
							
							
							Now uses a trigram based search. This is a lot faster and gives better
results. Closes  #185 . 
							
						 
						
							2018-05-16 17:55:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								d0ad13c12e 
								
							 
						 
						
							
							
								
								Add direct_note[_activity]_factory and a couple tests  
							
							
							
						 
						
							2018-05-14 21:54:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csaurus 
								
							 
						 
						
							
							
							
							
								
							
							
								987a52cf6f 
								
							 
						 
						
							
							
								
								Post direct status test  
							
							
							
						 
						
							2018-05-13 21:21:42 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								aeff2d6474 
								
							 
						 
						
							
							
								
								Merge branch 'feature/unrepeats' into 'develop'  
							
							... 
							
							
							
							Add unrepeats
Closes  #69 
See merge request pleroma/pleroma!113  
							
						 
						
							2018-05-13 09:32:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c464355d1a 
								
							 
						 
						
							
							
								
								Idempotency: Use special cache, keep for 6 hours.  
							
							
							
						 
						
							2018-05-05 11:15:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								90c4bed0af 
								
							 
						 
						
							
							
								
								Don't expire idempotency cache for five minutes.  
							
							
							
						 
						
							2018-05-04 21:15:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fcd3eca167 
								
							 
						 
						
							
							
								
								MastodonAPI: Support idempotency key.  
							
							
							
						 
						
							2018-05-04 20:30:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								e981280fa7 
								
							 
						 
						
							
							
								
								Formatting fixes  
							
							
							
						 
						
							2018-04-25 01:43:45 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								42279f54cf 
								
							 
						 
						
							
							
								
								Return target status in MastoAPI endpoint instead of reblog activity  
							
							
							
						 
						
							2018-04-16 23:30:52 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								5b0d0b9ab2 
								
							 
						 
						
							
							
								
								Add unreblogging tests  
							
							
							
						 
						
							2018-04-14 22:34:06 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gian Sass 
								
							 
						 
						
							
							
							
							
								
							
							
								2de2e29df2 
								
							 
						 
						
							
							
								
								Oops  
							
							
							
						 
						
							2018-04-11 15:51:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gian Sass 
								
							 
						 
						
							
							
							
							
								
							
							
								3a5c0465eb 
								
							 
						 
						
							
							
								
								Add unit test for pinned statuses  
							
							
							
						 
						
							2018-04-11 15:48:32 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								70bcdf32bd 
								
							 
						 
						
							
							
								
								Only search in public data for now.  
							
							... 
							
							
							
							This should be the data the user is allowed to see later, but this
will stop accidental private message leaks. 
							
						 
						
							2018-04-07 16:40:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								26ccb768d3 
								
							 
						 
						
							
							
								
								Make test output easier to read.  
							
							
							
						 
						
							2018-02-12 10:14:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								33a5d0a238 
								
							 
						 
						
							
							
								
								Fix some test warnings.  
							
							
							
						 
						
							2018-02-12 09:33:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								6e1cb86166 
								
							 
						 
						
							
							
								
								Fix instance test.  
							
							
							
						 
						
							2018-01-14 08:28:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Iwakura 
								
							 
						 
						
							
							
							
							
								
							
							
								f1f79c0dca 
								
							 
						 
						
							
							
								
								Fix timelines in subway tooter.  
							
							
							
						 
						
							2017-12-19 16:15:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Iwakura 
								
							 
						 
						
							
							
							
							
								
							
							
								47887ac848 
								
							 
						 
						
							
							
								
								MastoAPI: Fix always-sensitive bugs.  
							
							
							
						 
						
							2017-12-18 16:56:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								79b3397c17 
								
							 
						 
						
							
							
								
								Fix tests.  
							
							
							
						 
						
							2017-12-11 18:41:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Iwakura 
								
							 
						 
						
							
							
							
							
								
							
							
								5637d163e6 
								
							 
						 
						
							
							
								
								MastodonAPI: Add proper user count.  
							
							
							
						 
						
							2017-11-30 14:59:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f53cdabcdf 
								
							 
						 
						
							
							
								
								Add #nsfw tag if sensitive content bit is set  
							
							
							
						 
						
							2017-11-18 16:30:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								06c3ee3bac 
								
							 
						 
						
							
							
								
								Accept 1 as true.  
							
							
							
						 
						
							2017-11-14 15:54:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								c84723b679 
								
							 
						 
						
							
							
								
								MastoAPI: Add media timelines.  
							
							
							
						 
						
							2017-11-14 15:41:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								083cd169d2 
								
							 
						 
						
							
							
								
								MastoAPI: Fix repeat api bug.  
							
							... 
							
							
							
							Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status. 
							
						 
						
							2017-11-13 09:48:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								08bc316742 
								
							 
						 
						
							
							
								
								Merge branch 'mastodon-notification-endpoints' into 'develop'  
							
							... 
							
							
							
							MastoAPI: Add notification endpoints get, clear and dismiss.
Closes  #42 
See merge request pleroma/pleroma!13  
							
						 
						
							2017-11-12 11:08:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								fc7483cb3c 
								
							 
						 
						
							
							
								
								MastoAPI: Add update credentials endpoint.  
							
							
							
						 
						
							2017-11-12 00:27:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1d3d66a841 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop  
							
							
							
						 
						
							2017-11-10 17:37:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6e9c22c0af 
								
							 
						 
						
							
							
								
								MastoAPI: Use string ids everywhere.  
							
							
							
						 
						
							2017-11-10 17:18:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								e6a78c6ed0 
								
							 
						 
						
							
							
								
								MastoAPI: Add notification get, clear and dismiss.  
							
							
							
						 
						
							2017-11-10 15:24:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								266d9c008d 
								
							 
						 
						
							
							
								
								MastoAPI: Fetch statuses in search.  
							
							
							
						 
						
							2017-11-09 16:48:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								c6b9b777da 
								
							 
						 
						
							
							
								
								MastoAPI: Add list of blocked users.  
							
							
							
						 
						
							2017-11-03 08:51:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								5bf92e50be 
								
							 
						 
						
							
							
								
								MastoAPI: Add blocking.  
							
							
							
						 
						
							2017-11-03 08:38:05 +01:00