Callum Oakley
							
						 
					 | 
					
						
						
						
						
							
						
						
							49fbcb3e7c
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'
						
						
						
						
						
						
					 | 
					
						2016-08-09 12:39:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Callum Oakley
							
						 
					 | 
					
						
						
						
						
							
						
						
							725dd7328f
							
						
					 | 
					
						
						
							
							updated readme.md to reflect keymap changes
						
						
						
						
						
						
					 | 
					
						2016-08-09 11:09:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Callum Oakley
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f37b11f2c
							
						
					 | 
					
						
						
							
							changed order of bottom row of symbol layer to ease acess to brackets
						
						
						
						
						
						
					 | 
					
						2016-08-09 11:03:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skullY
							
						 
					 | 
					
						
						
						
						
							
						
						
							adad05c3fb
							
						
					 | 
					
						
						
							
							Add support for the cluecard
						
						
						
						
						
						
					 | 
					
						2016-08-08 16:11:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skullY
							
						 
					 | 
					
						
						
						
						
							
						
						
							d561f63bd1
							
						
					 | 
					
						
						
							
							Clueboard: Fix the title in keymaps/skully/readme.md
						
						
						
						
						
						
					 | 
					
						2016-08-08 13:46:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skullY
							
						 
					 | 
					
						
						
						
						
							
						
						
							e85bf50e1a
							
						
					 | 
					
						
						
							
							Clueboard: Add some readme.md files and do some minor cleanup.
						
						
						
						
						
						
					 | 
					
						2016-08-08 13:43:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							55ca218634
							
						
					 | 
					
						
						
							
							Merge pull request #613 from di0ib/master
						
						
						
						
						
						
						
						Convert hex to bin 
						
						
					 | 
					
						2016-08-08 12:10:49 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f4277fe6b
							
						
					 | 
					
						
						
							
							Merge pull request #612 from kuel/master
						
						
						
						
						
						
						
						Added file for software implementation of Russian, gave keymap_cyrillic.h a better name. 
						
						
					 | 
					
						2016-08-08 12:09:48 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3167bdc09
							
						
					 | 
					
						
						
							
							Merge pull request #609 from sethbc/fix_clueboard_orphaned_files
						
						
						
						
						
						
						
						remove orphaned clueboard files 
						
						
					 | 
					
						2016-08-08 12:09:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							9866c23bff
							
						
					 | 
					
						
						
							
							Merge pull request #607 from jeebak/jeebak
						
						
						
						
						
						
						
						Update Jeebak's keymap, w/ KC_COPY, etc. workaround. 
						
						
					 | 
					
						2016-08-08 12:07:39 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								di0ib
							
						 
					 | 
					
						
						
						
						
							
						
						
							8fab141a02
							
						
					 | 
					
						
						
							
							Convert hex to bin
						
						
						
						
						
						
						
						For flashing via alternative methods like LUFA MassStorage bootloader. 
						
						
					 | 
					
						2016-08-07 20:58:59 -10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								di0ib
							
						 
					 | 
					
						
						
						
						
							
						
						
							a36b2a0756
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
						
						
						
						
						
						
					 | 
					
						2016-08-07 20:20:16 -10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef83f1d04f
							
						
					 | 
					
						
						
							
							Tap for ;, hold for GUI, tap for ", hold for Alt
						
						
						
						
						
						
					 | 
					
						2016-08-07 12:44:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d86e5b7a7
							
						
					 | 
					
						
						
							
							Tap for Tab, hold for Hyper
						
						
						
						
						
						
					 | 
					
						2016-08-07 11:05:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kuel
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a0121a786
							
						
					 | 
					
						
						
							
							Removed unnecessary comment
						
						
						
						
						
						
					 | 
					
						2016-08-07 11:07:38 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kuel
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5ee24a6c3
							
						
					 | 
					
						
						
							
							Add keymap_russian.h, a software implementation of Russian
						
						
						
						
						
						
						
						rename keymap_cyrillic.h to keymap_unicode_cyrillic.h
