lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb3451023 
								
							 
						 
						
							
							
								
								CommonAPI: Refactor visibility, forbid public to private replies.  
							
							
							
						 
						
							2019-05-15 16:30:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bbacdf2352 
								
							 
						 
						
							
							
								
								Bump Mastodon API level  
							
							
							
						 
						
							2019-05-13 15:52:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								7701a4c841 
								
							 
						 
						
							
							
								
								Make irreversible field default to false in filters  
							
							
							
						 
						
							2019-05-14 00:13:15 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								799e1f48b5 
								
							 
						 
						
							
							
								
								Refactoring functions for dealing with oauth scopes.  
							
							
							
						 
						
							2019-05-08 10:52:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5125dedc 
								
							 
						 
						
							
							
								
								Remove bookmarks assoc and add a fake bookmark assoc instead  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3a7c14645e 
								
							 
						 
						
							
							
								
								- Actually use preloaded bookmarks in views  
							
							... 
							
							
							
							- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests 
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								06947c9147 
								
							 
						 
						
							
							
								
								Remove bookmarks assoc  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								238dd72fad 
								
							 
						 
						
							
							
								
								Merge branch 'conversations_three' into 'develop'  
							
							... 
							
							
							
							Conversations once more.
See merge request pleroma/pleroma!1119  
							
						 
						
							2019-05-07 14:43:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d089ff2460 
								
							 
						 
						
							
							
								
								Merge branch 'fix/embeded-relationship-in-follows' into 'develop'  
							
							... 
							
							
							
							Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118  
							
						 
						
							2019-05-03 20:36:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b5ad1715b2 
								
							 
						 
						
							
							
								
								MastoAPI: profile update with emoji_map  
							
							
							
						 
						
							2019-05-03 16:41:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d70af32127 
								
							 
						 
						
							
							
								
								Pleroma.User: remove emojify on parse_bio  
							
							
							
						 
						
							2019-05-03 16:27:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								acb04306b6 
								
							 
						 
						
							
							
								
								Standardize construction of websocket URL  
							
							... 
							
							
							
							This follows up on the change made in d747bd98 
							
						 
						
							2019-05-03 11:45:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c755cc4a 
								
							 
						 
						
							
							
								
								MastodonApi: Bump api level.  
							
							
							
						 
						
							2019-05-03 13:40:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								38b79461df 
								
							 
						 
						
							
							
								
								Fix embeded relationships in Mastodon API  
							
							... 
							
							
							
							Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case 
							
						 
						
							2019-05-03 00:49:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								45f790becc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into conversations_three  
							
							
							
						 
						
							2019-05-01 18:40:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f11e7037c2 
								
							 
						 
						
							
							
								
								test fixes  
							
							
							
						 
						
							2019-05-01 16:09:53 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								bdfa3a6fa8 
								
							 
						 
						
							
							
								
								Merging with develop  
							
							... 
							
							
							
							Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex 
							
						 
						
							2019-05-01 12:29:33 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0fd176b990 
								
							 
						 
						
							
							
								
								Merge branch 'fix/add-default-scope-mastoapi' into 'develop'  
							
							... 
							
							
							
							Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100  
							
						 
						
							2019-04-29 06:45:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce3789e39a 
								
							 
						 
						
							
							
								
								Add default_scope to /api/v1/update_credentials  
							
							
							
						 
						
							2019-04-27 23:55:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c3e9fcf098 
								
							 
						 
						
							
							
								
								Fix bookmarks depending on embeded object and move checking if the  
							
							... 
							
							
							
							status is bookmarked to SQL 
							
						 
						
							2019-04-27 23:06:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								4de5fef1f8 
								
							 
						 
						
							
							
								
								Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'  
							
							... 
							
							
							
							Feature/807 bookmark endpoint extension
