Lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								24eba26c5b 
								
							 
						 
						
							
							
								
								Restore old routes, enable user route as fallback.  
							
							
							
						 
						
							2018-12-25 18:43:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HJ 
								
							 
						 
						
							
							
							
							
								
							
							
								0ad837846a 
								
							 
						 
						
							
							
								
								Merge branch 'push_fix' into 'develop'  
							
							... 
							
							
							
							Fixes for push notifications
Closes  #235 
See merge request pleroma/pleroma-fe!433  
							
						 
						
							2018-12-25 11:33:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								500b4bd374 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2018-12-25 14:28:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								2fe0af2af1 
								
							 
						 
						
							
							
								
								Merge branch 'update-japanese-translation' into 'develop'  
							
							... 
							
							
							
							Update japanese translation
See merge request pleroma/pleroma-fe!435  
							
						 
						
							2018-12-25 09:03:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								8ae3518a9a 
								
							 
						 
						
							
							
								
								Update japanese translation  
							
							
							
						 
						
							2018-12-25 09:03:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HJ 
								
							 
						 
						
							
							
							
							
								
							
							
								a80c8fd24c 
								
							 
						 
						
							
							
								
								Merge branch 'refactor-recommendations' into 'develop'  
							
							... 
							
							
							
							remove unneeded numbered variables who_to_follow
See merge request pleroma/pleroma-fe!436  
							
						 
						
							2018-12-25 02:35:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hannah Ward 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed2393c970 
								
							 
						 
						
							
							
								
								fix inconsistencies within who_to_follow_panel  
							
							
							
						 
						
							2018-12-25 01:32:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HJ 
								
							 
						 
						
							
							
							
							
								
							
							
								698328dfbe 
								
							 
						 
						
							
							
								
								Merge branch 'fix_textfields' into 'develop'  
							
							... 
							
							
							
							Fix textarea not resizing correctly and probably cursor position
Closes  #230 
See merge request pleroma/pleroma-fe!430  
							
						 
						
							2018-12-25 01:29:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								18d7684f32 
								
							 
						 
						
							
							
								
								fix for non-shrinking main post form  
							
							
							
						 
						
							2018-12-25 04:25:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								e3cac42cc7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into push_fix  
							
							... 
							
							
							
							* upstream/develop:
  Add a translation to the captcha strings in the registration form
  Small UI improvements for the CAPTCHA field
  Add encrypted captcha_answer_data for stateless captcha
  fixes many problems related to user profile 
							
						 
						
							2018-12-25 03:46:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								a4f0902926 
								
							 
						 
						
							
							
								
								small refactor, added push unsub notice for BE  
							
							
							
						 
						
							2018-12-25 03:46:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hannah Ward 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6fa993c122 
								
							 
						 
						
							
							
								
								remove unneeded numbered variables who_to_follow  
							
							
							
						 
						
							2018-12-25 00:34:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								e59b67e119 
								
							 
						 
						
							
							
								
								Merge branch 'captcha' into 'develop'  
							
							... 
							
							
							
							Make captcha stateless
See merge request pleroma/pleroma-fe!434  
							
						 
						
							2018-12-22 06:17:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								10642df528 
								
							 
						 
						
							
							
								
								Add a translation to the captcha strings in the registration form  
							
							
							
						 
						
							2018-12-21 15:12:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								661efc51b7 
								
							 
						 
						
							
							
								
								Small UI improvements for the CAPTCHA field  
							
							
							
						 
						
							2018-12-21 00:25:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								8470856045 
								
							 
						 
						
							
							
								
								Add encrypted captcha_answer_data for stateless captcha  
							
							
							
						 
						
							2018-12-21 00:25:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								957b2a6f7e 
								
							 
						 
						
							
							
								
								simplified some code, made it possible to unregister serviceworker altogether  
							
							
							
						 
						
							2018-12-20 09:17:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								d0b47488fb 
								
							 
						 
						
							
							
								
								default webPush to false, because having it at true leads to some problems with  
							
							... 
							
							
							
							local dev mode. Instances can re-enable it, and BE can default it to true in config.exs 
							
						 
						
							2018-12-20 09:17:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								2921a25cb4 
								
							 
						 
						
							
							
								
								Merge branch 'fix_followers' into 'develop'  
							
							... 
							
							
							
							fixes many problems related to user profile
Closes  #239 
See merge request pleroma/pleroma-fe!432  
							
						 
						
							2018-12-20 06:12:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								b7962a224c 
								
							 
						 
						
							
							
								
								fixes many problems related to user profile  
							
							
							
						 
						
							2018-12-20 07:54:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								5970bf4e85 
								
							 
						 
						
							
							
								
								fixed incorrect height when empty text  
							
							
							
						 
						
							2018-12-20 07:27:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								afa2baec0c 
								
							 
						 
						
							
							
								
								I suppose SOME browsers don't do this by default...  
							
							
							
						 
						
							2018-12-20 07:17:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								ae7b96abbf 
								
							 
						 
						
							
							
								
								Fix resize not working properly for textareas  
							
							
							
						 
						
							2018-12-20 07:17:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HJ 
								
							 
						 
						
							
							
							
							
								
							
							
								b65ac128c1 
								
							 
						 
						
							
							
								
								Merge branch 'remove_favorite_hacks' into 'develop'  
							
							... 
							
							
							
							no more "broken favorite"
