Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9604766a18 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes. 
							
						 
						
							2020-01-27 15:46:50 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d9cdd58423 
								
							 
						 
						
							
							
								
								Change last_status_at to be a date, not datetime ( #12966 )  
							
							 
							
							... 
							
							
							
							* Return last_status_at as date, not datetime
* Fix relative timestamp for dates when delay is inferior to 1 day
* Also fix public directory
* Fix error when last_status_at isn't set 
							
						 
						
							2020-01-26 23:13:48 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								eac7c66d2a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2019-09-05 11:36:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								80fe7fa415 
								
							 
						 
						
							
							
								
								Integrate translation strings for the Profile Directory. ( #11722 )  
							
							 
							
							... 
							
							
							
							Run `yarn manage:translations en` 
							
						 
						
							2019-09-02 18:12:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								741b53651e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design. 
							
						 
						
							2019-08-30 13:38:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b47119eb61 
								
							 
						 
						
							
							
								
								Change layout of public profile directory to be the same as in web UI ( #11705 )  
							
							 
							
							
							
						 
						
							2019-08-30 07:41:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								79922ae20f 
								
							 
						 
						
							
							
								
								Add profile directory to web UI ( #11688 )  
							
							 
							
							... 
							
							
							
							* Add profile directory to web UI
* Add a line of bio to the directory 
							
						 
						
							2019-08-30 00:14:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b49d415f37 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							No conflicts. 
							
						 
						
							2019-01-19 18:28:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								86087f7461 
								
							 
						 
						
							
							
								
								Add information about how to opt-in to the directory on the directory ( #9834 )  
							
							 
							
							... 
							
							
							
							Fix  #9833  
							
						 
						
							2019-01-18 10:25:44 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								41676bb021 
								
							 
						 
						
							
							
								
								Rename hide_followers_count helper to hide_followers_count?  
							
							 
							
							
							
						 
						
							2018-12-28 20:05:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ae7d5ee768 
								
							 
						 
						
							
							
								
								Move hide_followers_count logic to an helper  
							
							 
							
							
							
						 
						
							2018-12-20 14:51:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								cabf2772ea 
								
							 
						 
						
							
							
								
								Add a per-user setting to hide followers count  
							
							 
							
							... 
							
							
							
							This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them. 
							
						 
						
							2018-12-20 14:51:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								80f956bc3e 
								
							 
						 
						
							
							
								
								Per-user followers count display in profile directory  
							
							 
							
							
							
						 
						
							2018-12-20 14:51:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								20418dc7a7 
								
							 
						 
						
							
							
								
								Add admin setting to disable followers count  
							
							 
							
							
							
						 
						
							2018-12-20 14:51:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								32bd452b56 
								
							 
						 
						
							
							
								
								Remove "most popular" tab from profile directory, add responsive design ( #9539 )  
							
							 
							
							... 
							
							
							
							* Remove "most popular" tab from profile directory, add responsive design
* Remove unused translations 
							
						 
						
							2018-12-17 03:14:28 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f551383e4a 
								
							 
						 
						
							
							
								
								Cache hashtag sample accounts, and exclude ineligible ones ( #9465 )  
							
							 
							
							
							
						 
						
							2018-12-08 01:32:26 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ac437d6b25 
								
							 
						 
						
							
							
								
								Fix various things in the directory ( #9449 )  
							
							 
							
							... 
							
							
							
							* Fix missing variable in directory page title
* Order hashtags by number of people instead of alphabetically
* Add icon to OpenGraph preview of directory page
* Prevent line breaks in hashtags and ensure lowercase in the table 
							
						 
						
							2018-12-07 16:37:32 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								fd8ca11f19 
								
							 
						 
						
							
							
								
								Add profile directory ( #9427 )  
							
							 
							
							... 
							
							
							
							Fix  #5578  
							
						 
						
							2018-12-06 17:36:11 +01:00