Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								81c83566cd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into user-profile-overhault  
							
							... 
							
							
							
							* upstream/develop: (24 commits)
  Feature/bigger icons for mobile / #211 
  Fix oauth url
  Make user profile page cleaner
  Redirect to /main/all
  Move userProfile link to methods
  Fix user profile test
  Add temporary redirects
  Add local profile test
  Implement user_profile.spec.js
  Use babel polyfill in karma
  Use 'userProfileLink' to generate user-profile link
  Rollback disableDotRule
  Use "-1" in indexOf
  Add generateProfileLink
  Use "~" as a route namespace symbol
  Disable dot rule
  Pass userName instead of userId
  Typo in tests
  Fix redirect paths
  Fix typo
  ... 
							
						 
						
							2018-12-18 22:43:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								56fdbf18c5 
								
							 
						 
						
							
							
								
								missing string and unification with counters (order)  
							
							
							
						 
						
							2018-12-17 19:21:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								8f255fbad4 
								
							 
						 
						
							
							
								
								Refactor follower/friends out of statuses/timeline into user_profile where it  
							
							... 
							
							
							
							belongs. Changed display of profile to single panel with tabs. 
							
						 
						
							2018-12-17 19:14:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								2211c533dd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/new-user-routes  
							
							
							
						 
						
							2018-12-17 02:39:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								828b1c78f9 
								
							 
						 
						
							
							
								
								Implement user_profile.spec.js  
							
							
							
						 
						
							2018-12-15 06:16:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								42bb348219 
								
							 
						 
						
							
							
								
								Fix fetching new users, add storing local users in usersObjects with their  
							
							... 
							
							
							
							screen_name as well as id, so that they could be fetched zero-state with
screen-name link. 
							
						 
						
							2018-12-13 15:34:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								c1dc69a038 
								
							 
						 
						
							
							
								
								Pass userName instead of userId  
							
							
							
						 
						
							2018-12-06 22:10:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								54c6438b17 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2018-12-06 22:09:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								6532462b95 
								
							 
						 
						
							
							
								
								Move old routes to /p, use /nickname for user profiles  
							
							
							
						 
						
							2018-12-06 22:09:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								ccb1682379 
								
							 
						 
						
							
							
								
								Add userId property to timelines so that we don't overwrite user timeline meant  
							
							... 
							
							
							
							for another user 
							
						 
						
							2018-12-03 09:29:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								63fdad8703 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2018-08-30 22:59:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								bc85e5f0c1 
								
							 
						 
						
							
							
								
								Further usercard readibility. Made it visible which "tab" is actiavated - should  
							
							... 
							
							
							
							be enough to hint user that you can click "following" / "followers". Fixes  #77  
							
						 
						
							2018-05-12 15:19:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								529643d35a 
								
							 
						 
						
							
							
								
								indents  
							
							
							
						 
						
							2018-04-07 19:30:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								33b1d85921 
								
							 
						 
						
							
							
								
								border-radii moved to variables, made rgbo colors use theme data, customizable  
							
							... 
							
							
							
							from settings screen. 
							
						 
						
							2018-04-07 16:40:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								aa0564406a 
								
							 
						 
						
							
							
								
								getting rid of baseXX, some small fixes. Seems to be usable.  
							
							
							
						 
						
							2018-04-07 16:34:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								bfb2d481bb 
								
							 
						 
						
							
							
								
								Add i18n for User Timeline  
							
							
							
						 
						
							2018-03-12 03:59:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								07057043d9 
								
							 
						 
						
							
							
								
								Use state object for user view instead of timeline.  
							
							... 
							
							
							
							Also fetch user if not in the state already. 
							
						 
						
							2017-11-14 18:08:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpuldson 
								
							 
						 
						
							
							
							
							
								
							
							
								bf61592b56 
								
							 
						 
						
							
							
								
								Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict.  
							
							
							
						 
						
							2017-08-23 20:33:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpuldson 
								
							 
						 
						
							
							
							
							
								
							
							
								2bc261afba 
								
							 
						 
						
							
							
								
								Merge branch 'feature/follow-lists' into 'develop'  
							
							... 
							
							
							
							Feature/follow lists
See merge request !106  
							
						 
						
							2017-08-23 12:40:39 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								e1ec01dc3e 
								
							 
						 
						
							
							
								
								Appease linter.  
							
							
							
						 
						
							2017-08-23 19:21:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								ccfc2e57d0 
								
							 
						 
						
							
							
								
								Add follower and following views  
							
							
							
						 
						
							2017-08-23 19:14:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpuldson 
								
							 
						 
						
							
							
							
							
								
							
							
								2084c92dff 
								
							 
						 
						
							
							
								
								Force user profile timeline update when the user id changes (like when another user has been searched/found).  
							
							
							
						 
						
							2017-08-16 16:40:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								bbb9a9c93c 
								
							 
						 
						
							
							
								
								Fetch user from timeline.  
							
							
							
						 
						
							2017-06-12 17:07:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								5328aca1ef 
								
							 
						 
						
							
							
								
								Use userId in timeline.  
							
							
							
						 
						
							2017-06-12 16:34:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								bda0a76c89 
								
							 
						 
						
							
							
								
								Clear timeline on user change.  
							
							
							
						 
						
							2017-06-12 16:30:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								2e7029b670 
								
							 
						 
						
							
							
								
								Display user timeline  
							
							
							
						 
						
							2017-06-12 16:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								090148ef60 
								
							 
						 
						
							
							
								
								Start fetching user timelines.  
							
							
							
						 
						
							2017-06-12 16:00:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shpuld 
								
							 
						 
						
							
							
							
							
								
							
							
								ede4d77cfd 
								
							 
						 
						
							
							
								
								Move profile picture to right side, make the names appear next to it, extend profile background pic further and fade it out with gradients, fix the crappy borders around the inline user card.  
							
							
							
						 
						
							2017-02-22 23:08:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shpuld 
								
							 
						 
						
							
							
							
							
								
							
							
								8a0197d682 
								
							 
						 
						
							
							
								
								Fix follow/mute buttons from getting squished on mobile  
							
							
							
						 
						
							2017-02-18 19:58:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shpuld 
								
							 
						 
						
							
							
							
							
								
							
							
								15c82dea62 
								
							 
						 
						
							
							
								
								moved around classes in the user-info css  
							
							
							
						 
						
							2017-02-18 15:49:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shpuld 
								
							 
						 
						
							
							
							
							
								
							
							
								e86b1d71ee 
								
							 
						 
						
							
							
								
								Changed following-info to user-interactions and moved muting there, made everything in user-interactions look a bit neater  
							
							
							
						 
						
							2017-02-18 15:48:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hakui 
								
							 
						 
						
							
							
							
							
								
							
							
								734597b43f 
								
							 
						 
						
							
							
								
								hello world  
							
							
							
						 
						
							2017-02-18 01:48:35 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4448f36f62 
								
							 
						 
						
							
							
								
								User profile css fix.  
							
							
							
						 
						
							2017-01-15 16:26:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								fc268c48bc 
								
							 
						 
						
							
							
								
								Very basic user following.  
							
							
							
						 
						
							2016-12-08 09:09:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								187c4a7d57 
								
							 
						 
						
							
							
								
								CSS fixes.  
							
							
							
						 
						
							2016-12-02 14:33:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								fcccb9df68 
								
							 
						 
						
							
							
								
								Add basic user profiles.  
							
							
							
						 
						
							2016-11-30 23:32:22 +01:00