summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
AgeCommit message (Collapse)Author
2017-02-03Add missing header to ergodox ordinary keymapNikolaus Wittenstein
2017-02-03Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein
Fixes the warning "right shift count >= width of type" by adding UL to the end of constants.
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman
albert ergodox keymap
2017-01-30update my neo2 keymapMatthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee
2017-01-26albert ergodox keymapAlbert Pretorius
2017-01-26replace jackhumbert with qmkJack Humbert
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee
2017-01-24Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-24[deadcyclo layout] Added unicode layerBrendan Johan Lee
2017-01-24[deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee
2017-01-23turn off rgb_midi in ezJack Humbert
2017-01-22Merge pull request #1020 from remigius42/masterJack Humbert
Swiss German layout for Ergodox EZ & Infinity
2017-01-22Merge pull request #1022 from lucwastiaux/masterJack Humbert
Improvements to Dvorak Programmer Ergodox keymap
2017-01-22SG Ergodox layout: Updated layout documentationAndreas Schmidt
- Swiss German Ergodox layout: Updated layout documentation based on previous layout changes.
2017-01-22SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt
- Swiss German Ergodox layout: Additional ENTER key was mapped to wrong layer and keyboard half.
2017-01-22SG Ergodox layout: Minor code formatting changesAndreas Schmidt
- Swiss German Ergodox layout: Removed unnecessary spaces.
2017-01-22SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt
- Swiss German Ergodox layout: Added ENTER key to left keyboard half on media layer such that the enter key is available on both halves to be able to flash both halves without an additional keyboard.
2017-01-22SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt
- Added <br/> macro to media layer of Swiss German layout for Ergodox
2017-01-22document BRACKETS and SHELL_LAYERlucwastiaux
2017-01-21Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt
- Renamed the JSON source files for the layout description of the Ergodox Swiss German keymap
2017-01-21Correct layout description of ergodox swissgermanAndreas Schmidt
- Added missing HTML macros to media layer.
2017-01-21Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt
- Removed the keymaps for Swiss German spefic for Ergodox EZ and Infinity after previously merging them.
2017-01-21Merged keymap for Ergodox EZ & InfinityAndreas Schmidt
- Merged keymap for Ergodox EZ & Infinity into one single keymap using pre-processor macros.
2017-01-21make shell layer more compatible with default layerlucwastiaux
2017-01-21Add Swiss German layout for Ergodox InfinityAndreas Schmidt
- Add Swiss German layout for Ergodox Infinity based on default layout for Ergodox EZ. - Minor changes in the event loop to prevent flashing display background lights.
2017-01-21Add Swiss German layout for Ergodox EZAndreas Schmidt
- Add Swiss German layout for Ergodox EZ based on default layout for Ergodox EZ. - Minor changes in the event loop to prevent flashing of leds.
2017-01-21couple of changes to the shell layerlucwastiaux
2017-01-19introduce shell_layerlucwastiaux
2017-01-17put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux
2017-01-15Merge pull request #999 from deadcyclo/masterJack Humbert
Adds layer images to the deadcyclo layout readme
2017-01-15Merge pull request #1007 from bryan4887/bryanJack Humbert
Added Bryan's keymap
2017-01-13Added Bryan's keymapBryan Hernandez
2017-01-10Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee
2017-01-10Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-10Added layer images to deadcyclo layout readmeBrendan Johan Lee
2017-01-07Merged from upstreamJoshua T
2017-01-06Increased TAPPING_TERM to 200Joshua T
2017-01-06Fixed key not matching its diagramJoshua T
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya
new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-jpL.png new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-numL.png modified: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c new file: keyboards/ergodox/keymaps/ishigoya-jp/readme.md
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya
2017-01-04Merge pull request #983 from common-nighthawk/masterJack Humbert
adds personal keymap for ergodox optimized for macOS with Vim
2017-01-03fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee
2017-01-02Added the deadcyclo layoutBrendan Johan Lee
2017-01-02Update config.hJack Humbert
2017-01-01reverts change outside of personal keymap.Daniel