Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								a3305799c7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into emoji-selector-update  
							
							... 
							
							
							
							* upstream/develop: (42 commits)
  Fix formatting in oc.json
  avoid using global class
  fix logo moving bug when lightbox is open
  Reserve scrollbar gap when body scroll is locked
  setting display: initial makes trouble, instead, toggle display: none using classname
  lock body scroll
  add body-scroll-lock directive
  install body-scroll-lock
  wire up props with PostStatusModal
  rename component
  recover autofocusing behavior
  refactor MobilePostStatusModal using new PostStatusModal
  add new module and modal to post new status
  remove needless condition
  add mention button
  wire up user state with global store
  collapse fav/repeat notifications from muted users
  do not collapse thread muted posts in conversation
  detect thread-muted posts
  do not change word based muting logic
  ... 
							
						 
						
							2019-09-25 20:26:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								2f26e8acc5 
								
							 
						 
						
							
							
								
								eslint  
							
							
							
						 
						
							2019-09-25 20:23:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								e6d2cf77af 
								
							 
						 
						
							
							
								
								fix emoji inputs in user-settings, styles update  
							
							
							
						 
						
							2019-09-25 20:11:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								0b300e1708 
								
							 
						 
						
							
							
								
								bump z-index so that picker/suggest doesn't get overlapped by mobile button  
							
							
							
						 
						
							2019-09-25 20:01:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								e805303d3a 
								
							 
						 
						
							
							
								
								Scroll emoji picker into view if it's obstructed  
							
							
							
						 
						
							2019-09-25 19:58:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								e3ceae0989 
								
							 
						 
						
							
							
								
								very important fix  
							
							
							
						 
						
							2019-09-25 19:32:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								0d6a9f5a62 
								
							 
						 
						
							
							
								
								comment, cleanup and improve autoresize/autoscroll  
							
							
							
						 
						
							2019-09-25 19:30:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpuldson 
								
							 
						 
						
							
							
							
							
								
							
							
								e55645aec1 
								
							 
						 
						
							
							
								
								Fix formatting in oc.json  
							
							
							
						 
						
							2019-09-25 10:25:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								170372b2bc 
								
							 
						 
						
							
							
								
								Merge branch '616' into 'develop'  
							
							... 
							
							
							
							Lock body scroll when lightbox is open
Closes  #616 
See merge request pleroma/pleroma-fe!886  
							
						 
						
							2019-09-25 07:16:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								49ea63ddf3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'develop'  
							
							... 
							
							
							
							[i18n] Update for the Occitan language file
See merge request pleroma/pleroma-fe!901  
							
						 
						
							2019-09-25 07:12:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								7a1081aa66 
								
							 
						 
						
							
							
								
								Merge branch 'es-translate' into 'develop'  
							
							... 
							
							
							
							[i18n] Update es translate
See merge request pleroma/pleroma-fe!944  
							
						 
						
							2019-09-25 07:10:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								4c55e0d1be 
								
							 
						 
						
							
							
								
								Merge branch 'eu-translate' into 'develop'  
							
							... 
							
							
							
							[i18n] update eu translate
See merge request pleroma/pleroma-fe!943  
							
						 
						
							2019-09-25 07:09:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								ccba92a27c 
								
							 
						 
						
							
							
								
								Merge branch '639-2' into 'develop'  
							
							... 
							
							
							
							Add "Mention user" button to user card
Closes  #639 
See merge request pleroma/pleroma-fe!955  
							
						 
						
							2019-09-25 06:41:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								61bb02ef06 
								
							 
						 
						
							
							
								
								Merge branch '657' into 'develop'  
							
							... 
							
							
							
							Collapse fav/repeat notifications from muted users
