Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7c7f90bc4f 
								
							 
						 
						
							
							
								
								[ #1304 ] Merged develop, handled User.Info.invisible.  
							
							
							
						 
						
							2019-10-21 11:58:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a11a7176d5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex 
							
						 
						
							2019-10-21 11:05:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								ba92522c69 
								
							 
						 
						
							
							
								
								tests: add test to ensure invisible actors are rendered with the invisible hint set to true  
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d87be2ec96 
								
							 
						 
						
							
							
								
								Don't embed the first page in inboxes/outboxes and refactor the views to  
							
							... 
							
							
							
							follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased. 
							
						 
						
							2019-09-25 15:59:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								38245f1336 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-23 21:32:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									D Anzorge 
								
							 
						 
						
							
							
							
							
								
							
							
								9aca2cc95d 
								
							 
						 
						
							
							
								
								Add test for correct AP outbox pagination  
							
							
							
						 
						
							2019-09-19 16:49:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d4ed3a35b8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-19 07:35:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								450bf7a63c 
								
							 
						 
						
							
							
								
								Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)  
							
							
							
						 
						
							2019-09-17 14:45:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								007e0c1ce1 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2019-09-11 23:19:06 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								7d6f8a7fd7 
								
							 
						 
						
							
							
								
								Linkify custom fields values in ActivityPub.UserViewx  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								88598c9baf 
								
							 
						 
						
							
							
								
								Add profile custom fields to ActivityPub.UserView  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								27ed260eed 
								
							 
						 
						
							
							
								
								AP user view: Add a test for hiding totalItems in following/followers  
							
							
							
						 
						
							2019-07-12 18:36:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								93a0eeab16 
								
							 
						 
						
							
							
								
								Add license/copyright to all project files  
							
							
							
						 
						
							2019-07-10 05:13:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8a41d34673 
								
							 
						 
						
							
							
								
								[ #878 ] Tests improvements per code review.  
							
							
							
						 
						
							2019-07-09 22:37:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								daff85a985 
								
							 
						 
						
							
							
								
								[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.  
							
							
							
						 
						
							2019-07-08 19:53:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								045803346d 
								
							 
						 
						
							
							
								
								move key generation functions into Pleroma.Keys module  
							
							
							
						 
						
							2019-05-22 03:58:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								10a7a4a868 
								
							 
						 
						
							
							
								
								AP UserView: Refactor banner / avatar display code, add test.  
							
							
							
						 
						
							2019-03-26 16:59:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								64620d8980 
								
							 
						 
						
							
							
								
								activitypub: user view: do not expose oAuth endpoints for instance users  
							
							
							
						 
						
							2019-02-14 02:41:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d54c483964 
								
							 
						 
						
							
							
								
								tests: add tests for endpoints  
							
							
							
						 
						
							2019-02-13 19:48:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f6be980f4f 
								
							 
						 
						
							
							
								
								activitypub: object view: avoid leaking private details  
							
							
							
						 
						
							2018-11-17 22:30:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3b02fd9fb7 
								
							 
						 
						
							
							
								
								Small refactor.  
							
							
							
						 
						
							2018-11-08 16:05:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8546551257 
								
							 
						 
						
							
							
								
								activitypub: switch to using x509 representation for public keys instead of pkcs#1  
							
							
							
						 
						
							2018-07-12 03:30:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Iwakura 
								
							 
						 
						
							
							
							
							
								
							
							
								da005d3332 
								
							 
						 
						
							
							
								
								ActivityPub: Add Objects View.  
							
							
							
						 
						
							2017-12-11 18:19:46 +01:00