Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								bd261309cc 
								
							 
						 
						
							
							
								
								added unread_notifications_count for /api/v1/accounts/verify_credentials  
							
							 
							
							
							
						 
						
							2020-05-06 15:08:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								942d7467ca 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into features/remove-user-source_data  
							
							 
							
							
							
						 
						
							2020-04-16 21:28:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a21baf89d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							 
							
							
							
						 
						
							2020-04-13 09:16:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e365448f3 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							 
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-04-11 19:46:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							 
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3fa51f7272 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/views/account_view.ex
#	lib/pleroma/web/mastodon_api/views/status_view.ex 
							
						 
						
							2020-04-02 19:38:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aa78325117 
								
							 
						 
						
							
							
								
								[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.  
							
							 
							
							
							
						 
						
							2020-04-02 19:23:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2f2bd7fe72 
								
							 
						 
						
							
							
								
								Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.  
							
							 
							
							... 
							
							
							
							See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param. 
							
						 
						
							2020-04-01 19:49:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								185520d1b4 
								
							 
						 
						
							
							
								
								Provide known-good user.uri, remove User.profile_url/1  
							
							 
							
							
							
						 
						
							2020-03-31 23:55:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								be9d18461a 
								
							 
						 
						
							
							
								
								FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).  
							
							 
							
							
							
						 
						
							2020-03-28 18:49:03 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6b793d3f83 
								
							 
						 
						
							
							
								
								Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).  
							
							 
							
							
							
						 
						
							2020-03-26 21:54:01 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								460e41585c 
								
							 
						 
						
							
							
								
								Further preloading (more endpoints), refactoring, tests.  
							
							 
							
							
							
						 
						
							2020-03-25 20:33:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								be5e2c4dbb 
								
							 
						 
						
							
							
								
								Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).  
							
							 
							
							
							
						 
						
							2020-03-25 17:01:45 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8f1d622b8d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering  
							
							 
							
							
							
						 
						
							2020-03-24 22:15:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								13cbb9f6ad 
								
							 
						 
						
							
							
								
								Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).  
							
							 
							
							
							
						 
						
							2020-03-24 22:14:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3c78e5f327 
								
							 
						 
						
							
							
								
								Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.  
							
							 
							
							
							
						 
						
							2020-03-23 12:01:11 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c2e415143b 
								
							 
						 
						
							
							
								
								WIP: preloading of user relations for timeline/statuses rendering (performance improvement).  
							
							 
							
							
							
						 
						
							2020-03-22 21:51:44 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15be6ba9c2 
								
							 
						 
						
							
							
								
								AccountView: fix for other forms of <br> in bio  
							
							 
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643  
							
						 
						
							2020-03-22 16:41:01 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								981e015f1b 
								
							 
						 
						
							
							
								
								Mastodon API Account view: Remove an outdated hack  
							
							 
							
							... 
							
							
							
							The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary. 
							
						 
						
							2020-03-22 17:10:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								8176ca9e40 
								
							 
						 
						
							
							
								
								static_fe: Sanitize HTML in users  
							
							 
							
							
							
						 
						
							2020-03-15 20:44:04 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							 
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a  --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 
						
							2020-03-02 06:08:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								983a87175e 
								
							 
						 
						
							
							
								
								mastodon API: do not sanitize html in non-html fields  
							
							 
							
							
							
						 
						
							2020-02-02 14:46:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								701815e64c 
								
							 
						 
						
							
							
								
								[ActivityPub] Configurable ActivityPub actor type  
							
							 
							
							
							
						 
						
							2019-12-10 13:19:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								30caf3e51e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user.ex 
							
						 
						
							2019-12-04 18:56:31 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7722e5a67a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'  
							
							 
							
							... 
							
							
							
							Support "Move" activity
Closes  #1316 
See merge request pleroma/pleroma!1883  
							
						 
						
							2019-12-02 16:26:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								52cc7de82c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	mix.lock 
							
						 
						
							2019-11-29 10:17:59 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								50b152766f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count  
							
							 
							
							
							
						 
						
							2019-11-27 14:48:28 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f595cfe623 
								
							 
						 
						
							
							
								
								Remove User.user_info/2  
							
							 
							
							
							
						 
						
							2019-11-27 19:43:47 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c31ddce51e 
								
							 
						 
						
							
							
								
								[ #1335 ] Reorganized users.mutes as relation to UserMute entity.  
							
							 
							
							
							
						 
						
							2019-11-15 21:38:54 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e6d7e27bd6 
								
							 
						 
						
							
							
								
								Add allow_following_move setting to User  
							
							 
							
							
							
						 
						
							2019-11-12 18:45:28 +07: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								8249924485 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							 
							
							
							
						 
						
							2019-10-05 20:12:00 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e07e9cb75e 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !1737  
							
						 
						
							2019-10-05 10:00:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								06d9df79c5 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							 
							
							
							
						 
						
							2019-10-04 00:53:23 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e7aef27c00 
								
							 
						 
						
							
							
								
								Fix merge  
							
							 
							
							
							
						 
						
							2019-09-30 19:10:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								14294243a2 
								
							 
						 
						
							
							
								
								mastodon api: implement follow_requests_count  
							
							 
							
							
							
						 
						
							2019-09-27 04:22:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								5fb72170a7 
								
							 
						 
						
							
							
								
								Revert "add _discoverable_ keyword into ActivityPub @context"  
							
							 
							
							... 
							
							
							
							This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5. 
							
						 
						
							2019-09-26 02:57:41 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ef43016b2c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/custom-fields' into 'develop'  
							
							 
							
							... 
							
							
							
							Add custom profile fields
See merge request pleroma/pleroma!1488  
							
						 
						
							2019-08-20 12:44:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bd5ad0af78 
								
							 
						 
						
							
							
								
								Cache follow state  
							
							 
							
							
							
						 
						
							2019-08-15 00:47:30 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								e0ac5c7a66 
								
							 
						 
						
							
							
								
								Add custom profile fields  
							
							 
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								409bcad54b 
								
							 
						 
						
							
							
								
								Mastodon API: Set follower/following counters to 0 when hiding  
							
							 
							
							... 
							
							
							
							followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency. 
							
						 
						
							2019-08-09 16:53:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9c0da1009a 
								
							 
						 
						
							
							
								
								Return profile URL in MastodonAPI's url field  
							
							 
							
							
							
						 
						
							2019-08-07 21:40:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								089d53a961 
								
							 
						 
						
							
							
								
								Simplify logic to mention.js url field  
							
							 
							
							... 
							
							
							
							`User.profile_url` already fallbacks to ap_id 
							
						 
						
							2019-08-07 20:55:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a10c840aba 
								
							 
						 
						
							
							
								
								Return profile URL when available instead of actor URI for MastodonAPI mention URL  
							
							 
							
							... 
							
							
							
							Fixes  #1165  
							
						 
						
							2019-08-07 20:29:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4504135894 
								
							 
						 
						
							
							
								
								Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)  
							
							 
							
							
							
						 
						
							2019-07-24 15:12:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								520ee6c591 
								
							 
						 
						
							
							
								
								Add pleroma.deactivated to the Account entity (Mastodon API)  
							
							 
							
							
							
						 
						
							2019-07-16 11:14:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								c4ca142e14 
								
							 
						 
						
							
							
								
								Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)  
							
							 
							
							
							
						 
						
							2019-07-16 11:04:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							 
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00