Closes  #657 
See merge request pleroma/pleroma-fe!945  
							
						 
						
							2019-09-25 06:24:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								0f55359b49 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2019-09-25 08:43:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								4f563e6efb 
								
							 
						 
						
							
							
								
								account for parent padding, too  
							
							
							
						 
						
							2019-09-25 08:36:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								daa0e284c3 
								
							 
						 
						
							
							
								
								forgotten file  
							
							
							
						 
						
							2019-09-25 00:21:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								ca92e29401 
								
							 
						 
						
							
							
								
								WIP: fixed autoscroll, restructured Post Status Form's resize method "a bit"  
							
							
							
						 
						
							2019-09-25 00:17:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								2154152d08 
								
							 
						 
						
							
							
								
								fix some bugs  
							
							
							
						 
						
							2019-09-24 00:06:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								6f0257cd7d 
								
							 
						 
						
							
							
								
								autoscroll post form on typing + some minor improvements  
							
							
							
						 
						
							2019-09-23 22:12:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								7b4cb38734 
								
							 
						 
						
							
							
								
								split spam mode into two separate options (one in settings page)  
							
							
							
						 
						
							2019-09-23 20:36:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								aafb29c589 
								
							 
						 
						
							
							
								
								Added a setting to hide follow/follower count from the user profile  
							
							
							
						 
						
							2019-09-23 16:19:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f0b9f5d29c 
								
							 
						 
						
							
							
								
								use repeats intead boosts  
							
							
							
						 
						
							2019-09-22 14:45:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8ad145598d 
								
							 
						 
						
							
							
								
								fontello/ added eye icon  
							
							
							
						 
						
							2019-09-21 16:25:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8721fb57fc 
								
							 
						 
						
							
							
								
								added support hide\show reblogs from a specific user  
							
							
							
						 
						
							2019-09-21 16:24:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								7fe6ba2401 
								
							 
						 
						
							
							
								
								avoid using global class  
							
							
							
						 
						
							2019-09-20 11:35:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								37ae0fd92c 
								
							 
						 
						
							
							
								
								fix logo moving bug when lightbox is open  
							
							
							
						 
						
							2019-09-20 11:35:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								92be5a6877 
								
							 
						 
						
							
							
								
								Reserve scrollbar gap when body scroll is locked  
							
							
							
						 
						
							2019-09-20 11:35:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								ae70439447 
								
							 
						 
						
							
							
								
								setting display: initial makes trouble, instead, toggle display: none using classname  
							
							
							
						 
						
							2019-09-20 11:35:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								ad504768fe 
								
							 
						 
						
							
							
								
								lock body scroll  
							
							
							
						 
						
							2019-09-20 11:35:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								8b321f6f1f 
								
							 
						 
						
							
							
								
								add body-scroll-lock directive  
							
							
							
						 
						
							2019-09-20 11:35:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								60c3501d35 
								
							 
						 
						
							
							
								
								install body-scroll-lock  
							
							
							
						 
						
							2019-09-20 11:35:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								c8a18f387c 
								
							 
						 
						
							
							
								
								wire up props with PostStatusModal  
							
							
							
						 
						
							2019-09-20 11:29:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								d6a941a128 
								
							 
						 
						
							
							
								
								rename component  
							
							
							
						 
						
							2019-09-20 11:29:29 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								0c8038d4f6 
								
							 
						 
						
							
							
								
								recover autofocusing behavior  
							
							
							
						 
						
							2019-09-20 11:29:27 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								a9f33272a8 
								
							 
						 
						
							
							
								
								refactor MobilePostStatusModal using new PostStatusModal  
							
							
							
						 
						
							2019-09-20 11:29:26 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								f4bbf1d4e2 
								
							 
						 
						
							
							
								
								add new module and modal to post new status  
							
							
							
						 
						
							2019-09-20 11:29:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								90981dcce6 
								
							 
						 
						
							
							
								
								remove needless condition  
							
							
							
						 
						
							2019-09-20 11:29:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								5ff899b455 
								
							 
						 
						
							
							
								
								add mention button  
							
							
							
						 
						
							2019-09-20 11:29:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								f8139e369c 
								
							 
						 
						
							
							
								
								wire up user state with global store  
							
							
							
						 
						
							2019-09-20 11:25:00 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taehoon 
								
							 
						 
						
							
							
							
							
								
							
							
								8618857aa3 
								
							 
						 
						
							
							
								
								collapse fav/repeat notifications from muted users  
							
							
							
						 
						
							2019-09-20 11:25:00 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								dcef84363f 
								
							 
						 
						
							
							
								
								Merge branch 'muting-fixes' into 'develop'  
							
							... 
							
							
							
							Properly detect thread-muted posts and set `with_muted` when fetching notifications
See merge request pleroma/pleroma-fe!941  
							
						 
						
							2019-09-20 15:23:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1306fac38f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'muting-fixes'  
							
							... 
							
							
							
							# Conflicts:
#   src/components/status/status.js 
							
						 
						
							2019-09-16 11:38:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shpuld Shpludson 
								
							 
						 
						
							
							
							
							
								
							
							
								9b163d2816 
								
							 
						 
						
							
							
								
								Merge branch '656' into 'develop'  
							
							... 
							
							
							
							Do not collapse thread muted posts when it's expanded/on the thread page and do not collapse muted user's posts on muted user's profile page
Closes  #656 
See merge request pleroma/pleroma-fe!953  
							
						 
						
							2019-09-16 07:27:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HJ 
								
							 
						 
						
							
							
							
							
								
							
							
								3cd23ae2d4 
								
							 
						 
						
							
							
								
								Apply suggestion to src/components/emoji_input/emoji_input.js  
							
							
							
						 
						
							2019-09-16 07:23:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								c933f5edfc 
								
							 
						 
						
							
							
								
								changelog  
							
							
							
						 
						
							2019-09-15 17:22:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HJ 
								
							 
						 
						
							
							
							
							
								
							
							
								c78c7e7734 
								
							 
						 
						
							
							
								
								Update docs/USER_GUIDE.md  
							
							
							
						 
						
							2019-09-15 13:43:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								f961ce0f98 
								
							 
						 
						
							
							
								
								docs update  
							
							
							
						 
						
							2019-09-15 16:41:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								db961af3c8 
								
							 
						 
						
							
							
								
								unit test for emoji input, for now covering only insertion mechanism  
							
							
							
						 
						
							2019-09-15 16:01:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								312e2aa14f 
								
							 
						 
						
							
							
								
								fix bottom-left icons being too damn wide  
							
							
							
						 
						
							2019-09-15 12:51:39 +03:00