Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							b67db47c88 
							
						 
					 
					
						
						
							
							lint  
						
						 
						
						
						
						
					 
					
						2021-06-22 20:47:35 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							dd3fe61cf3 
							
						 
					 
					
						
						
							
							Merge branch 'better-still-emoji' into proper-attachments  
						
						 
						
						... 
						
						
						
						* better-still-emoji:
  fix non-notifying mentions and original mention display
  fix not escaping some stuff
  fix rich images 
						
						
					 
					
						2021-06-22 20:45:44 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							a2f21f4e13 
							
						 
					 
					
						
						
							
							fix description colliding with extra-long text  
						
						 
						
						
						
						
					 
					
						2021-06-22 20:42:52 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							628b99d117 
							
						 
					 
					
						
						
							
							don't stretch columns when uploading media  
						
						 
						
						
						
						
					 
					
						2021-06-22 20:37:08 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							5118eee19a 
							
						 
					 
					
						
						
							
							fix videos not stretching to container  
						
						 
						
						
						
						
					 
					
						2021-06-22 20:35:34 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba8d95a10 
							
						 
					 
					
						
						
							
							fix videos and related not having working drag controls  
						
						 
						
						
						
						
					 
					
						2021-06-22 20:33:57 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							4016182b89 
							
						 
					 
					
						
						
							
							fix z-indexes  
						
						 
						
						
						
						
					 
					
						2021-06-22 20:32:55 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							a258182522 
							
						 
					 
					
						
						
							
							fix non-notifying mentions and original mention display  
						
						 
						
						
						
						
					 
					
						2021-06-22 20:16:26 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eris 
							
						 
					 
					
						
						
						
						
							
						
						
							6125dc885a 
							
						 
					 
					
						
						
							
							Update for latest develop merges to CHANGELOG  
						
						 
						
						
						
						
					 
					
						2021-06-20 21:06:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								HJ 
							
						 
					 
					
						
						
						
						
							
						
						
							19475ba356 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into 'develop'  
						
						 
						
						... 
						
						
						
						Bug fix: Fix follow request count position on mobile
See merge request pleroma/pleroma-fe!1400  
						
						
					 
					
						2021-06-20 09:09:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9dd352e3 
							
						 
					 
					
						
						
							
							Fix follow request count position on mobile  
						
						 
						
						
						
						
					 
					
						2021-06-20 06:27:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							c6831a3810 
							
						 
					 
					
						
						
							
							fix not escaping some stuff  
						
						 
						
						
						
						
					 
					
						2021-06-18 21:42:46 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							8fe4355a6b 
							
						 
					 
					
						
						
							
							fix rich images  
						
						 
						
						
						
						
					 
					
						2021-06-18 21:29:47 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							6b8b9c017f 
							
						 
					 
					
						
						
							
							whoops  
						
						 
						
						
						
						
					 
					
						2021-06-18 17:39:29 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							44b741e270 
							
						 
					 
					
						
						
							
							better attachments in uploading (grid layout)  
						
						 
						
						
						
						
					 
					
						2021-06-18 17:30:56 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							8bab8658e8 
							
						 
					 
					
						
						
							
							better handling of unknown files, better upload display  
						
						 
						
						
						
						
					 
					
						2021-06-18 16:11:16 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							bfe31e20ea 
							
						 
					 
					
						
						
							
							better compact attachments  
						
						 
						
						
						
						
					 
					
						2021-06-18 14:12:50 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							5c2744b426 
							
						 
					 
					
						
						
							
							Merge branch 'better-still-emoji' into proper-attachments  
						
						 
						
						... 
						
						
						
						* better-still-emoji:
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox 
						
						
					 
					
						2021-06-18 02:28:11 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							b68fb7738b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into better-still-emoji  
						
						 
						
						... 
						
						
						
						* origin/develop:
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox 
						
						
					 
					
						2021-06-18 02:27:57 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							f35c090caa 
							
						 
					 
					
						
						
							
							merged in compact notifs and improved upon it  
						
						 
						
						
						
						
					 
					
						2021-06-18 02:27:32 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							c1293c3afa 
							
						 
					 
					
						
						
							
							Merge branch 'compact-notifs' into proper-attachments  
						
						 
						
						... 
						
						
						
						* compact-notifs:
  compact notifs 
						
						
					 
					
						2021-06-18 02:09:50 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							f15599e6e5 
							
						 
					 
					
						
						
							
							gallery in post status form!  
						
						 
						
						
						
						
					 
					
						2021-06-18 02:04:01 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							90345f158f 
							
						 
					 
					
						
						
							
							gallery now supports flash, fixes for flash component. refactored media modal  
						
						 
						
						
						
						
					 
					
						2021-06-18 02:03:38 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							85e2f8f78c 
							
						 
					 
					
						
						
							
							Don't show profile edit button in sidebar  
						
						 
						
						
						
						
					 
					
						2021-06-17 20:57:23 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eris 
							
						 
					 
					
						
						
						
						
							
						
						
							b2ebfc1fd6 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into 'editProfile'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#   CHANGELOG.md 
						
						
					 
					
						2021-06-17 19:35:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							e1361a1cae 
							
						 
					 
					
						
						
							
							Add edit profile button  
						
						 
						
						
						
						
					 
					
						2021-06-17 19:29:58 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							e654fead23 
							
						 
					 
					
						
						
							
							refactored attachments and gallery. All attachments now are in gallery.  
						
						 
						
						
						
						
					 
					
						2021-06-17 16:29:46 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							9c4957268d 
							
						 
					 
					
						
						
							
							Use proper setting name  
						
						 
						
						
						
						
					 
					
						2021-06-17 13:21:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							6689fed513 
							
						 
					 
					
						
						
							
							Use cleaner instance config check for shoutbox setting  
						
						 
						
						
						
						
					 
					
						2021-06-17 13:21:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							4ecbb58086 
							
						 
					 
					
						
						
							
							Make locale language cleaner  
						
						 
						
						
						
						
					 
					
						2021-06-17 13:21:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							0a3ce9cc8b 
							
						 
					 
					
						
						
							
							Don't shorten shoutbox to SB  
						
						 
						
						
						
						
					 
					
						2021-06-17 13:21:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							dcfd178314 
							
						 
					 
					
						
						
							
							Fix lint error  
						
						 
						
						
						
						
					 
					
						2021-06-17 13:21:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							1b26c713ef 
							
						 
					 
					
						
						
							
							Update CHANGELOG.md  
						
						 
						
						
						
						
					 
					
						2021-06-17 13:21:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							9e9ab5cec9 
							
						 
					 
					
						
						
							
							New option: Hide shoutbox  
						
						 
						
						
						
						
					 
					
						2021-06-17 13:21:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							a96a62929d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into settings-and-filtering  
						
						 
						
						... 
						
						
						
						* origin/develop:
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox 
						
						
					 
					
						2021-06-16 13:52:13 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							1717a3aaf2 
							
						 
					 
					
						
						
							
							fix chats again  
						
						 
						
						
						
						
					 
					
						2021-06-16 12:44:04 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							25bf28f051 
							
						 
					 
					
						
						
							
							added tests just in case  
						
						 
						
						
						
						
					 
					
						2021-06-16 02:11:24 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							ad3a2fd4e5 
							
						 
					 
					
						
						
							
							fixed "invisible" spans inside links  
						
						 
						
						
						
						
					 
					
						2021-06-16 01:20:20 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eris 
							
						 
					 
					
						
						
						
						
							
						
						
							139a0d1562 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into 'themeApply'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#   CHANGELOG.md 
						
						
					 
					
						2021-06-15 21:50:39 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eris 
							
						 
					 
					
						
						
						
						
							
						
						
							cab0095989 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into 'showMobileNewPost'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#   CHANGELOG.md
