Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4198c3ac39 
								
							 
						 
						
							
							
								
								Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel  
							
							
							
						 
						
							2019-07-11 13:55:31 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								93a0eeab16 
								
							 
						 
						
							
							
								
								Add license/copyright to all project files  
							
							
							
						 
						
							2019-07-10 05:13:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b0fce6e9 
								
							 
						 
						
							
							
								
								Fix/1019 correct count remote users  
							
							
							
						 
						
							2019-07-09 17:36:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								23d4781e73 
								
							 
						 
						
							
							
								
								change for local user search  
							
							
							
						 
						
							2019-07-09 08:52:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6dadf5d6f4 
								
							 
						 
						
							
							
								
								[ #1043 ] fix search accounts.  
							
							
							
						 
						
							2019-07-05 04:22:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								ee4ed87fb4 
								
							 
						 
						
							
							
								
								[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)  
							
							
							
						 
						
							2019-06-14 11:39:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6f29865d43 
								
							 
						 
						
							
							
								
								Add option to restrict all users to local content  
							
							
							
						 
						
							2019-06-11 21:25:53 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cb2bcee842 
								
							 
						 
						
							
							
								
								User Search: Boost friends more strongly.  
							
							
							
						 
						
							2019-06-06 16:18:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								f82382de22 
								
							 
						 
						
							
							
								
								[ #943 ] Make the unauthenticated users limitation optional  
							
							
							
						 
						
							2019-06-06 12:17:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5b04f07a1e 
								
							 
						 
						
							
							
								
								Limit search for unauthenticated users to local users only  
							
							
							
						 
						
							2019-06-05 16:51:04 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b92c004ea8 
								
							 
						 
						
							
							
								
								Reuse query from User.restrict_deactivated/1  
							
							
							
						 
						
							2019-05-14 18:29:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5e2b491276 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-14 18:15:56 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								bfeb33e951 
								
							 
						 
						
							
							
								
								Merge develop  
							
							... 
							
							
							
							Merge conflict in lib/pleroma/activity.ex 
							
						 
						
							2019-05-08 14:34:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							
							
						 
						
							2019-05-03 16:27:50 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fb82f6fc7c 
								
							 
						 
						
							
							
								
								[Credo] Remove parentesis on argument-less functions  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								25eb6cf1cb 
								
							 
						 
						
							
							
								
								Add "roles" to users admin API  
							
							
							
						 
						
							2019-03-12 22:15:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								d5418e9ff7 
								
							 
						 
						
							
							
								
								Remove follow_request_count as it's not needed for FE anymore.  
							
							... 
							
							
							
							MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load. 
							
						 
						
							2019-03-03 18:42:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								5a46d37af9 
								
							 
						 
						
							
							
								
								Update the mute implementation to the current codebase  
							
							... 
							
							
							
							Make it part of the info thing (and do a migration to ensure it's there) 
							
						 
						
							2019-02-19 23:09:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c23bd05737 
								
							 
						 
						
							
							
								
								Merge branch 'features/flavour-switching' into 'develop'  
							
							... 
							
							
							
							[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807  
							
						 
						
							2019-02-18 04:01:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								cd019a5927 
								
							 
						 
						
							
							
								
								Merge branch 'follow-request-count' into 'develop'  
							
							... 
							
							
							
							Follow request count
See merge request pleroma/pleroma!817  
							
						 
						
							2019-02-18 04:01:26 +00:00