Closes  #218  and #145 
See merge request pleroma/pleroma-fe!431  
							
						 
						
							2018-12-19 14:57:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								c54b1fd0c5 
								
							 
						 
						
							
							
								
								Merge branch 'fix_defaults' into 'develop'  
							
							... 
							
							
							
							Fixed some settings not using defaults from instance config.
Closes  #228 
See merge request pleroma/pleroma-fe!429  
							
						 
						
							2018-12-19 04:51:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								5c2030e467 
								
							 
						 
						
							
							
								
								no more "broken favorite"  
							
							
							
						 
						
							2018-12-19 01:55:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								c7514be46f 
								
							 
						 
						
							
							
								
								Fixed some settings not using defaults from instance config. Made some parts of  
							
							... 
							
							
							
							code more readable 
							
						 
						
							2018-12-18 23:31:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HJ 
								
							 
						 
						
							
							
							
							
								
							
							
								562c68a51c 
								
							 
						 
						
							
							
								
								Merge branch 'user-profile-overhault' into 'develop'  
							
							... 
							
							
							
							Small refactor for followers/friends, change display to use tabs instead of "leaky brains"
Closes  #111 
See merge request pleroma/pleroma-fe!427  
							
						 
						
							2018-12-18 19:48:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								f62ff2d894 
								
							 
						 
						
							
							
								
								Merge branch 'feature/bigger-icons-for-mobile' into 'develop'  
							
							... 
							
							
							
							Feature/bigger icons for mobile / #211 
See merge request pleroma/pleroma-fe!423  
							
						 
						
							2018-12-18 18:26:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								67c2a607aa 
								
							 
						 
						
							
							
								
								Feature/bigger icons for mobile /  #211  
							
							
							
						 
						
							2018-12-18 18:26:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								2f28bf95fd 
								
							 
						 
						
							
							
								
								Merge branch 'feature/new-user-routes' into 'develop'  
							
							... 
							
							
							
							Make domain.com/username routes work
Closes pleroma#395
See merge request pleroma/pleroma-fe!392  
							
						 
						
							2018-12-18 15:26:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c1ff17ebb0 
								
							 
						 
						
							
							
								
								Merge branch 'clean-profile' into 'develop'  
							
							... 
							
							
							
							Make user profile page cleaner
Closes  #225 
See merge request pleroma/pleroma-fe!428  
							
						 
						
							2018-12-17 19:57:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								63ad08050e 
								
							 
						 
						
							
							
								
								Fix oauth url  
							
							
							
						 
						
							2018-12-17 21:58:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								485a531d57 
								
							 
						 
						
							
							
								
								clean up the unused stuff  
							
							
							
						 
						
							2018-12-17 21:02:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								be27494ca1 
								
							 
						 
						
							
							
								
								Make user profile page cleaner  
							
							
							
						 
						
							2018-12-17 20:42:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								56fdbf18c5 
								
							 
						 
						
							
							
								
								missing string and unification with counters (order)  
							
							
							
						 
						
							2018-12-17 19:21:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								bf805361d0 
								
							 
						 
						
							
							
								
								collateral fix for tab display  
							
							
							
						 
						
							2018-12-17 19:18:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								292ac59d08 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into user-profile-overhault  
							
							... 
							
							
							
							* upstream/develop:
  Fix style
  Add a way to get new captcha on click
  Fix style
  Separate captcha into the backendInteractor
  more visual fixes
  changed bottom-shadow hiding method to be more compatible with overflow
  small fix for overflowing tab-switcher
  Support disabling captcha
  Base support for CAPTCHA (kocaptcha) 
							
						 
						
							2018-12-17 19:18:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								23d434c40c 
								
							 
						 
						
							
							
								
								collateral fixes for user-card: use still-image, styles for custom emoji  
							
							
							
						 
						
							2018-12-17 19:17:03 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								b124dbf44e 
								
							 
						 
						
							
							
								
								Merge branch 'captcha' into 'develop'  
							
							... 
							
							
							
							Captcha
See merge request pleroma/pleroma-fe!424  
							
						 
						
							2018-12-17 13:36:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f671adae37 
								
							 
						 
						
							
							
								
								Redirect to /main/all  
							
							
							
						 
						
							2018-12-17 03:01:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								ea6977cd4d 
								
							 
						 
						
							
							
								
								Move userProfile link to methods  
							
							
							
						 
						
							2018-12-17 02:52:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								5f10c5e786 
								
							 
						 
						
							
							
								
								Fix user profile test  
							
							
							
						 
						
							2018-12-17 02:45:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								2211c533dd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/new-user-routes  
							
							
							
						 
						
							2018-12-17 02:39:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								5fc0fe28e4 
								
							 
						 
						
							
							
								
								Add temporary redirects  
							
							
							
						 
						
							2018-12-17 02:26:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b524e73a65 
								
							 
						 
						
							
							
								
								Add local profile test  
							
							
							
						 
						
							2018-12-17 01:53:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								d2984b9bc5 
								
							 
						 
						
							
							
								
								Fix style  
							
							
							
						 
						
							2018-12-16 22:55:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								ab6f1904fa 
								
							 
						 
						
							
							
								
								Add a way to get new captcha on click  
							
							
							
						 
						
							2018-12-16 22:47:52 +03:00