Closes  #807 
See merge request pleroma/pleroma!1059  
							
						 
						
							2019-04-26 11:59:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc8425659 
								
							 
						 
						
							
							
								
								Move settings to Source subentity  
							
							
							
						 
						
							2019-04-25 10:31:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								a825056d4d 
								
							 
						 
						
							
							
								
								test fixes  
							
							
							
						 
						
							2019-04-25 14:09:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								85953c0836 
								
							 
						 
						
							
							
								
								fixes for tests  
							
							
							
						 
						
							2019-04-25 13:46:40 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								3c2ae80008 
								
							 
						 
						
							
							
								
								unused  
							
							
							
						 
						
							2019-04-25 13:42:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								1258128f4f 
								
							 
						 
						
							
							
								
								favourites add bookmark display  
							
							
							
						 
						
							2019-04-25 13:38:24 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								73d01857e3 
								
							 
						 
						
							
							
								
								bookmarks in separate table  
							
							
							
						 
						
							2019-04-25 13:38:24 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4baea6e6d9 
								
							 
						 
						
							
							
								
								Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API  
							
							... 
							
							
							
							This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs 
							
						 
						
							2019-04-24 20:01:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								9dd36e5bcb 
								
							 
						 
						
							
							
								
								Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )  
							
							
							
						 
						
							2019-04-23 02:47:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								10c40e13d2 
								
							 
						 
						
							
							
								
								Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'  
							
							... 
							
							
							
							Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086  
							
						 
						
							2019-04-23 02:43:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f60d072bbb 
								
							 
						 
						
							
							
								
								Add pleroma.in_reply_to_account_acct to MastoAPI status entity  
							
							
							
						 
						
							2019-04-22 11:54:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d21d921def 
								
							 
						 
						
							
							
								
								Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading  
							
							
							
						 
						
							2019-04-22 11:27:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								b9cdf6d3b9 
								
							 
						 
						
							
							
								
								Use User.get_cached* everywhere  
							
							
							
						 
						
							2019-04-22 07:20:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7fcbda702e 
								
							 
						 
						
							
							
								
								Merge branch 'rework-emoji-management' into 'develop'  
							
							... 
							
							
							
							Remove finmoji and add a way to download emojis in packs
Closes  #817  and #821 
See merge request pleroma/pleroma!1073  
							
						 
						
							2019-04-22 02:07:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4908e0eeee 
								
							 
						 
						
							
							
								
								Fix Credo warning  
							
							
							
						 
						
							2019-04-21 23:24:33 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eeb093631c 
								
							 
						 
						
							
							
								
								Fix Credo warning  
							
							
							
						 
						
							2019-04-21 23:19:36 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e56afefef9 
								
							 
						 
						
							
							
								
								Refactor conversation function in MastodonAPIController to use a View  
							
							
							
						 
						
							2019-04-21 23:14:27 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2662bea4e0 
								
							 
						 
						
							
							
								
								Add accounts and last_status to conversation read response  
							
							
							
						 
						
							2019-04-21 20:26:13 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								375fd21055 
								
							 
						 
						
							
							
								
								Set correct values in the MastoAPI reblog status view  
							
							
							
						 
						
							2019-04-21 05:40:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								52ed287e87 
								
							 
						 
						
							
							
								
								Fix incorrect multiple emoji tag handling introduced in initial impl  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								fa48532387 
								
							 
						 
						
							
							
								
								Handle reblogs on the first follow request in MastoAPI  
							
							
							
						 
						
							2019-04-20 04:39:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6069d0fd36 
								
							 
						 
						
							
							
								
								Fix object search depending on embeded object  
							
							
							
						 
						
							2019-04-18 09:28:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ad681877df 
								
							 
						 
						
							
							
								
								Make credo happy  
							
							
							
						 
						
							2019-04-17 14:52:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e641651e2b 
								
							 
						 
						
							
							
								
								Fix unbookmarking  
							
							
							
						 
						
							2019-04-17 14:27:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b09ae02c04 
								
							 
						 
						
							
							
								
								Added some more normalization calls all in mastodon api controller  
							
							
							
						 
						
							2019-04-17 13:04:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								627e5a0a49 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							
							
						 
						
							2019-04-17 12:22:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76999c73a7 
								
							 
						 
						
							
							
								
								Conversation: Add accounts to output.  
							
							
							
						 
						
							2019-04-15 22:28:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0da985182f 
								
							 
						 
						
							
							
								
								Conversation: Return full status object, id is a string.  
							
							
							
						 
						
							2019-04-15 21:58:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								56956de6fa 
								
							 
						 
						
							
							
								
								Merge branch 'fix/status-reblogged' into 'develop'  
							
							... 
							
							
							
							Assign reblogged in the Mastodon reblog status view
Closes  #812 
See merge request pleroma/pleroma!1057  
							
						 
						
							2019-04-15 10:26:23 +00:00