summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* Cleanup of my keymaps (#1802)drashna2017-10-102-41/+101
* [cleanup] consistent 2 space indentationCampbell Barton2017-10-052-55/+55
* added matrixman layoutMatt2017-09-292-0/+313
* updated drashna's keymaps (#1769)drashna2017-09-293-88/+44
* remove all makefiles from keyboard directoriesJack Humbert2017-09-274-26/+0
* Adding Ergodox EZ and Atreus Dvorak 42-key layouts (#1705)lucwastiaux2017-09-152-0/+338
* Remove all Makefiles from the keyboards directory. (#1660)skullydazed2017-09-083-0/+18
* Update drashna's keymap (#1649)drashna2017-08-303-205/+103
* Creates a layouts/ folder for keymaps shared between keyboards (#1609)Jack Humbert2017-08-2331-0/+4491
* Initial structure for Ergodox as subprojectsFred Sundvik2016-07-29189-23832/+0
* Merge pull request #584 from algernon/ergodox-ez/algernonErez Zukerman2016-07-294-28/+687
|\
| * ergodox_ez: Upgrade my keymap to v1.4Gergely Nagy2016-07-294-28/+687
* | disable sleep LEDcoderkun2016-07-291-1/+2
* | complete labels for modifiers in keymap schemacoderkun2016-07-291-2/+2
* | use Ergodox EZ’s third LED for “scroll lock”coderkun2016-07-291-2/+9
* | fix grave (GRV) and acute (ACUT) accentscoderkun2016-07-291-2/+2
|/
* Merge pull request #568 from sethbc/fix-colemak-osx-pc-noJack Humbert2016-07-281-1/+1
|\
| * update NO_AMP to NO_AMPRSeth Chandler2016-07-271-1/+1
* | Merge pull request #566 from SmackleFunky/masterJack Humbert2016-07-281-2/+2
|\ \
| * | Allow toggling out of plover layerSmackleFunky2016-07-271-2/+2
| |/
* / Move to keyboardsMazin Bokhari2016-07-262-0/+350
|/
* Merge pull request #534 from willwm/teckinesisErez Zukerman2016-07-2410-0/+1819
|\
| * Remove images, per @ezuk request. =)Will Wolff-Myren2016-07-243-10/+0
| * Update readme.mdWill Wolff-Myren2016-07-171-5/+7
| * Update readme.mdWill Wolff-Myren2016-07-177-178/+191
| * Update description comment.Will Wolff-Myren2016-07-171-2/+3
| * [MEDIA]: Remove Power, Sleep, Mail, MyCompWill Wolff-Myren2016-07-171-6/+6
| * [BASE]: Meh, Hyper now have symbols on both sidesWill Wolff-Myren2016-07-171-4/+4
| * Update Base Layer comment to match new layout.Will Wolff-Myren2016-07-171-1/+1
| * [BASE]: KC_MINS -> KC_GRVWill Wolff-Myren2016-07-171-1/+1
| * RSpec: KC_EQL -> KC_MINSWill Wolff-Myren2016-07-171-2/+2
| * LSpec: KC_GRV -> KC_EQLWill Wolff-Myren2016-07-171-2/+2
| * Replaced ordinary-media.{png|json} with new media layoutWill Wolff-Myren2016-07-144-27/+436
| * Replaced ordinary-symbol.{png|json} with new base layout.Will Wolff-Myren2016-07-145-29/+430
| * Replaced ordinary-base.{png|json} with new base layout.Will Wolff-Myren2016-07-144-27/+452
| * Replaced readme.md with stubWill Wolff-Myren2016-07-141-92/+5
| * Created "teckinesis" keymap folderWill Wolff-Myren2016-07-1310-0/+665
* | Merge pull request #535 from algernon/ergodox-ez/algernonErez Zukerman2016-07-249-214/+855
|\ \
| * | ergodox_ez: Update my keymap to v1.3Gergely Nagy2016-07-189-214/+855
* | | update broken linkSeth Chandler2016-07-171-1/+1
|/ /
* | Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2016-07-062-0/+213
|\ \ | |/ |/|
| * Changed layer switching to momentaryJosh Colbeck2016-07-061-6/+6
| * Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-042-11/+5
| |\
| * | Added macro and readmeJosh Colbeck2016-07-042-18/+40
| * | Added new keymapJosh Colbeck2016-07-041-0/+191
| * | Revert "Changed layout of left hand main layer"Josh Colbeck2016-07-031-12/+12
| * | Changed layout of left hand main layerJoshua Colbeck2016-07-031-12/+12
* | | fix/annotate wait_us linesJack Humbert2016-07-061-0/+12
| |/ |/|
* | Adds wait to i2c (debounce)Jack Humbert2016-07-041-3/+3
* | Improves debounceJack Humbert2016-07-042-9/+3
|/