9abb227250 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes. 
							
						 
						
							2020-03-22 16:10:44 +01:00  
				
					
						
							
							
								 
						
							
								2f2b48b227 
								
							 
						 
						
							
							
								
								[Glitch] Fix `/web` redirecting to `/web/web` in web UI  
							
							... 
							
							
							
							Port 0f07218e53 
							
						 
						
							2020-02-25 14:30:43 +01:00  
				
					
						
							
							
								 
						
							
								c9166a5943 
								
							 
						 
						
							
							
								
								[Glitch] Fix old browsers crashing because of missing `finally` polyfill in web UI  
							
							... 
							
							
							
							Port 1314bba68a 
							
						 
						
							2020-02-19 23:10:37 +01:00  
				
					
						
							
							
								 
						
							
								05351cbffb 
								
							 
						 
						
							
							
								
								[Glitch] minor server-sent events fixes  
							
							... 
							
							
							
							Port front-end changes from 0dfba0884e 
							
						 
						
							2020-01-25 10:13:56 +01:00  
				
					
						
							
							
								 
						
							
								4417e9e1fd 
								
							 
						 
						
							
							
								
								[Glitch] Add transparent support for EventSource streaming.  
							
							... 
							
							
							
							Port 619da5a4dc 
							
						 
						
							2020-01-24 15:25:19 +01:00  
				
					
						
							
							
								 
						
							
								83359fef2b 
								
							 
						 
						
							
							
								
								[Glitch] Fix shortNumberFormat to within 3 chars without units  
							
							... 
							
							
							
							Port 0e8c0287d0 
							
						 
						
							2020-01-04 23:04:52 +01:00  
				
					
						
							
							
								 
						
							
								176f1da267 
								
							 
						 
						
							
							
								
								[Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2  
							
							... 
							
							
							
							Port f92ed32df4 
							
						 
						
							2019-12-07 12:54:27 +01:00  
				
					
						
							
							
								 
						
							
								ec567337dc 
								
							 
						 
						
							
							
								
								[Glitch] fix: support KaiOS arrow navigation on public pages  
							
							... 
							
							
							
							Port 1e232e455c 
							
						 
						
							2019-11-06 14:59:57 +01:00  
				
					
						
							
							
								 
						
							
								0fbe36e3fb 
								
							 
						 
						
							
							
								
								Partially revert scrollbar handling on mobile, since its width-based and wrong  
							
							... 
							
							
							
							Have to investigate as to whether it was actually needed on mobile, doesn't
seem to be the case from Firefox's Responsive Design Mode 
							
						 
						
							2019-10-06 00:32:06 +02:00  
				
					
						
							
							
								 
						
							
								7d79e1f31c 
								
							 
						 
						
							
							
								
								[Glitch] Do not add margin light when opening modal on mobile  
							
							... 
							
							
							
							Port 0a49b26793 
							
						 
						
							2019-10-06 00:32:06 +02:00  
				
					
						
							
							
								 
						
							
								88481c9653 
								
							 
						 
						
							
							
								
								[Glitch] Add explanation to mute dialog, refactor and clean up mute/block UI  
							
							... 
							
							
							
							Port 9027bfff0c 
							
						 
						
							2019-09-30 15:58:29 +02:00  
				
					
						
							
							
								 
						
							
								4b7c436ae9 
								
							 
						 
						
							
							
								
								[Glitch] Fix emoji search not showing custom emoji when none are uncategorized  
							
							... 
							
							
							
							Port 0d2b60ab8b 
							
						 
						
							2019-09-30 15:58:29 +02:00  
				
					
						
							
							
								 
						
							
								bd0bde1da2 
								
							 
						 
						
							
							
								
								[Glitch] Exclude URLs from text analysis  
							
							... 
							
							
							
							Port e974d4923f 
							
						 
						
							2019-09-05 14:13:03 +02:00  
				
					
						
							
							
								 
						
							
								8b630f7e54 
								
							 
						 
						
							
							
								
								[Glitch] Add trends UI with admin and user settings  
							
							... 
							
							
							
							Port 9072fe5ab6 
							
						 
						
							2019-09-02 10:57:44 +02:00  
				
					
						
							
							
								 
						
							
								e519b47da6 
								
							 
						 
						
							
							
								
								Update backend links and fix hardcoded ones  
							
							
							
						 
						
							2019-08-31 18:23:24 +02:00  
				
					
						
							
							
								 
						
							
								7fe2120dd5 
								
							 
						 
						
							
							
								
								[Glitch] Add profile directory to web UI  
							
							... 
							
							
							
							Port cb447b28c4 
							
						 
						
							2019-08-31 18:23:23 +02:00  
				
					
						
							
							
								 
						
							
								3aeaf9b897 
								
							 
						 
						
							
							
								
								[Glitch] Add audio player  
							
							... 
							
							
							
							Port 4190e31626 
							
						 
						
							2019-08-29 17:32:22 +02:00  
				
					
						
							
							
								 
						
							
								f11e9d5524 
								
							 
						 
						
							
							
								
								[Glitch] Add confirmation modal when logging out from the web app  
							
							... 
							
							
							
							Port fd3d45d38f 
							
						 
						
							2019-08-29 17:32:22 +02:00  
				
					
						
							
							
								 
						
							
								5c35c9c409 
								
							 
						 
						
							
							
								
								[Glitch] Fix tesseract.js being part of the common chunk  
							
							... 
							
							
							
							Port dfe6059889 
							
						 
						
							2019-08-19 21:56:25 +02:00  
				
					
						
							
							
								 
						
							
								4e9794f533 
								
							 
						 
						
							
							
								
								[Glitch] Fix client-side resizing of image uploads  
							
							... 
							
							
							
							Port f178a01c11 
							
						 
						
							2019-08-19 21:49:39 +02:00  
				
					
						
							
							
								 
						
							
								26b249ad2d 
								
							 
						 
						
							
							
								
								[Glitch] Fix short number formatting for numbers above million in web UI  
							
							... 
							
							
							
							Port 0e9668051e 
							
						 
						
							2019-08-19 21:49:39 +02:00  
				
					
						
							
							
								 
						
							
								597ea5687a 
								
							 
						 
						
							
							
								
								Add option to disable emoji replacements  
							
							... 
							
							
							
							Fixes  #647 
The option is found in `/settings` (because that was easier to write it this
way) but only affects the glitch-soc front-end. 
						
							2019-08-12 23:01:37 +02:00  
				
					
						
							
							
								 
						
							
								381dbb6569 
								
							 
						 
						
							
							
								
								[Glitch] Fix image uploads being perfectly white when canvas read access is blocked  
							
							... 
							
							
							
							Port 111a0628fc 
							
						 
						
							2019-08-06 15:09:30 +02:00  
				
					
						
							
							
								 
						
							
								49a28e69a5 
								
							 
						 
						
							
							
								
								Move decodeIDNA to app/javascript/flavours/glitch/util  
							
							
							
						 
						
							2019-08-04 22:25:56 +02:00  
				
					
						
							
							
								 
						
							
								c1231a846a 
								
							 
						 
						
							
							
								
								[Glitch] Play animated custom emoji on hover  
							
							... 
							
							
							
							Port 7de8c51873 
							
						 
						
							2019-07-23 16:24:21 +02:00  
				
					
						
							
							
								 
						
							
								e91bf82083 
								
							 
						 
						
							
							
								
								[Glitch] Add option to disable real-time updates in web UI  
							
							... 
							
							
							
							Port 729723f857 
							
						 
						
							2019-07-16 16:51:08 +02:00  
				
					
						
							
							
								 
						
							
								1b074d2a50 
								
							 
						 
						
							
							
								
								Add link to edit each listed filter  
							
							
							
						 
						
							2019-07-15 00:48:28 +02:00  
				
					
						
							
							
								 
						
							
								46829e009e 
								
							 
						 
						
							
							
								
								[Glitch] Use ScrollToOptions for smooth scrolling if supported  
							
							... 
							
							
							
							Port 84ff393842 
							
						 
						
							2019-06-30 11:01:01 +02:00  
				
					
						
							
							
								 
						
							
								662252c8f7 
								
							 
						 
						
							
							
								
								[Glitch] Add categories for custom emojis  
							
							... 
							
							
							
							Port front-end changes from e64e6a03dd 
							
						 
						
							2019-06-28 21:42:37 +02:00  
				
					
						
							
							
								 
						
							
								4175f13155 
								
							 
						 
						
							
							
								
								[Glitch] Add option to disable blurhash previews  
							
							... 
							
							
							
							Port 3086c645fd 
							
						 
						
							2019-06-26 23:19:26 +02:00  
				
					
						
							
							
								 
						
							
								383136d9bb 
								
							 
						 
						
							
							
								
								[Glitch] Removed extra pipes from regex.  
							
							... 
							
							
							
							Port 5b20284f6f 
							
						 
						
							2019-06-26 23:19:26 +02:00  
				
					
						
							
							
								 
						
							
								b191861e15 
								
							 
						 
						
							
							
								
								Use forceSingleColumn only in automatic layout mode  
							
							
							
						 
						
							2019-06-13 22:15:31 +02:00  
				
					
						
							
							
								 
						
							
								47307e6c13 
								
							 
						 
						
							
							
								
								Default to multiple column mode if backend doesn't have appropriate seting  
							
							
							
						 
						
							2019-06-13 22:15:31 +02:00  
				
					
						
							
							
								 
						
							
								d99a661f08 
								
							 
						 
						
							
							
								
								[Glitch] Add responsive panels to the single-column layout  
							
							... 
							
							
							
							Port 1e5532e693 
							
						 
						
							2019-06-13 22:15:31 +02:00  
				
					
						
							
							
								 
						
							
								7fb76999af 
								
							 
						 
						
							
							
								
								Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token  
							
							... 
							
							
							
							Inspired by https://github.com/kubevirt/kubevirt/issues/1242  
							
						 
						
							2019-05-24 16:08:09 +02:00  
				
					
						
							
							
								 
						
							
								56245a2a72 
								
							 
						 
						
							
							
								
								Export fallback content type and use it as default in WebUI  
							
							
							
						 
						
							2019-05-17 23:51:14 +02:00  
				
					
						
							
							
								 
						
							
								eed2c9dd44 
								
							 
						 
						
							
							
								
								Rename flavours/glitch/features/drawer to flavours/glitch/features/compose  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00  
				
					
						
							
							
								 
						
							
								355d384d8d 
								
							 
						 
						
							
							
								
								Revert "[Glitch] fix: update to emoji-mart 2.10.0"  
							
							... 
							
							
							
							This reverts commit 49bea8c46b 
							
						 
						
							2019-03-27 14:04:52 +01:00  
				
					
						
							
							
								 
						
							
								872eab5784 
								
							 
						 
						
							
							
								
								[Glitch] Do not set CSRF Token when no csrf header  
							
							... 
							
							
							
							Port 68f2211f00 
							
						 
						
							2019-03-26 16:12:46 +01:00  
				
					
						
							
							
								 
						
							
								49bea8c46b 
								
							 
						 
						
							
							
								
								[Glitch] fix: update to emoji-mart 2.10.0  
							
							... 
							
							
							
							Port db06b25376 
							
						 
						
							2019-03-16 21:39:13 +01:00  
				
					
						
							
							
								 
						
							
								6fe48dd050 
								
							 
						 
						
							
							
								
								[Glitch] Fix public timelines being broken by new toots when they are not mounted  
							
							... 
							
							
							
							Port be1c634b2b 
							
						 
						
							2019-03-08 01:00:14 +01:00  
				
					
						
							
							
								 
						
							
								235be596bc 
								
							 
						 
						
							
							
								
								Use server-provided poll limits instead of hardcoded ones  
							
							... 
							
							
							
							Also does not enable polls if no limits are provided by the server 
							
						 
						
							2019-03-06 23:56:53 +01:00  
				
					
						
							
							
								 
						
							
								6b2eefc7bf 
								
							 
						 
						
							
							
								
								[Glitch] Add WebP support  
							
							... 
							
							
							
							Port 5092d17f29 
							
						 
						
							2019-02-10 21:13:17 +01:00  
				
					
						
							
							
								 
						
							
								762e4fdf55 
								
							 
						 
						
							
							
								
								Fix hashtag processing when sending toots  
							
							... 
							
							
							
							This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text. 
							
						 
						
							2019-02-01 12:37:28 +01:00  
				
					
						
							
							
								 
						
							
								e77ceb1b29 
								
							 
						 
						
							
							
								
								[Glitch] Update dependencies for Node.js (2018-12-31)  
							
							... 
							
							
							
							Port compatibility changes from 8f5fdab5bf 
							
						 
						
							2019-01-02 16:07:33 +01:00  
				
					
						
							
							
								 
						
							
								9b606cb24c 
								
							 
						 
						
							
							
								
								[Glitch] Update emoji codepoint mappings to v11.0  
							
							... 
							
							
							
							Port 2ee779dcd3 
							
						 
						
							2019-01-02 15:36:59 +01:00  
				
					
						
							
							
								 
						
							
								6073195a7d 
								
							 
						 
						
							
							
								
								[Glitch] Display customized mascot in web UI  
							
							... 
							
							
							
							Port relevant parts of 9d4541c612 
							
						 
						
							2018-12-20 18:39:05 +01:00  
				
					
						
							
							
								 
						
							
								b3ff35a75c 
								
							 
						 
						
							
							
								
								Move URLs to backend in their own file  
							
							
							
						 
						
							2018-11-19 15:56:38 +01:00  
				
					
						
							
							
								 
						
							
								bf92e7aaa6 
								
							 
						 
						
							
							
								
								[Glitch] Implement adding a user to a list from their profile  
							
							... 
							
							
							
							Port bb5558de62 
							
						 
						
							2018-11-09 14:50:08 +01:00  
				
					
						
							
							
								 
						
							
								2b2facbbdf 
								
							 
						 
						
							
							
								
								[Glitch] Port some of upstream's getting started footer links  
							
							
							
						 
						
							2018-10-31 10:07:41 +01:00