Merge remote-tracking branch 'origin/master' into develop 
						
					 
				 
				2021-11-23 01:41:28 +00:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							remove Bracket Pair Colorizer recommendation ( #14816 ) 
						
					 
				 
				2021-10-15 11:54:19 +11:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Generate api data on each push ( #10609 ) 
						
					 
				 
				2020-10-25 14:48:44 -07:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Westberrytech pr ( #14422 ) 
						
					 
				 
				2021-11-27 09:28:18 +11:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Revert "update keyboard_aliases.json ( #15649 )" ( #15903 ) 
						
					 
				 
				2022-01-17 06:58:48 +11:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Revert "[Core] Add Pixel Flow RGB matrix effect ( #15829 )" ( #16209 ) 
						
					 
				 
				2022-02-05 05:57:21 +11:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							[Bug] Fix analog joystick to mouse compilation ( #15677 ) 
						
					 
				 
				2021-12-30 19:27:51 -08:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							MTBKeys MTB60 Hotswap Layout Macro Refactor ( #16194 ) 
						
					 
				 
				2022-02-04 09:46:21 -08:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							[Keymap] Remove Ergodox community layout “coderkun_neo2” ( #16011 ) 
						
					 
				 
				2022-01-23 12:38:02 -08:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							qmk doctor: display qmk_firmware version tag (#16155 ) 
						
					 
				 
				2022-02-01 20:31:42 -08:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Revert "core: make the full 4096 bytes of EEPROM work on Teensy 3.6 ( #12947 )" ( #15695 ) 
						
					 
				 
				2022-01-10 08:17:15 +11:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Revert "[Core] Add Pixel Flow RGB matrix effect ( #15829 )" ( #16209 ) 
						
					 
				 
				2022-02-05 05:57:21 +11:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							[Tests] Increase QMK test coverage take 2 ( #15269 ) 
						
					 
				 
				2021-11-23 13:31:01 +11:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Add missing virtser_init() to ChibiOS code ( #15356 ) 
						
					 
				 
				2021-11-30 16:54:18 +11:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							[Keymap] Add oled improvements and cnano keymap for drashna ( #16133 ) 
						
					 
				 
				2022-01-30 13:20:33 -08:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Remove network drive mapping comment for WSL ( #15871 ) 
						
					 
				 
				2022-01-14 14:46:47 +00:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							fix indent size 
						
					 
				 
				2019-06-11 01:51:40 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							QMK CLI and JSON keymap support ( #6176 ) 
						
					 
				 
				2019-07-15 12:14:27 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							eol=lf, where appropriate ( #15752 ) 
						
					 
				 
				2022-01-05 21:56:31 +00:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							New CLI subcommand to create clang-compatible compilation database (compile_commands.json) ( #14370 ) 
						
					 
				 
				2021-09-16 14:59:57 +10:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Purge uGFX. ( #14720 ) 
						
					 
				 
				2021-10-07 10:57:48 +11:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							[Tests] Increase QMK test coverage take 2 ( #15269 ) 
						
					 
				 
				2021-11-23 13:31:01 +11:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add config.h and rules.mk support for data driven keymaps ( #12859 ) 
						
					 
				 
				2021-08-18 21:52:41 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove QMK_SUBPROJECT definitions in makefile ( #15958 ) 
						
					 
				 
				2022-01-20 23:19:50 +00:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add config.h and rules.mk support for data driven keymaps ( #12859 ) 
						
					 
				 
				2021-08-18 21:52:41 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Re-add encoder tests ( #15312 ) 
						
					 
				 
				2021-11-27 22:19:22 +11:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Move tmk_core/common/<plat> ( #13918 ) 
						
					 
				 
				2021-11-19 10:41:02 -08:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							move everything from qmkfm/base_container to qmkfm/qmk_cli ( #14230 ) 
						
					 
				 
				2021-08-29 16:41:56 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Generate API docs from source code comments ( #2491 ) 
						
					 
				 
				2018-03-22 02:50:38 -04:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove SERIAL_LINK feature ( #14727 ) 
						
					 
				 
				2021-10-07 12:32:05 +11:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							add an explicit lisence file for github to pickup 
						
					 
				 
				2017-11-13 20:50:54 -05:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Clarify the quantum license ( #1042 ) 
						
					 
				 
				2017-03-28 15:20:36 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Clarify the quantum license ( #1042 ) 
						
					 
				 
				2017-03-28 15:20:36 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Clarify the quantum license ( #1042 ) 
						
					 
				 
				2017-03-28 15:20:36 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							[Tests] Increase QMK test coverage take 2 ( #15269 ) 
						
					 
				 
				2021-11-23 13:31:01 +11:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Setup a python test framework 
						
					 
				 
				2019-09-07 07:58:41 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Move tmk_core/common/<plat> ( #13918 ) 
						
					 
				 
				2021-11-19 10:41:02 -08:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							[Core] [Docs] Remove travis-ci references ( #13916 ) 
						
					 
				 
				2021-08-20 23:31:26 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Macros in JSON keymaps ( #14374 ) 
						
					 
				 
				2021-11-22 11:11:35 -08:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							switch to qmk-dotty-dict ( #13460 ) 
						
					 
				 
				2021-07-14 09:08:48 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Use the schema to eliminate custom code ( #11108 ) 
						
					 
				 
				2021-01-09 13:34:14 -08:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove bin/qmk ( #14231 ) 
						
					 
				 
				2021-08-29 16:50:22 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							[Bug] Revert Assymmetrical Split Encoder support ( #12090 ) ( #15311 ) 
						
					 
				 
				2021-11-27 14:40:09 +11:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							move everything from qmkfm/base_container to qmkfm/qmk_cli ( #14230 ) 
						
					 
				 
				2021-08-29 16:41:56 -07:00