Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								25d8216804 
								
							 
						 
						
							
							
								
								Add email change endpoint  
							
							
							
						 
						
							2019-09-13 13:09:35 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								70eed0594c 
								
							 
						 
						
							
							
								
								credo fixes  
							
							
							
						 
						
							2019-08-31 13:08:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bd3ed3a622 
								
							 
						 
						
							
							
								
								Add back /api/qvitter/statuses/notifications/read.json  
							
							
							
						 
						
							2019-08-31 11:43:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								64410497d2 
								
							 
						 
						
							
							
								
								Remove TwitterAPI representers  
							
							
							
						 
						
							2019-08-31 10:41:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								985122cc03 
								
							 
						 
						
							
							
								
								Remove Activity, User and Notification views from TwitterAPI  
							
							
							
						 
						
							2019-08-31 10:31:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								90c2dae9a4 
								
							 
						 
						
							
							
								
								Remove most of Pleroma.Web.TwitterAPI.TwitterAPI  
							
							
							
						 
						
							2019-08-31 10:20:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								eb1739c596 
								
							 
						 
						
							
							
								
								Remove most of TwitterAPIController  
							
							
							
						 
						
							2019-08-27 12:29:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f7bbf99caa 
								
							 
						 
						
							
							
								
								Use info.fields instead of source_data for remote users  
							
							
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								58443d0cd6 
								
							 
						 
						
							
							
								
								tests for TwitterApi/UtilController  
							
							
							
						 
						
							2019-07-31 15:14:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								3850812503 
								
							 
						 
						
							
							
								
								twitter api: utils: rework do_remote_follow() to use CommonAPI  
							
							... 
							
							
							
							Closes  #1138  
						
							2019-07-29 20:00:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b93498eb52 
								
							 
						 
						
							
							
								
								constants: add as_public constant and use it everywhere  
							
							
							
						 
						
							2019-07-29 02:43:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e818381042 
								
							 
						 
						
							
							
								
								Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1  
							
							
							
						 
						
							2019-07-23 19:47:27 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c2e2aadc42 
								
							 
						 
						
							
							
								
								#1110  fixed /api/pleroma/healthcheck  
							
							
							
						 
						
							2019-07-19 16:20:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4bf2bb9cff 
								
							 
						 
						
							
							
								
								Fix password reset for non-test env  
							
							... 
							
							
							
							Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled. 
							
						 
						
							2019-07-17 18:09:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								10f82c88b8 
								
							 
						 
						
							
							
								
								mastoapi password reset  
							
							... 
							
							
							
							added rate limit to password reset
configure rate limit in runtime 
							
						 
						
							2019-07-16 21:44:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Moonman 
								
							 
						 
						
							
							
							
							
								
							
							
								f98f7ad1b9 
								
							 
						 
						
							
							
								
								detect and use sha512-crypt for stored password hash.  
							
							
							
						 
						
							2019-07-14 09:48:42 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1417627d07 
								
							 
						 
						
							
							
								
								Merge branch 'remove-avatar-header' into 'develop'  
							
							... 
							
							
							
							Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187  
							
						 
						
							2019-07-09 17:51:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c4ebb4d7 
								
							 
						 
						
							
							
								
								[ #184 ] small refactoring  reset password  
							
							
							
						 
						
							2019-06-24 19:01:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c65bbd6c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'remove-avatar-header'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-06-23 03:25:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f2e359687 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							
							
						 
						
							2019-06-04 09:49:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f13d6c7f78 
								
							 
						 
						
							
							
								
								update api to set skip_thread_containment  
							
							
							
						 
						
							2019-06-03 21:02:57 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								99f70c7e20 
								
							 
						 
						
							
							
								
								Use Pleroma.Config everywhere  
							
							
							
						 
						
							2019-05-30 15:33:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								59a703fcbe 
								
							 
						 
						
							
							
								
								twitter api: user view: expose user notification settings under pleroma object  
							
							
							
						 
						
							2019-05-25 05:31:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								0c53d91f3b 
								
							 
						 
						
							
							
								
								fix merge conflict  
							
							
							
						 
						
							2019-05-23 09:45:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								17bfd000d7 
								
							 
						 
						
							
							
								
								Ability to reset avatar, profile banner and backgroud  
							
							
							
						 
						
							2019-05-22 06:47:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								eb02edcad9 
								
							 
						 
						
							
							
								
								Add virtual :thread_muted? field  
							
							... 
							
							
							
							that may be set when fetching activities 
							
						 
						
							2019-05-21 00:35:46 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								de114ffbb0 
								
							 
						 
						
							
							
								
								activitypub: remove contain_timeline()  
							
							
							
						 
						
							2019-05-15 15:53:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb3451023 
								
							 
						 
						
							
							
								
								CommonAPI: Refactor visibility, forbid public to private replies.  
							
							
							
						 
						
							2019-05-15 16:30:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								ee22fff5ac 
								
							 
						 
						
							
							
								
								remove deprecated PleromaFE configuration  
							
							
							
						 
						
							2019-05-15 15:29:59 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								692919c7d2 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/use-job-queue-everywhere' into 'develop'  
							
							... 
							
							
							
							use job queue everywhere
Closes  #862 
See merge request pleroma/pleroma!1142  
							
						 
						
							2019-05-14 15:27:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ac3a3abf6b 
								
							 
						 
						
							
							
								
								clean up follow/block imports a little  
							
							
							
						 
						
							2019-05-14 15:07:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5e2b491276 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-14 18:15:56 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								69a9e0563c 
								
							 
						 
						
							
							
								
								user: migrate follow/blocks import to job queue  
							
							
							
						 
						
							2019-05-13 19:36:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								2a54e8c1f5 
								
							 
						 
						
							
							
								
								Use "repeated" instead of "retweeted" for repeated statuses in Twitter API  
							
							... 
							
							
							
							This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533  
							
						 
						
							2019-05-09 19:58:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d64c3b604e 
								
							 
						 
						
							
							
								
								twitterapi: use order constraint to force descending order  
							
							
							
						 
						
							2019-05-07 19:33:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1557b99beb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-07 16:51:11 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								ce6ca0fefe 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into feature/845-improve-status-deletion  
							
							
							
						 
						
							2019-05-06 16:45:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46bbf9e1cf 
								
							 
						 
						
							
							
								
								TwitterAPI: profile update with emoji_map  
							
							
							
						 
						
							2019-05-03 16:30:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								85434669bb 
								
							 
						 
						
							
							
								
								Web.TwitterAPI.UserView: Also view local user emojis  
							
							
							
						 
						
							2019-05-03 16:27:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							
							
						 
						
							2019-05-03 16:27:50 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								61ca2f7a4e 
								
							 
						 
						
							
							
								
								Fix rights in TwitterAPI's user entity being present only for  
							
							... 
							
							
							
							Admins/Moderators
In !1093  I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators. 
							
						 
						
							2019-04-28 19:42:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c157e27a00 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/disable-account  
							
							
							
						 
						
							2019-04-25 13:41:10 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								d35246c449 
								
							 
						 
						
							
							
								
								added healthcheck setting to instance config  
							
							
							
						 
						
							2019-04-22 17:00:06 +07:00