summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Joshua T2016-07-2620-215/+2675
|\
| * 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
| |/ /
* | | Modified Atreus extend and Ergodox.Joshua T2016-07-262-172/+135
* | | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-152-0/+213
|\| |
| * | 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
* | | | Created replicaJunction keymaps.Joshua T2016-07-131-0/+414
|/ / /
* | / 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
|/
* Moves features to their own files (process_*), adds tap dance feature (#460)Jack Humbert2016-06-291-2/+1
* zoom and undo keysAnand Babu (AB) Periasamy2016-06-263-26/+40
* Merge pull request #440 from abperiasamy/ergo-ab-swap-up-downErez Zukerman2016-06-244-14/+26
|\
| * Swap up and down to match default layoutAnand Babu (AB) Periasamy2016-06-234-14/+26
* | Merge pull request #438 from tkuichooseyou/masterErez Zukerman2016-06-243-0/+1334
|\ \ | |/ |/|
| * Added tkuichooseyou keymap; for vim and OSX usersTeddy Ku2016-06-233-0/+1334
* | updates ez's matrix to specJack Humbert2016-06-231-0/+8
* | Backlight abstraction and other changes (#439)Jack Humbert2016-06-2366-60626/+8
|/
* ergodox_ez: Update the algernon keymap to v1.2Gergely Nagy2016-06-2211-331/+351
* Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)Jack Humbert2016-06-21220-0/+79367