#   src/App.js 
						
						
					 
					
						2021-06-15 21:49:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								HJ 
							
						 
					 
					
						
						
						
						
							
						
						
							338134acfb 
							
						 
					 
					
						
						
							
							Merge branch 'hideShoutbox' into 'develop'  
						
						 
						
						... 
						
						
						
						New user option: Hide floating shoutbox
See merge request pleroma/pleroma-fe!1396  
						
						
					 
					
						2021-06-15 21:32:20 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							d7a53aec61 
							
						 
					 
					
						
						
							
							Use proper setting name  
						
						 
						
						
						
						
					 
					
						2021-06-15 18:09:00 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Henry Jameson 
							
						 
					 
					
						
						
						
						
							
						
						
							4aac0125e5 
							
						 
					 
					
						
						
							
							fixed bug with hashtags  
						
						 
						
						
						
						
					 
					
						2021-06-15 14:43:44 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							7e3393b5a2 
							
						 
					 
					
						
						
							
							Use cleaner instance config check for shoutbox setting  
						
						 
						
						
						
						
					 
					
						2021-06-15 00:59:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							5047663c51 
							
						 
					 
					
						
						
							
							Make locale language cleaner  
						
						 
						
						
						
						
					 
					
						2021-06-15 00:25:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							e67f295497 
							
						 
					 
					
						
						
							
							Update CHANGELOG.md  
						
						 
						
						
						
						
					 
					
						2021-06-14 23:32:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							312a237ca4 
							
						 
					 
					
						
						
							
							Revert duplicate buttons and move existing buttons to bottom-right corner independent of scroll  
						
						 
						
						
						
						
					 
					
						2021-06-14 23:31:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							4639e30cb8 
							
						 
					 
					
						
						
							
							Fix config naming for consistency  
						
						 
						
						
						
						
					 
					
						2021-06-14 20:41:34 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							cbccea0546 
							
						 
					 
					
						
						
							
							Don't shorten shoutbox to SB  
						
						 
						
						
						
						
					 
					
						2021-06-14 20:33:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eris 
							
						 
					 
					
						
						
						
						
							
						
						
							b88e6b8ab0 
							
						 
					 
					
						
						
							
							Update CHANGELOG.md  
						
						 
						
						
						
						
					 
					
						2021-06-14 20:11:57 +00:00