changed CY_RUBLE and CY_NUMERO to CY_RUBL and CY_NMRO in
 keymap_unicode_cyrillic.h 
						
						
					 | 
					
						2016-08-07 11:01:12 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							68e287013b
							
						
					 | 
					
						
						
							
							Add Tab Close, New, Reopen macros to TouchCursor layer
						
						
						
						
						
						
					 | 
					
						2016-08-06 13:36:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							bda4d15ffa
							
						
					 | 
					
						
						
							
							Add Virtual Desktop Switching macros to TouchCursor layer
						
						
						
						
						
						
					 | 
					
						2016-08-06 12:00:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							57218827cb
							
						
					 | 
					
						
						
							
							Move KC_ACL1 button
						
						
						
						
						
						
					 | 
					
						2016-08-06 00:08:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							96ed96f924
							
						
					 | 
					
						
						
							
							Fix KC_ALT_TAB/KC_CMD_TAB logic
						
						
						
						
						
						
					 | 
					
						2016-08-06 00:01:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							6483a2a04b
							
						
					 | 
					
						
						
							
							Mouse layer updates
						
						
						
						
						
						
						
						- Rename to MOUSECURSOR
- Use "d" key, since middle finger is stronger than pinky
- Shuffle some mouse buttons around 
						
						
					 | 
					
						2016-08-05 23:32:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Seth Chandler
							
						 
					 | 
					
						
						
						
						
							
						
						
							545925fb1b
							
						
					 | 
					
						
						
							
							remove orphaned clueboard files
						
						
						
						
						
						
					 | 
					
						2016-08-05 23:19:12 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							36abd4463f
							
						
					 | 
					
						
						
							
							Revert swapp of AltTab/CmdTab in readme. Layout did not change
						
						
						
						
						
						
					 | 
					
						2016-08-04 14:26:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							7db1d7902b
							
						
					 | 
					
						
						
							
							Workaround for KC_COPY, etc. based on current AG_NORM/AG_SWAP setting
						
						
						
						
						
						
					 | 
					
						2016-08-03 21:21:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a4e72fa71
							
						
					 | 
					
						
						
							
							Add CmdSlash to TouchCursor Layer
						
						
						
						
						
						
					 | 
					
						2016-08-03 19:19:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							16f4a31784
							
						
					 | 
					
						
						
							
							Number layer tweaks
						
						
						
						
						
						
					 | 
					
						2016-08-03 19:19:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdd89e7f0d
							
						
					 | 
					
						
						
							
							Add Alt-Tab, Cmd-Tab, and Ctl-Tab Macros to TouchCursor layer, swap LGUI and LSFT
						
						
						
						
						
						
					 | 
					
						2016-08-03 19:19:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeeBak Kim
							
						 
					 | 
					
						
						
						
						
							
						
						
							abc3cd4d72
							
						
					 | 
					
						
						
							
							Update readme.md
						
						
						
						
						
						
					 | 
					
						2016-08-03 19:19:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kuel
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d8709fb79
							
						
					 | 
					
						
						
							
							Merge pull request #1 from jackhumbert/master
						
						
						
						
						
						
						
						Update 
						
						
					 | 
					
						2016-08-03 11:24:29 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							213cb2c243
							
						
					 | 
					
						
						
							
							Merge pull request #605 from kuel/master
						
						
						
						
						
						
						
						Add keymap_cyrillic.h, lots of cyrillic characters 
						
						
					 | 
					
						2016-08-03 00:11:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							301e46c529
							
						
					 | 
					
						
						
							
							Merge pull request #599 from Depariel/master
						
						
						
						
						
						
						
						Fixed compiling errors and updated keymaps for infinity_chibios 
						
						
					 | 
					
						2016-08-03 00:10:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							e62c588921
							
						
					 | 
					
						
						
							
							Merge pull request #561 from 0xdec/patch-1
						
						
						
						
						
						
						
						Clean up formatting & tiny refactor in rgblight.c 
						
						
					 | 
					
						2016-08-03 00:08:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kuel
							
						 
					 | 
					
						
						
						
						
							
						
						
							c70b276b1b
							
						
					 | 
					
						
						
							
							Add keymap_cyrillic.h, lots of cyrillic characters
						
						
						
						
						
						
					 | 
					
						2016-08-02 14:09:01 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erez Zukerman
							
						 
					 | 
					
						
						
						
						
							
						
						
							79a9e04706
							
						
					 | 
					
						
						
							
							Merge pull request #592 from sethbc/ez-sethbc
						
						
						
						
						
						
						
						Ez sethbc 
						
						
					 | 
					
						2016-08-02 08:03:09 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erez Zukerman
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c52327aa6
							
						
					 | 
					
						
						
							
							Merge pull request #593 from J3RN/master
						
						
						
						
						
						
						
						Updated the J3RN ErgoDox keymap 
						
						
					 | 
					
						2016-08-02 08:02:27 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erez Zukerman
							
						 
					 | 
					
						
						
						
						
							
						
						
							6eab4ecd7e
							
						
					 | 
					
						
						
							
							Merge pull request #600 from adiabatic/master
						
						
						
						
						
						
						
						zweihander-osx: add left-hand-thumb tab key 
						
						
					 | 
					
						2016-08-02 08:01:56 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							461f973c2b
							
						
					 | 
					
						
						
							
							correct file name
						
						
						
						
						
						
					 | 
					
						2016-08-01 23:46:50 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							25f138c0d3
							
						
					 | 
					
						
						
							
							fix mkdir cmd
						
						
						
						
						
						
					 | 
					
						2016-08-01 22:59:25 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erez Zukerman
							
						 
					 | 
					
						
						
						
						
							
						
						
							56aa51664e
							
						
					 | 
					
						
						
							
							Updates ErgoDox readme
						
						
						
						
						
						
					 | 
					
						2016-08-01 21:15:01 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							f422f442cf
							
						
					 | 
					
						
						
							
							automatically forward ergodox ez
						
						
						
						
						
						
					 | 
					
						2016-08-01 14:51:26 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb249fb239
							
						
					 | 
					
						
						
							
							Merge pull request #597 from Jiehong/feature/basic_keyboard_doc
						
						
						
						
						
						
						
						feature: add basic doc about how a keyboard works on USB 
						
						
					 | 
					
						2016-08-01 02:25:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5baa4773d
							
						
					 | 
					
						
						
							
							Merge pull request #596 from fredizzimo/rid_of_quick
						
						
						
						
						
						
						
						Fix the makefile dependencies and remove quick targets 
						
						
					 | 
					
						2016-08-01 02:24:53 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Depariel
							
						 
					 | 
					
						
						
						
						
							
						
						
							a675c1aee0
							
						
					 | 
					
						
						
							
							added support for Infinity 1.1a (4th drop) matrix, no LED support yet
						
						
						
						
						
						
					 | 
					
						2016-07-31 23:12:16 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nathan Sharfi
							
						 
					 | 
					
						
						
						
						
							
						
						
							07a631bd5a
							
						
					 | 
					
						
						
							
							Thumb ⌫ into ⇥, numpad & into :, yank home/end
						
						
						
						
						
						
						
						Also: add (back?) in the light-shine disabler 
						
						
					 | 
					
						2016-07-31 14:21:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nathan Sharfi
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2419ffecc
							
						
					 | 
					
						
						
							
							Remove /keyboard/* files
						
						
						
						
						
						
					 | 
					
						2016-07-31 14:10:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nathan Sharfi
							
						 
					 | 
					
						
						
						
						
							
						
						
							d889648d53
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:jackhumbert/qmk_firmware
						
						
						
						
						
						
						
						# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex 
						
						
					 | 
					
						2016-07-31 14:02:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Depariel
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c4177e077
							
						
					 | 
					
						
						
							
							fixed typo in hasu/keymap.c
						
						
						
						
						
						
					 | 
					
						2016-07-31 15:16:55 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Depariel
							
						 
					 | 
					
						
						
						
						
							
						
						
							ceecb7c819
							
						
					 | 
					
						
						
							
							fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel keymap
						
						
						
						
						
						
					 | 
					
						2016-07-31 14:25:25 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jiehong Ma
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9bef1658e
							
						
					 | 
					
						
						
							
							feature: add basic doc about how a keyboard works on USB
						
						
						
						
						
						
						
						This comes from the discussion on #520 
						
						
					 | 
					
						2016-07-31 16:49:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fred Sundvik
							
						 
					 | 
					
						
						
						
						
							
						
						
							fda29be3e7
							
						
					 | 
					
						
						
							
							Travis calls the normal build target, instead of quick
						
						
						
						
						
						
					 | 
					
						2016-07-31 14:18:51 +03:00 | 
					
					
						
						
							
							
							
						
					 |