kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3549cd9754 
								
							 
						 
						
							
							
								
								Change to use attachment only when fields do not exist  
							
							 
							
							
							
						 
						
							2019-08-25 01:28:38 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								672fcbc7b7 
								
							 
						 
						
							
							
								
								Limit custom fields for old remote users  
							
							 
							
							
							
						 
						
							2019-08-14 14:58:06 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e457fcc479 
								
							 
						 
						
							
							
								
								Add :max_remote_account_fields config option  
							
							 
							
							
							
						 
						
							2019-08-14 14:58:06 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f7bbf99caa 
								
							 
						 
						
							
							
								
								Use info.fields instead of source_data for remote users  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								2c35d4b0b0 
								
							 
						 
						
							
							
								
								Add configurable account field name length limit  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								db3c05f6b4 
								
							 
						 
						
							
							
								
								Add configurable account field value length limit  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a22f540fc4 
								
							 
						 
						
							
							
								
								Add custom fields to TwitterAPI.UserView  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e0ac5c7a66 
								
							 
						 
						
							
							
								
								Add custom profile fields  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4f34fbcb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-08-02 18:16:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								196cad46f3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							 
							
							
							
						 
						
							2019-07-20 22:04:47 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ae4fc58589 
								
							 
						 
						
							
							
								
								Remove flavour from userinfo  
							
							 
							
							
							
						 
						
							2019-07-20 01:24:01 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c729883936 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-07-14 21:43:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							 
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2dcb4c69 
								
							 
						 
						
							
							
								
								Add follow information refetching after following/unfollowing  
							
							 
							
							
							
						 
						
							2019-07-14 01:58:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e5b850a991 
								
							 
						 
						
							
							
								
								Refactor fetching follow information to a separate function  
							
							 
							
							
							
						 
						
							2019-07-13 23:56:10 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e8fa477793 
								
							 
						 
						
							
							
								
								Refactor Follows/Followers counter syncronization  
							
							 
							
							... 
							
							
							
							- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page 
							
						 
						
							2019-07-13 19:27:49 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b1b1a270e8 
								
							 
						 
						
							
							
								
								Fix conflict  
							
							 
							
							
							
						 
						
							2019-06-05 02:45:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f2e359687 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							 
							
							
							
						 
						
							2019-06-04 09:49:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9d2563a3de 
								
							 
						 
						
							
							
								
								Merge branch 'generic-fe-settings' into 'develop'  
							
							 
							
							... 
							
							
							
							Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221  
							
						 
						
							2019-06-04 05:43:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef145b4fc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-06-03 15:29:53 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								080e1aa70e 
								
							 
						 
						
							
							
								
								add option skip_thread_containment  
							
							 
							
							
							
						 
						
							2019-06-03 16:13:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5402d04e3c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/notification-control-part-2' into 'develop'  
							
							 
							
							... 
							
							
							
							notification controls, part 2
See merge request pleroma/pleroma!1204  
							
						 
						
							2019-06-02 08:25:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d3ece2861 
								
							 
						 
						
							
							
								
								Remove now useless flavours switching  
							
							 
							
							
							
						 
						
							2019-06-01 01:44:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7861974ab2 
								
							 
						 
						
							
							
								
								MastodonAPI: Add extension to set and get pleroma_settings_store.  
							
							 
							
							
							
						 
						
							2019-05-31 14:50:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eb2963bc43 
								
							 
						 
						
							
							
								
								User: Add settings store to Info, AccountView  
							
							 
							
							... 
							
							
							
							This is to provide a generic frontend settings storage mechanism for all kinds
of frontends. 
							
						 
						
							2019-05-31 14:27:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ce47017c89 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-05-29 18:18:22 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								750ede5764 
								
							 
						 
						
							
							
								
								notification: remove local/remote match rules (too complicated)  
							
							 
							
							
							
						 
						
							2019-05-26 00:05:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e7e2e7a1a6 
								
							 
						 
						
							
							
								
								user info: allow formdata for notification settings like every other API  
							
							 
							
							
							
						 
						
							2019-05-25 05:54:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4030837d91 
								
							 
						 
						
							
							
								
								notification: add non_follows/non_followers notification control settings  
							
							 
							
							
							
						 
						
							2019-05-25 05:19:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								daeae8e2e7 
								
							 
						 
						
							
							
								
								Move default mascot configuration to config/  
							
							 
							
							
							
						 
						
							2019-05-20 16:12:55 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d0d9e7a56 
								
							 
						 
						
							
							
								
								Use string map for default mascot  
							
							 
							
							
							
						 
						
							2019-05-20 13:10:04 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54e9cb5c2d 
								
							 
						 
						
							
							
								
								Add API endpoints for a custom user mascot  
							
							 
							
							
							
						 
						
							2019-05-20 12:39:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								73ae58fdfa 
								
							 
						 
						
							
							
								
								Feature/896 toggling confirmation  
							
							 
							
							
							
						 
						
							2019-05-16 13:23:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							 
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b6b5b16ba4 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-05-08 17:08:06 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							 
							
							
							
						 
						
							2019-05-03 16:27:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0f0cc2703b 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-04-30 20:17:52 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2359ee38b3 
								
							 
						 
						
							
							
								
								Set digest emails to false by default  
							
							 
							
							
							
						 
						
							2019-04-21 16:36:25 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371a4aed2c 
								
							 
						 
						
							
							
								
								Add User.Info.email_notifications  
							
							 
							
							
							
						 
						
							2019-04-13 17:40:42 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be8350baa2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/user-status-subscriptions  
							
							 
							
							
							
						 
						
							2019-04-10 10:44:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								9ca91cbb87 
								
							 
						 
						
							
							
								
								Change relationship direction of subscriptions  
							
							 
							
							
							
						 
						
							2019-04-05 17:02:07 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								007762e767 
								
							 
						 
						
							
							
								
								Add notification checks  
							
							 
							
							
							
						 
						
							2019-04-05 15:30:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								79910ce5cc 
								
							 
						 
						
							
							
								
								Add API endpoints and user column for subscription  
							
							 
							
							
							
						 
						
							2019-04-05 15:30:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								cd90695a34 
								
							 
						 
						
							
							
								
								Add PUT /api/pleroma/notification_settings endpoint  
							
							 
							
							
							
						 
						
							2019-03-28 18:55:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								55d086b520 
								
							 
						 
						
							
							
								
								Notification controls  
							
							 
							
							... 
							
							
							
							Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances 
							
						 
						
							2019-03-28 07:52:07 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								094e1ef048 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2019-03-15 14:28:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								da53c079db 
								
							 
						 
						
							
							
								
								Refactor to store user ap_id, add tests  
							
							 
							
							
							
						 
						
							2019-03-15 14:20:08 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c8f31e0bc2 
								
							 
						 
						
							
							
								
								Implement mastodon's reblog hiding feature  
							
							 
							
							
							
						 
						
							2019-03-15 14:18:21 +01:00